From 3e9c693961ea60eb673f665d26f1b95ab73704c7 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 18 Aug 2010 11:07:47 -0600 Subject: 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. --- ldap/admin/src/scripts/template-ns-accountstatus.pl.in | 2 +- ldap/admin/src/scripts/template-ns-activate.pl.in | 2 +- ldap/admin/src/scripts/template-ns-inactivate.pl.in | 2 +- 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; -- cgit