diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2010-08-18 11:07:47 -0600 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2010-08-31 13:35:54 -0600 |
| commit | 59ae6fe07d5edc58a5b07ce5bd961b9714157089 (patch) | |
| tree | 4060b237b07798fa419ed37aa296d90ac902ad6a | |
| parent | 99c467c2d7b3031f15dc1b6db79e7d1c580b4719 (diff) | |
| download | ds-59ae6fe07d5edc58a5b07ce5bd961b9714157089.tar.gz ds-59ae6fe07d5edc58a5b07ce5bd961b9714157089.tar.xz ds-59ae6fe07d5edc58a5b07ce5bd961b9714157089.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.in | 2 | ||||
| -rw-r--r-- | ldap/admin/src/scripts/template-ns-activate.pl.in | 2 | ||||
| -rw-r--r-- | 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; |