Ensure no empty object classes

diff --git a/ldap-useradmin/ldap-useradmin-lib.pl b/ldap-useradmin/ldap-useradmin-lib.pl
index b3b9c05..622a0e5 100644 (file)
--- a/ldap-useradmin/ldap-useradmin-lib.pl
+++ b/ldap-useradmin/ldap-useradmin-lib.pl
@@ -250,6 +250,7 @@ if ($schema->objectclass("person") && $config{'person'}) {
        push(@classes, "person");
        }
 @classes = &unique(@classes);
+@classes = grep { /\S/ } @classes;     # Remove empty
 local @attrs = &user_to_dn($_[0]);
 push(@attrs, &split_props($config{'props'}, $_[0]));
 push(@attrs, @{$_[0]->{'ldap_attrs'}});

diff --git a/ldap-useradmin/save_user.cgi b/ldap-useradmin/save_user.cgi
index 4137ceb..a450145 100755 (executable)
--- a/ldap-useradmin/save_user.cgi
+++ b/ldap-useradmin/save_user.cgi
@@ -352,6 +352,7 @@ else {
                push(@classes, split(/\s+/, $config{'other_class'}));
                push(@classes, $samba_class) if ($in{'samba'});
                push(@classes, split(' ',$cyrus_class)) if ($in{'cyrus'});
+               @classes = grep { /\S/ } @classes;      # Remove empty
                &name_fields();
                @classes = &unique(@classes);
                $base = &get_user_base();
@@ -526,6 +527,7 @@ else {
                push(@classes, "shadowAccount") if ($shadow);
                &name_fields();
                @classes = &unique(@classes);
+               @classes = grep { /\S/ } @classes;      # Remove empty
                @rprops = grep { defined($uinfo->get_value($_)) } @rprops;
                $newdn = $in{'dn'};
                %allprops = ( "cn" => $real,