--- rpms/e-smith-ibays/sme8/e-smith-ibays-2.2.0-better-ldap.patch 2010/11/03 14:00:52 1.2 +++ rpms/e-smith-ibays/sme8/e-smith-ibays-2.2.0-better-ldap.patch 2010/11/04 14:37:08 1.4 @@ -89,7 +89,7 @@ diff -up e-smith-ibays-2.2.0/root/etc/e- "/bin/false", "$ibayName" - ) == 0 or die "Failed to create account $ibayName.\n"; -+ ) == 0 or ( $x = 255, warn "Failed to create (unix) account $ibayName.\n"; ++ ) == 0 or ( $x = 255, warn "Failed to create (unix) account $ibayName.\n" ); } + system( @@ -97,7 +97,7 @@ diff -up e-smith-ibays-2.2.0/root/etc/e- + "-g", + $ibay->prop("Gid"), + $ibayName -+ ) == 0 or ( $x = $ldapauth ne 'enabled ? $x : 255, warn "Failed to create (ldap) group $ibayName.\n" ); ++ ) == 0 or ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to create (ldap) group $ibayName.\n" ); + + system( + "/usr/sbin/cpu", "useradd", @@ -115,7 +115,7 @@ diff -up e-smith-ibays-2.2.0/root/etc/e- + "-s", + "/bin/false", + "$ibayName" -+ ) == 0 or ( $x = $ldapauth ne 'enabled ? $x : 255, warn "Failed to create (ldap) account $ibayName.\n" ); ++ ) == 0 or ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to create (ldap) account $ibayName.\n" ); + #------------------------------------------------------------ # Create the ibay files and set the password. @@ -146,7 +146,7 @@ diff -up e-smith-ibays-2.2.0/root/etc/e- } + + system("/usr/sbin/cpu", "usermod", "-L", $ibayName) == 0 -+ or ( $x = $ldapauth ne 'enabled ? $x : 255, warn "Error locking (ldap) account $ibayName" ); ++ or ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Error locking (ldap) account $ibayName" ); } elsif ($event eq 'ibay-modify') { @@ -171,7 +171,7 @@ diff -up e-smith-ibays-2.2.0/root/etc/e- + system("/usr/sbin/cpu", "usermod", "-c", $ibay->prop("Name"), + "-G", "shared," . $ibay->prop("Group"), "$ibayName") == 0 -+ or ( $x = $ldapauth ne 'enabled ? $x : 255, warn "Failed to modify (ldap) account $ibayName.\n" ); ++ or ( $x = $ldapauth ne 'enabled' ? $x : 255, warn "Failed to modify (ldap) account $ibayName.\n" ); } #------------------------------------------------------------