From dab14256f919880549b744285e30931b1e99e567 Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Wed, 25 Jul 2007 19:39:20 +0000
Subject: [PATCH] Refactored the password policy functional tests in the security test suite to use dsconfig and modifyAnAttribute.
---
/dev/null | 29 -
opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml | 11
opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml | 38
opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml | 57 +-
opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml | 46 +
opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml | 4
opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml | 354 ++++++++------
opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml | 430 +++++++++--------
opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml | 172 ++++---
opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml | 104 ++-
opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml | 126 ++--
opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml | 24
12 files changed, 747 insertions(+), 648 deletions(-)
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_add.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_add.ldif
deleted file mode 100644
index e4b84fd..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_add.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-force-change-on-add
-ds-cfg-force-change-on-add: true
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_by_time.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_by_time.ldif
deleted file mode 100644
index 37e9aca..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_by_time.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-require-change-by-time
-ds-cfg-require-change-by-time: 20061030183752.848Z
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_reset.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_reset.ldif
deleted file mode 100644
index c069d4c..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_reset.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-force-change-on-reset
-ds-cfg-force-change-on-reset: true
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long.ldif
deleted file mode 100644
index 93cfa9b..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-idle-lockout-interval
-ds-cfg-idle-lockout-interval: 50 seconds
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long2.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long2.ldif
deleted file mode 100644
index 93cfa9b..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long2.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-idle-lockout-interval
-ds-cfg-idle-lockout-interval: 50 seconds
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt.ldif
deleted file mode 100644
index c60de70..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-lockout-failure-count
-ds-cfg-lockout-failure-count: 3
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt_sales.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt_sales.ldif
deleted file mode 100644
index bf33dcf..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt_sales.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Sales Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-lockout-failure-count
-ds-cfg-lockout-failure-count: 3
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_long.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_long.ldif
deleted file mode 100644
index 53dca34..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_long.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-lockout-duration
-ds-cfg-lockout-duration: 5 days
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_short.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_short.ldif
deleted file mode 100644
index bb0a48b..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_short.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-lockout-duration
-ds-cfg-lockout-duration: 5 seconds
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_max_pwd_age.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_max_pwd_age.ldif
deleted file mode 100644
index 3b1fa3e..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_max_pwd_age.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-maximum-password-age
-ds-cfg-maximum-password-age: 6 weeks
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_min_pwd_age.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_min_pwd_age.ldif
deleted file mode 100644
index 1ed5708..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_min_pwd_age.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-minimum-password-age
-ds-cfg-minimum-password-age: 24 hours
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login.ldif
deleted file mode 100644
index d50edc8..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=jreuter,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: newdestroy
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login2.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login2.ldif
deleted file mode 100644
index 274be09..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login2.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=jreuter,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: anotherdestroy
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login3.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login3.ldif
deleted file mode 100644
index 8434a74..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login3.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=jreuter,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: lastdestroy
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_policy.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_policy.ldif
deleted file mode 100644
index 3b9ab11..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_policy.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-allow-user-password-changes
-ds-cfg-allow-user-password-changes: false
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd.ldif
deleted file mode 100644
index bca2894..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: adminpizza
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd2.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd2.ldif
deleted file mode 100644
index 3190019..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd2.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=mward,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: adminnormal
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd3.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd3.ldif
deleted file mode 100644
index 4cf2f1e..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd3.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=mward,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: normal
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd4.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd4.ldif
deleted file mode 100644
index b9f5fef..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd4.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: adminlongpizza
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd5.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd5.ldif
deleted file mode 100644
index 908d2a4..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd5.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: adminshortpizza
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_exp_pwd_no_warning.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_exp_pwd_no_warning.ldif
deleted file mode 100644
index 49bf8fd..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_exp_pwd_no_warning.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-expire-passwords-without-warning
-ds-cfg-expire-passwords-without-warning: false
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_max_reset_age.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_max_reset_age.ldif
deleted file mode 100644
index 48d4d57..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_max_reset_age.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-maximum-password-reset-age
-ds-cfg-maximum-password-reset-age: 0 seconds
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_preencoded_pwds.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_preencoded_pwds.ldif
deleted file mode 100644
index b725294..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_preencoded_pwds.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-allow-pre-encoded-passwords
-ds-cfg-allow-pre-encoded-passwords: false
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_exp_pwd_no_warning.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_exp_pwd_no_warning.ldif
deleted file mode 100644
index b7f8ee2..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_exp_pwd_no_warning.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-expire-passwords-without-warning
-ds-cfg-expire-passwords-without-warning: true
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-attr.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-attr.ldif
deleted file mode 100644
index 50fa4b2..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-attr.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-add: ds-cfg-last-login-time-attribute
-ds-cfg-last-login-time-attribute: ds-pwp-last-login-time
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-format.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-format.ldif
deleted file mode 100644
index c2a0a17..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-format.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-add: ds-cfg-last-login-time-format
-ds-cfg-last-login-time-format: EEE, MMM dd, yyyy HH:mm:ss
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_long.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_long.ldif
deleted file mode 100644
index e31f046..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_long.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-maximum-password-reset-age
-ds-cfg-maximum-password-reset-age: 30 minutes
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_short.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_short.ldif
deleted file mode 100644
index 85d5d9e..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_short.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-maximum-password-reset-age
-ds-cfg-maximum-password-reset-age: 8 seconds
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_preencoded_pwds.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_preencoded_pwds.ldif
deleted file mode 100644
index 3200a9f..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_preencoded_pwds.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-allow-pre-encoded-passwords
-ds-cfg-allow-pre-encoded-passwords: true
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_add.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_add.ldif
deleted file mode 100644
index fa98d0b..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_add.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-force-change-on-add
-ds-cfg-force-change-on-add: false
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_reset.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_reset.ldif
deleted file mode 100644
index ec734a4..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_reset.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-force-change-on-reset
-ds-cfg-force-change-on-reset: false
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_idle_lockout_interval.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_idle_lockout_interval.ldif
deleted file mode 100644
index 14b6972..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_idle_lockout_interval.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-idle-lockout-interval
-ds-cfg-idle-lockout-interval: 0 seconds
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_cnt.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_cnt.ldif
deleted file mode 100644
index 6829470..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_cnt.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-lockout-failure-count
-ds-cfg-lockout-failure-count: 0
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_dur.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_dur.ldif
deleted file mode 100644
index 861ef3f..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_dur.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-lockout-duration
-ds-cfg-lockout-duration: 0 seconds
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_max_pwd_age.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_max_pwd_age.ldif
deleted file mode 100644
index 4e17e1d..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_max_pwd_age.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-maximum-password-age
-ds-cfg-maximum-password-age: 0 seconds
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_min_pwd_age.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_min_pwd_age.ldif
deleted file mode 100644
index ae0355d..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_min_pwd_age.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-minimum-password-age
-ds-cfg-minimum-password-age: 0 seconds
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_pwd_policy.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_pwd_policy.ldif
deleted file mode 100644
index 24fada2..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_pwd_policy.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: cn=Default Password Policy,cn=Password Policies,cn=config
-changetype: modify
-replace: ds-cfg-allow-user-password-changes
-ds-cfg-allow-user-password-changes: true
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_add_attr.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/user_add_attr.ldif
deleted file mode 100644
index 3694bd5..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_add_attr.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2007 Sun Microsystems, Inc.
-#
-
-dn: uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-add: pager
-pager: +1 999 555 1212
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_force_pwd.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_force_pwd.ldif
deleted file mode 100644
index 4c15c4a..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_force_pwd.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=mcat,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: newpizza
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd.ldif
deleted file mode 100644
index 9935b9b..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=scarter,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: newsprain
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd2.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd2.ldif
deleted file mode 100644
index 1032345..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd2.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=tmorris,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: newsprain
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd3.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd3.ldif
deleted file mode 100644
index 6847c0f..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd3.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: newpizza
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd4.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd4.ldif
deleted file mode 100644
index 7a1ef8f..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd4.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=dmiller,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: newgosling
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd5.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd5.ldif
deleted file mode 100644
index ad60d0a..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd5.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=mward,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: newnormal
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd6.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd6.ldif
deleted file mode 100644
index 4291825..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd6.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=bjablons,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: newberry
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd7.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd7.ldif
deleted file mode 100644
index b40d85f..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd7.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: newlongpizza
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd8.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd8.ldif
deleted file mode 100644
index 272ebe7..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd8.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: newshortpizza
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_del_attr.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/user_del_attr.ldif
deleted file mode 100644
index 1d6ff73..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_del_attr.ldif
+++ /dev/null
@@ -1,28 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2007 Sun Microsystems, Inc.
-#
-
-dn: uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-delete: roomnumber
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd.ldif
deleted file mode 100644
index 885e505..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=scarter,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: sprain
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd4.ldif b/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd4.ldif
deleted file mode 100644
index 6294ef7..0000000
--- a/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd4.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-#
-
-dn: uid=dmiller,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
-changetype: modify
-replace: userpassword
-userpassword: gosling
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
index a36aae1..a86194f 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
@@ -41,11 +41,11 @@
</message>
<call function="'compareEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'attrToBeCompared' : 'ds-cfg-force-change-on-add:false',
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'attrToBeCompared' : 'ds-cfg-force-change-on-add:false',
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
@@ -54,14 +54,16 @@
'Security: Pwd Change: Preamble Step 2. Admin Enabling Force Password On Add'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_force_pwd_add.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'force-change-on-add' ,
+ 'attributeValue' : 'true' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -91,10 +93,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mcat,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'pizza' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base',
- 'expectedRC' : 19 }
+ 'expectedRC' : 19 }
</call>
<call function="'testCase_Postamble'"/>
@@ -109,16 +111,17 @@
'Security: Pwd Change: User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=mcat,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'pizza' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_change_force_pwd.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=mcat,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'pizza' ,
+ 'DNToModify' : 'uid=mcat,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'newpizza' ,
+ 'changetype' : 'replace' }
</call>
-
-
-
+
<message>
'Security: Pwd Change: User Searching With Password'
</message>
@@ -128,7 +131,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mcat,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newpizza' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -145,16 +148,16 @@
'Security: Pwd Change: Postamble Step 1. Admin Disabling Force Password On Add'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_reset_force_pwd_add.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'force-change-on-add' ,
+ 'attributeValue' : 'false' }
</call>
-
-
-
+
<message>
'Security: Pwd Change: Postamble Step 2. Adding Single New User'
</message>
@@ -177,7 +180,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'pizza' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -194,28 +197,28 @@
</message>
<call function="'compareEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'attrToBeCompared' : 'ds-cfg-force-change-on-reset:false',
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'attrToBeCompared' : 'ds-cfg-force-change-on-reset:false',
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
-
<message>
'Security: Pwd Change: Preamble Step 2. Admin Enabling Force Password On Reset'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_force_pwd_reset.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'force-change-on-reset' ,
+ 'attributeValue' : 'true' }
</call>
-
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -228,14 +231,17 @@
'Security: Pwd Change: Admin Resetting User Pwd'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_user_pwd.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'adminpizza' ,
+ 'changetype' : 'replace' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -253,7 +259,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'pizza' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base',
'expectedRC' : 49 }
@@ -271,27 +277,30 @@
'Security: Pwd Change: User Adding Attr With Old Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'pizza' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_add_attr.ldif' % logsRemoteDataDir,
- 'expectedRC' : 49 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'pizza' ,
+ 'DNToModify' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'pager' ,
+ 'newAttributeValue' : '+1 999 555 1212' ,
+ 'changetype' : 'add' ,
+ 'expectedRC' : 49 }
</call>
-
+
<message>
'Security: Pwd Change: Checking For Existence of User-added Attribute'
</message>
<call function="'compareEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'attrToBeCompared' : 'pager:+1 999 555-1212',
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'attrToBeCompared' : 'pager:+1 999 555-1212',
'entryToBeCompared' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'expectedRC' : 16 }
+ 'expectedRC' : 16 }
</call>
<call function="'testCase_Postamble'"/>
@@ -306,26 +315,27 @@
'Security: Pwd Change: User Deleting Attr With Old Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'pizza' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_del_attr.ldif' % logsRemoteDataDir,
- 'expectedRC' : 49 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'pizza' ,
+ 'DNToModify' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'roomnumber' ,
+ 'changetype' : 'delete' ,
+ 'expectedRC' : 49 }
</call>
-
-
+
<message>
'Security: Pwd Change: Checking For Existence of User-deleted Attribute'
</message>
<call function="'compareEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'attrToBeCompared' : 'roomnumber:4612',
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'attrToBeCompared' : 'roomnumber:4612',
'entryToBeCompared' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' }
</call>
@@ -342,13 +352,13 @@
</message>
<call function="'compareEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'pizza' ,
- 'attrToBeCompared' : 'l:Sunnyvale',
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'pizza' ,
+ 'attrToBeCompared' : 'l:Sunnyvale',
'entryToBeCompared' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'expectedRC' : 49 }
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
@@ -368,7 +378,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'adminpizza' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base',
'expectedRC' : 19 }
@@ -386,14 +396,17 @@
'Security: Pwd Change: User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'adminpizza' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd3.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'adminpizza' ,
+ 'DNToModify' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'newpizza' ,
+ 'changetype' : 'replace' }
</call>
-
+
<message>
'Security: Pwd Change: User Searching With Assigned Password'
</message>
@@ -403,13 +416,12 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'adminpizza' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
</call>
-
<message>
'Security: Pwd Change: User Searching With New Password'
</message>
@@ -419,7 +431,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newpizza' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -437,14 +449,16 @@
'Security: Pwd Change: Admin Enabling Maximum Reset Age Long'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_enable_max_reset_age_long.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'maximum-password-reset-age' ,
+ 'attributeValue' : '30 m' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -457,14 +471,17 @@
'Security: Pwd Change: Admin Changing User Pwd'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_user_pwd4.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'adminlongpizza' ,
+ 'changetype' : 'replace' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -477,15 +494,17 @@
'Security: Pwd Change: User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'adminlongpizza' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd7.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'adminlongpizza' ,
+ 'DNToModify' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'newlongpizza' ,
+ 'changetype' : 'replace' }
</call>
-
-
+
<message>
'Security: Pwd Change: User Searching With Password'
</message>
@@ -495,7 +514,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newlongpizza' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -512,14 +531,16 @@
'Security: Pwd Change: Admin Enabling Maximum Reset Age Short'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_enable_max_reset_age_short.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'maximum-password-reset-age' ,
+ 'attributeValue' : '8 s' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -532,14 +553,17 @@
'Security: Pwd Change: Admin Changing User Pwd'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_user_pwd5.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'adminshortpizza' ,
+ 'changetype' : 'replace' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -560,15 +584,18 @@
'Security: Pwd Change: User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'adminshortpizza' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd8.ldif' % logsRemoteDataDir ,
- 'expectedRC' : 49 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'adminpizza' ,
+ 'DNToModify' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'newshortpizza' ,
+ 'changetype' : 'replace' ,
+ 'expectedRC' : 49 }
</call>
-
+
<message>
'Security: Pwd Change: User Searching With Password'
</message>
@@ -578,7 +605,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mdog,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newshortpizza' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base',
'expectedRC' : 49 }
@@ -596,27 +623,30 @@
'Security: Pwd Change: Postamble Step 1. Admin Disabling Max Pwd Age'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_disable_max_reset_age.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'maximum-password-reset-age' ,
+ 'attributeValue' : '0 s' }
</call>
-
-
+
<message>
'Security: Pwd Change: Postamble Step 2. Admin Disabling Force Password On Reset'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_reset_force_pwd_reset.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'force-change-on-reset' ,
+ 'attributeValue' : 'false' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
index a36a75a..3438842 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
@@ -46,7 +46,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'sprain' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -56,27 +56,30 @@
'Security: Pwd Change: Preamble Step 2 - Admin Enabling Exp Pwd No Warning'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_enable_exp_pwd_no_warning.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'expire-passwords-without-warning' ,
+ 'attributeValue' : 'true' }
</call>
-
-
+
<message>
'Security: Pwd Change: Preamble Step 3 -Admin Setting Pwd Time Exp'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_force_pwd_by_time.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'require-change-by-time' ,
+ 'attributeValue' : '20061030183752.848Z' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -94,10 +97,10 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'sprain' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base',
- 'expectedRC' : 49 }
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
@@ -112,14 +115,16 @@
'Security: Pwd Change: Admin Disabling Exp Pwd No Warning'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_disable_exp_pwd_no_warning.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'expire-passwords-without-warning' ,
+ 'attributeValue' : 'false' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -137,7 +142,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'sprain' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml
index 3feadde..7578b48 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml
@@ -178,17 +178,16 @@
'Security: Grace Login: Reset Pwd, Admin reset max password age'
</message>
- <call function="'modifyAnAttribute'">
+ <call function="'modifyPwdPolicy'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'DNToModify' : 'cn=Default Password Policy,cn=Password Policies,cn=config' ,
- 'attributeName' : 'ds-cfg-maximum-password-age' ,
- 'newAttributeValue' : '24 hours' ,
- 'changetype' : 'replace' }
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'maximum-password-age' ,
+ 'attributeValue' : '24 h' }
</call>
-
+
<message>
'Security: Grace Login: Reset Pwd, Search Bind 2'
</message>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
index 8381e33..97a7134 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
@@ -42,11 +42,11 @@
</message>
<call function="'compareEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'attrToBeCompared' : 'ds-cfg-idle-lockout-interval:0 seconds',
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'attrToBeCompared' : 'ds-cfg-idle-lockout-interval:0 seconds',
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
@@ -63,14 +63,16 @@
'Security: Last Login: Admin Enable Last Login Attribute Only'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_enable_last-login-time-attr.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'last-login-time-attribute' ,
+ 'attributeValue' : 'ds-pwp-last-login-time' }
</call>
-
+
<message>
'Security: Last Login: User Binding With Password'
</message>
@@ -80,7 +82,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'destroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -96,7 +98,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'ds-pwp-last-login-time' }
+ 'attributes' : 'ds-pwp-last-login-time' }
</call>
<script>
@@ -104,8 +106,8 @@
</script>
<call function="'checktestStringNotPresent'">
- { 'returnString' : returnString ,
- 'testString' : 'ds-pwp-last-login-time' }
+ { 'returnString' : returnString ,
+ 'testString' : 'ds-pwp-last-login-time' }
</call>
<call function="'testCase_Postamble'"/>
@@ -133,14 +135,16 @@
'Security: Last Login: Admin Enable Last Login Format Only'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_enable_last-login-time-format.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'last-login-time-format' ,
+ 'attributeValue' : 'EEE, MMM dd, yyyy HH:mm:ss' }
</call>
-
+
<message>
'Security: Last Login: User Binding With Password'
</message>
@@ -150,7 +154,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'destroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -166,7 +170,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'ds-pwp-last-login-time' }
+ 'attributes' : 'ds-pwp-last-login-time' }
</call>
<script>
@@ -174,7 +178,7 @@
</script>
<call function="'checktestStringNotPresent'">
- { 'returnString' : returnString ,
+ { 'returnString' : returnString ,
'testString' : 'ds-pwp-last-login-time' }
</call>
@@ -191,14 +195,16 @@
'Security: Last Login: Admin Enable Last Login Attribute And Format'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_enable_last-login-time-attr.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'last-login-time-attribute' ,
+ 'attributeValue' : 'ds-pwp-last-login-time' }
</call>
-
+
<message>
'Security: Last Login: User Binding With Password'
</message>
@@ -208,7 +214,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'destroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -224,7 +230,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsBaseDN' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'attributes' : 'ds-pwp-last-login-time' }
+ 'attributes' : 'ds-pwp-last-login-time' }
</call>
<script>
@@ -254,7 +260,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'destroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -263,14 +269,16 @@
'Security: Last Login: Long Idle Lockout Step 2. Admin Changing Idle Lockout Interval'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'idle-lockout-interval' ,
+ 'attributeValue' : '50 s' }
</call>
-
+
<message>
'Security: Last Login: Long Idle Lockout Step 3. User Binding Before Idle Lockout'
</message>
@@ -280,7 +288,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'destroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -304,7 +312,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'destroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base',
'expectedRC' : 49 }
@@ -323,14 +331,15 @@
'Security: Last Login: Reset Idle Lockout Step 1. Admin Resetting Idle Lockout Interval'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_reset_idle_lockout_interval.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'idle-lockout-interval' ,
+ 'attributeValue' : '0 s' }
</call>
-
<message>
'Security: Last Login: Reset Idle Lockout Step 2. User Binding'
@@ -341,7 +350,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'destroy',
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -364,7 +373,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'destroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -387,7 +396,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'destroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -396,14 +405,16 @@
'Security: Last Login: Long Idle Lockout - Password Change Override Step 2. Admin Changing Idle Lockout Interval'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'idle-lockout-interval' ,
+ 'attributeValue' : '50 s' }
</call>
-
+
<message>
'Security: Last Login: Long Idle Lockout - Password Change Override Step 3. User Binding Before Idle Lockout'
</message>
@@ -413,7 +424,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'destroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -432,15 +443,17 @@
'Security: Last Login: Long Idle Lockout - Password Change Override Step 5. User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_pwd_last_login.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'uid=jreuter,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'newdestroy' ,
+ 'changetype' : 'replace' }
</call>
-
-
+
<message>
'Security: Last Login: Long Idle Lockout Step 6. Sleep'
</message>
@@ -458,7 +471,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -476,14 +489,15 @@
'Security: Last Login: Reset Idle Lockout 2 Step 1. Admin Resetting Idle Lockout Interval'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_reset_idle_lockout_interval.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'idle-lockout-interval' ,
+ 'attributeValue' : '0 s' }
</call>
-
<message>
'Security: Last Login: Reset Idle Lockout 2 Step 2. User Binding'
@@ -494,7 +508,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy',
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -516,7 +530,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -539,7 +553,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -549,14 +563,16 @@
'Security: Last Login: Long Idle Lockout - User Bind Reset Step 2. Admin Changing Idle Lockout Interval'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'idle-lockout-interval' ,
+ 'attributeValue' : '50 s' }
</call>
-
+
<message>
'Security: Last Login: Long Idle Lockout - User Bind Reset Step 3. User Binding Before Idle Lockout'
</message>
@@ -566,7 +582,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -589,7 +605,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -612,7 +628,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -630,14 +646,16 @@
'Security: Last Login: Reset Idle Lockout Step 1. Admin Resetting Idle Lockout Interval'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_reset_idle_lockout_interval.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'idle-lockout-interval' ,
+ 'attributeValue' : '0 s' }
</call>
-
+
<message>
'Security: Last Login: Reset Idle Lockout Step 2. User Binding'
</message>
@@ -647,7 +665,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy',
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -669,7 +687,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -704,7 +722,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -713,14 +731,16 @@
'Security: Last Login: Long Idle Lockout - Disabled Last Login Step 3. Admin Changing Idle Lockout Interval'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'idle-lockout-interval' ,
+ 'attributeValue' : '50 s' }
</call>
-
+
<message>
'Security: Last Login: Long Idle Lockout - Disabled Last Login Step 4. User Binding'
</message>
@@ -730,7 +750,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -749,26 +769,30 @@
'Security: Last Login: Reset Idle Lockout Step 1. Enable Last Login - Attribute'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_enable_last-login-time-attr.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'last-login-time-attribute' ,
+ 'attributeValue' : 'ds-pwp-last-login-time' }
</call>
-
+
<message>
'Security: Last Login: Reset Idle Lockout Step 2. Admin Resetting Idle Lockout Interval'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_reset_idle_lockout_interval.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'idle-lockout-interval' ,
+ 'attributeValue' : '0 s' }
</call>
-
+
<message>
'Security: Last Login: Reset Idle Lockout Step 3. User Binding'
</message>
@@ -778,7 +802,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy',
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -800,7 +824,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -835,7 +859,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -844,14 +868,16 @@
'Security: Last Login: Long Idle Lockout - Disabled Last Login 2 Step 3. Admin Changing Idle Lockout Interval'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'idle-lockout-interval' ,
+ 'attributeValue' : '50 s' }
</call>
-
+
<message>
'Security: Last Login: Long Idle Lockout - Disabled Last Login 2 Step 4. User Binding'
</message>
@@ -861,7 +887,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -880,14 +906,16 @@
'Security: Last Login: Reset Idle Lockout Step 1. Enable Last Login - Attribute'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_enable_last-login-time-format.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'last-login-time-format' ,
+ 'attributeValue' : 'EEE, MMM dd, yyyy HH:mm:ss' }
</call>
-
+
<message>
'Security: Last Login: Reset Idle Lockout Step 2. Admin Resetting Idle Lockout Interval'
</message>
@@ -909,7 +937,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy',
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -932,7 +960,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -955,7 +983,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -964,15 +992,16 @@
'Security: Last Login: Long Idle Lockout Step 2. Admin Changing Idle Lockout Interval'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'idle-lockout-interval' ,
+ 'attributeValue' : '50 s' }
</call>
-
-
+
<message>
'Security: Last Login: Long Idle Lockout Step 3. User Binding Before Idle Lockout'
</message>
@@ -982,7 +1011,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -1006,7 +1035,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -1042,7 +1071,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy',
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -1066,7 +1095,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -1089,7 +1118,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -1099,14 +1128,16 @@
'Security: Last Login: Long Idle Lockout - Pwd Change Override 2 Step 2. Admin Changing Idle Lockout Interval'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'idle-lockout-interval' ,
+ 'attributeValue' : '50 s' }
</call>
-
+
<message>
'Security: Last Login: Long Idle Lockout - Pwd Change Override 2 Step 3. User Binding Before Idle Lockout'
</message>
@@ -1116,7 +1147,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -1134,15 +1165,17 @@
'Security: Last Login: Long Idle Lockout - Pwd Change Override 2 Step 5. User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_pwd_last_login2.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'uid=jreuter,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'anotherdestroy' ,
+ 'changetype' : 'replace' }
</call>
-
-
+
<message>
'Security: Last Login: Long Idle Lockout - Pwd Change Override 2 Step 6. User Binding After Idle Lockout'
</message>
@@ -1152,7 +1185,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'anotherdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -1188,7 +1221,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'anotherdestroy',
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -1212,7 +1245,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'anotherdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -1248,7 +1281,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'anotherdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -1258,14 +1291,16 @@
'Security: Last Login: Long Idle Lockout - Pwd Change Override 3 Step 3. Admin Changing Idle Lockout Interval'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_idle_lockout_long.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'idle-lockout-interval' ,
+ 'attributeValue' : '50 s' }
</call>
-
+
<message>
'Security: Last Login: Long Idle Lockout - Pwd Change Override 3 Step 4. User Binding Before Idle Lockout'
</message>
@@ -1275,7 +1310,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'anotherdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -1285,14 +1320,17 @@
'Security: Last Login: Long Idle Lockout - Pwd Change Override 3 Step 5. Admin Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_pwd_last_login3.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'uid=jreuter,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'lastdestroy' ,
+ 'changetype' : 'replace' }
</call>
-
+
<message>
'Security: Last Login: Pwd Override 3 Step 6. User Binding After Admin Pwd Change'
</message>
@@ -1302,7 +1340,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'lastdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -1351,7 +1389,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'lastdestroy',
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -1375,7 +1413,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=jreuter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'lastdestroy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
index 689d95c..f7becea 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
@@ -41,11 +41,11 @@
</message>
<call function="'compareEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'attrToBeCompared' : 'ds-cfg-lockout-duration:0 seconds',
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'attrToBeCompared' : 'ds-cfg-lockout-duration:0 seconds',
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
@@ -53,14 +53,16 @@
'Security: Lockout Duration: Preamble Step 2. Admin Changing Lockout Count'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_lockout_cnt.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'lockout-failure-count' ,
+ 'attributeValue' : '3' }
</call>
-
+
<message>
'Security: Lockout Duration: Preamble Step 3. User Lockout With Bad Pwd 3x'
</message>
@@ -86,14 +88,17 @@
'Security: Lockout Duration: Preamble Step 4. Admin Resetting User Pwd'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_user_pwd2.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'uid=mward,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'adminnormal' ,
+ 'changetype' : 'replace' }
</call>
-
+
<message>
'Security: Lockout Duration: Preamble Step 5. User Bind With New Password'
</message>
@@ -121,14 +126,16 @@
'Security: Lockout Duration: Admin Making Lockout Duration Short'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_lockout_dur_short.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'lockout-duration' ,
+ 'attributeValue' : '5 s' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -171,14 +178,17 @@
'Security: lockout Duration: Short Lockout Duration Step 2. User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=mward,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'adminnormal' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd5.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=mward,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'adminnormal' ,
+ 'DNToModify' : 'uid=mward,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'newnormal' ,
+ 'changetype' : 'replace' }
</call>
-
+
<message>
'Security: Lockout Duration: Short Lockout Duration Step 3. User Bind With New Password'
</message>
@@ -188,7 +198,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mward,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newnormal' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -206,14 +216,16 @@
'Security: Lockout Duration: Admin Making Lockout Duration Long'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_lockout_dur_long.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'lockout-duration' ,
+ 'attributeValue' : '5 d' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -232,7 +244,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bjablons,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'strawberry' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -251,7 +263,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bjablons,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : '%s' % pwds,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -270,16 +282,18 @@
'Security: lockout Duration: Long Lockout Duration Step 3. User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=bjablons,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'strawberry' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd6.ldif' % logsRemoteDataDir ,
- 'expectedRC' : 49 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=bjablons,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'strawberry' ,
+ 'DNToModify' : 'uid=bjablons,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'newberry' ,
+ 'changetype' : 'replace' ,
+ 'expectedRC' : 49 }
</call>
-
-
+
<message>
'Security: Lockout Duration: Long Lockout Duration Step 4. User Bind With New Password'
</message>
@@ -289,7 +303,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bjablons,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newberry' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base',
'expectedRC' : 49 }
@@ -307,14 +321,16 @@
'Security: Lockout Duration: Postamble Step 1. Admin Resetting Lockout Duration'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_reset_lockout_dur.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'lockout-duration' ,
+ 'attributeValue' : '0 s' }
</call>
-
+
<message>
'Security: Lockout Duration: Postamble Step 2. User Lockout With Bad Pwd 3x'
</message>
@@ -329,7 +345,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mward,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : '%s' % pwds,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -340,14 +356,16 @@
'Security: Lockout Duration: Postamble Step 3. Admin Resetting User Pwd'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_user_pwd3.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'DNToModify' : 'uid=mward,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'normal' ,
+ 'changetype' : 'replace' }
</call>
-
<message>
'Security: Lockout Duration: Postamble Step 4. User Bind With New Password'
@@ -358,7 +376,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=mward,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'normal' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -367,14 +385,16 @@
'Security: Lockout Duration: Postamble Step 5. Admin Resetting Lockout Count'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_reset_lockout_cnt.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'lockout-failure-count' ,
+ 'attributeValue' : '0' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
index c1f3aae..1a66d68 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
@@ -42,11 +42,11 @@
</message>
<call function="'compareEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'attrToBeCompared' : 'ds-cfg-lockout-failure-count:0',
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'attrToBeCompared' : 'ds-cfg-lockout-failure-count:0',
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
@@ -64,7 +64,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : '%s' % pwds,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -76,7 +76,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'oranges',
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -93,14 +93,16 @@
'Security: Lockout Cnt: Admin Changing Lockout Count'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_lockout_cnt.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'lockout-failure-count' ,
+ 'attributeValue' : '3' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -124,7 +126,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : '%s' % pwds,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -145,10 +147,10 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeModified' : '%s/security/pwd_policy/admin_reset_lockout_cnt.ldif' % logsRemoteDataDir }
</call>
@@ -162,7 +164,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=bhall,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'oranges' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -181,7 +183,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=gfarmer,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : '%s' % pwds,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base',
'expectedRC' : 49 }
@@ -193,7 +195,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=gfarmer,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ruling',
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base'}
</call>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
index 425166f..dd1bb10 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
@@ -42,11 +42,11 @@
</message>
<call function="'compareEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'attrToBeCompared' : 'ds-cfg-minimum-password-age:0 seconds',
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'attrToBeCompared' : 'ds-cfg-minimum-password-age:0 seconds',
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
@@ -63,28 +63,33 @@
'Security: Min Pwd Age: Test: Step 1. Admin Enabling Minimum Pwd Age'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_min_pwd_age.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'minimum-password-age' ,
+ 'attributeValue' : '24 h' }
</call>
-
+
<!--- User Change Password -->
<message>
'Security: Min Pwd Age: Test: Step 2. User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=dmiller,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'gosling' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd4.ldif' % logsRemoteDataDir ,
- 'expectedRC' : 53 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=dmiller,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'gosling' ,
+ 'DNToModify' : 'uid=dmiller,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'newgosling' ,
+ 'changetype' : 'replace' ,
+ 'expectedRC' : 53 }
</call>
-
+
<!--- User Search With Password -->
<message>
'Security: Min Pwd Age: Test: Step 3. User Searching With Password'
@@ -95,7 +100,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=dmiller,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newgosling' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -113,27 +118,31 @@
'Security: Min Pwd Age: Postamble Reset: Step 1. Admin Disabling Minimum Pwd Age'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_reset_min_pwd_age.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'minimum-password-age' ,
+ 'attributeValue' : '0 s' }
</call>
-
- <!--- User Change Password -->
- <message>
+
+ <message>
'Security: Min Pwd Age: Postamble Reset: Step 2. User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=dmiller,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'gosling' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd4.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=dmiller,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'gosling' ,
+ 'DNToModify' : 'uid=dmiller,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'newgosling' ,
+ 'changetype' : 'replace' }
</call>
-
+
<!--- User Search With Password -->
<message>
'Security: Min Pwd Age: Postamble Reset: Step 3. User Searching With Password'
@@ -144,7 +153,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=dmiller,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newgosling' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -154,14 +163,17 @@
'Security: Min Pwd Age: Postamble Reset: Step 4. User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=dmiller,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'newgosling' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_reset_pwd4.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=dmiller,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'newgosling' ,
+ 'DNToModify' : 'uid=dmiller,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'gosling' ,
+ 'changetype' : 'replace' }
</call>
-
+
<!--- User Search With Password -->
<message>
'Security: Min Pwd Age: Postamble Reset: Step 5. User Searching With Password'
@@ -172,7 +184,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=dmiller,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'gosling' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
index a16ead2..0fa6269 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
@@ -75,7 +75,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=sguy,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'superguy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -85,7 +85,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=sgal,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'supergal' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -103,14 +103,16 @@
'Security: Mult Pwd Policies: Admin Changing Sales Lockout Count'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_lockout_cnt_sales.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Sales Password Policy' ,
+ 'attributeName' : 'lockout-failure-count' ,
+ 'attributeValue' : '3' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -135,7 +137,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=sguy,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : '%s' % pwds ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -220,7 +222,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=sgal,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'supergal' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 80 }
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
index 31664b0..f462a87 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
@@ -96,14 +96,16 @@
'Security: Preencoded Pwds: Admin Enabling Preencoded Pwds'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_enable_preencoded_pwds.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'allow-pre-encoded-passwords' ,
+ 'attributeValue' : 'true' }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -131,7 +133,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=pguy,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'superguy' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -149,20 +151,22 @@
'Security: Preencoded Pwds: Admin Disabling Pre-encoded Pwds'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_disable_preencoded_pwds.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'allow-pre-encoded-passwords' ,
+ 'attributeValue' : 'false' }
</call>
-
- <call function="'SearchObject'">
+
+ <call function="'SearchObject'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=pgal,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'supergal' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
index 68ed090..adc4920 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
@@ -67,7 +67,7 @@
<import machine="'%s' % STAF_LOCAL_HOSTNAME"
file="'%s/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml' % (TESTS_DIR)"/>
<call function="'force_pwd_change_all_users'" />
-
+ <!--
<import machine="'%s' % STAF_LOCAL_HOSTNAME"
file="'%s/testcases/security/pwd_policy/security_enable_max_pwd_age.xml' % (TESTS_DIR)"/>
<call function="'enable_max_pwd_age'" />
@@ -75,7 +75,7 @@
<import machine="'%s' % STAF_LOCAL_HOSTNAME"
file="'%s/testcases/security/pwd_policy/security_disable_max_pwd_age.xml' % (TESTS_DIR)"/>
<call function="'disable_max_pwd_age'" />
-
+ -->
<import machine="'%s' % STAF_LOCAL_HOSTNAME"
file="'%s/testcases/security/pwd_policy/security_min_pwd_age.xml' % (TESTS_DIR)"/>
<call function="'min_pwd_age'" />
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml b/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
index 8fae0f6..b3a9106 100755
--- a/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
+++ b/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
@@ -41,11 +41,11 @@
</message>
<call function="'compareEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'attrToBeCompared' : 'ds-cfg-allow-user-password-changes:true',
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'attrToBeCompared' : 'ds-cfg-allow-user-password-changes:true',
'entryToBeCompared' : 'cn=Default Password Policy,cn=Password Policies,cn=config' }
</call>
@@ -67,7 +67,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'sprain' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -90,7 +90,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newsprain' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -109,15 +109,18 @@
'Security: Pwd Policy: User with Bad Credentials Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'BadPwd' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd.ldif' % logsRemoteDataDir,
- 'expectedRC' : 49 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'BadPwd' ,
+ 'DNToModify' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'newsprain' ,
+ 'changetype' : 'replace' ,
+ 'expectedRC' : 49 }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -131,14 +134,17 @@
'Security: Pwd Policy: User Changing Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'sprain' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_change_pwd.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'sprain' ,
+ 'DNToModify' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'newsprain' ,
+ 'changetype' : 'replace' }
</call>
-
+
<message>
'Security: Pwd Policy: User Searching With Old Password'
</message>
@@ -148,7 +154,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'sprain' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -163,7 +169,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newsprain' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
@@ -181,27 +187,32 @@
'Security: Pwd Policy: Admin Changing Password Policy'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_change_pwd_policy.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'allow-user-password-changes' ,
+ 'attributeValue' : 'false' }
</call>
-
+
<message>
'Security: Pwd Policy: User Resetting Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'sprain' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_reset_pwd.ldif' % logsRemoteDataDir ,
- 'expectedRC' : 49 }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'sprain' ,
+ 'DNToModify' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'sprain' ,
+ 'changetype' : 'replace' ,
+ 'expectedRC' : 49 }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -215,26 +226,31 @@
'Security: Pwd Policy: Postamble Step 1 - Admin Resetting Password Policy'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pwd_policy/admin_reset_pwd_policy.ldif' % logsRemoteDataDir }
+ <call function="'modifyPwdPolicy'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'propertyName' : 'Default Password Policy' ,
+ 'attributeName' : 'allow-user-password-changes' ,
+ 'attributeValue' : 'true' }
</call>
-
+
<message>
'Security: Pwd Policy: Postamble Step 2 - User Resetting Password'
</message>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
- 'dsInstancePswd' : 'newsprain' ,
- 'entryToBeModified' : '%s/security/pwd_policy/user_reset_pwd.ldif' % logsRemoteDataDir }
+ <call function="'modifyAnAttribute'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'dsInstancePswd' : 'newsprain' ,
+ 'DNToModify' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
+ 'attributeName' : 'userpassword' ,
+ 'newAttributeValue' : 'sprain' ,
+ 'changetype' : 'replace' }
</call>
-
+
<message>
'Security: Pwd Policy: Postamble Step 3 - User Searching With Old Password'
</message>
@@ -244,7 +260,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'newsprain' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' ,
'expectedRC' : 49 }
@@ -259,7 +275,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : 'uid=scarter,ou=people,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'sprain' ,
- 'dsBaseDN' : 'dc=example,dc=com' ,
+ 'dsBaseDN' : 'dc=example,dc=com' ,
'dsFilter' : 'objectclass=*' ,
'extraParams' : '-s base' }
</call>
--
Gitblit v1.10.0