summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2010-08-18 11:07:47 -0600
committerRich Megginson <rmeggins@redhat.com>2010-08-31 10:36:01 -0600
commit3e9c693961ea60eb673f665d26f1b95ab73704c7 (patch)
tree9e260aa08f47d3d063e73374123a9649914ec7e4
parent106416dc59b8c920ee5461e0fae2aad4610e81ba (diff)
downloadds-3e9c693961ea60eb673f665d26f1b95ab73704c7.tar.gz
ds-3e9c693961ea60eb673f665d26f1b95ab73704c7.tar.xz
ds-3e9c693961ea60eb673f665d26f1b95ab73704c7.zip
openldap ldapsearch returns empty line at end of LDIF output
The script was looking for 1 and only 1 line returned by the ldapsearch to see if the given entry is a role. openldap ldapsearch returns an empty line as the last line. So just change the check to look for 1 or more lines.
-rw-r--r--ldap/admin/src/scripts/template-ns-accountstatus.pl.in2
-rw-r--r--ldap/admin/src/scripts/template-ns-activate.pl.in2
-rw-r--r--ldap/admin/src/scripts/template-ns-inactivate.pl.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/ldap/admin/src/scripts/template-ns-accountstatus.pl.in b/ldap/admin/src/scripts/template-ns-accountstatus.pl.in
index ba6a491a..2712d096 100644
--- a/ldap/admin/src/scripts/template-ns-accountstatus.pl.in
+++ b/ldap/admin/src/scripts/template-ns-accountstatus.pl.in
@@ -505,7 +505,7 @@ if ( $retCode2 != 0 )
exit $retCode2;
}
-if ( $nbLineRole == 1 )
+if ( $nbLineRole > 0 )
{
debug("Groups of users\n");
$role=1;
diff --git a/ldap/admin/src/scripts/template-ns-activate.pl.in b/ldap/admin/src/scripts/template-ns-activate.pl.in
index ba6a491a..2712d096 100644
--- a/ldap/admin/src/scripts/template-ns-activate.pl.in
+++ b/ldap/admin/src/scripts/template-ns-activate.pl.in
@@ -505,7 +505,7 @@ if ( $retCode2 != 0 )
exit $retCode2;
}
-if ( $nbLineRole == 1 )
+if ( $nbLineRole > 0 )
{
debug("Groups of users\n");
$role=1;
diff --git a/ldap/admin/src/scripts/template-ns-inactivate.pl.in b/ldap/admin/src/scripts/template-ns-inactivate.pl.in
index ba6a491a..2712d096 100644
--- a/ldap/admin/src/scripts/template-ns-inactivate.pl.in
+++ b/ldap/admin/src/scripts/template-ns-inactivate.pl.in
@@ -505,7 +505,7 @@ if ( $retCode2 != 0 )
exit $retCode2;
}
-if ( $nbLineRole == 1 )
+if ( $nbLineRole > 0 )
{
debug("Groups of users\n");
$role=1;