diff -up smbldap-tools-0.9.6/smbldap-groupadd.orig smbldap-tools-0.9.6/smbldap-groupadd --- smbldap-tools-0.9.6/smbldap-groupadd.orig 2010-11-15 14:45:49.000000000 +0000 +++ smbldap-tools-0.9.6/smbldap-groupadd 2011-03-07 13:26:20.744921381 +0000 @@ -49,10 +49,11 @@ if ( (!$ok) || (@ARGV < 1) || ($Options{ exit (1); } -my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +my $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ($nscd_status == 0) { - system "/etc/init.d/nscd stop > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } @@ -148,7 +149,8 @@ if ($Options{'b'}) { $ldap_master->unbind; if ($nscd_status == 0) { - system "/etc/init.d/nscd start > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } if ($Options{'p'}) { diff -up smbldap-tools-0.9.6/smbldap-groupdel.orig smbldap-tools-0.9.6/smbldap-groupdel --- smbldap-tools-0.9.6/smbldap-groupdel.orig 2010-11-15 14:45:49.000000000 +0000 +++ smbldap-tools-0.9.6/smbldap-groupdel 2011-03-07 13:26:20.745921538 +0000 @@ -56,10 +56,11 @@ my $dn = get_dn_from_line($dn_line); group_del($dn); -my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +my $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ($nscd_status == 0) { - system "/etc/init.d/nscd restart > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } #if (defined($dn_line = get_group_dn($_groupName))) { diff -up smbldap-tools-0.9.6/smbldap-groupmod.orig smbldap-tools-0.9.6/smbldap-groupmod --- smbldap-tools-0.9.6/smbldap-groupmod.orig 2010-11-15 14:45:49.000000000 +0000 +++ smbldap-tools-0.9.6/smbldap-groupmod 2011-03-07 13:26:20.745921538 +0000 @@ -65,10 +65,11 @@ if (! ($group_entry = read_group_entry($ my $newname = $Options{'n'}; -my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +my $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ($nscd_status == 0) { - system "/etc/init.d/nscd restart > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } my $gid=$group_entry->get_value('gidNumber'); @@ -222,10 +223,11 @@ if ($group_sid) { $modify->code && warn "failed to delete entry: ", $modify->error ; } -$nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +$nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ($nscd_status == 0) { - system "/etc/init.d/nscd restart > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } # take down session diff -up smbldap-tools-0.9.6/smbldap_tools.pm.orig smbldap-tools-0.9.6/smbldap_tools.pm --- smbldap-tools-0.9.6/smbldap_tools.pm.orig 2011-03-07 13:26:20.740920756 +0000 +++ smbldap-tools-0.9.6/smbldap_tools.pm 2011-03-07 13:26:20.746921694 +0000 @@ -746,9 +746,10 @@ sub delete_user { # $gid = group_add($groupname, $group_gid, $force_using_existing_gid) sub group_add { my ( $gname, $gid, $force ) = @_; - my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; + my $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd stop > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } if ( !defined($gid) ) { @@ -766,7 +767,8 @@ sub group_add { } } if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd start > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } my $modify = $ldap->add( "cn=$gname,$config{groupsdn}", diff -up smbldap-tools-0.9.6/smbldap-useradd.orig smbldap-tools-0.9.6/smbldap-useradd --- smbldap-tools-0.9.6/smbldap-useradd.orig 2011-03-07 13:26:20.736920132 +0000 +++ smbldap-tools-0.9.6/smbldap-useradd 2011-03-07 13:26:20.747921850 +0000 @@ -121,10 +121,11 @@ my $ldap_master = connect_ldap_master(); # cause problems when dealing with getpwuid because of the # negative ttl and ldap modification -my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +my $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd stop > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } # Read only first @ARGV @@ -222,7 +223,8 @@ elsif ( getpwuid($userUidNumber) ) { } if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd start > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } my $createGroup = 0; diff -up smbldap-tools-0.9.6/smbldap-userdel.orig smbldap-tools-0.9.6/smbldap-userdel --- smbldap-tools-0.9.6/smbldap-userdel.orig 2010-11-15 14:45:49.000000000 +0000 +++ smbldap-tools-0.9.6/smbldap-userdel 2011-03-07 13:26:20.747921850 +0000 @@ -96,10 +96,11 @@ if ($homedir) { system('rm', @rmargs, $homedir); } -my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +my $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ($nscd_status == 0) { - system "/etc/init.d/nscd restart > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } $ldap_master->unbind; # take down session diff -up smbldap-tools-0.9.6/smbldap-usermod.orig smbldap-tools-0.9.6/smbldap-usermod --- smbldap-tools-0.9.6/smbldap-usermod.orig 2011-03-07 13:26:20.737920288 +0000 +++ smbldap-tools-0.9.6/smbldap-usermod 2011-03-07 13:26:20.748922007 +0000 @@ -250,22 +250,15 @@ my $_userRid; if ( defined( $tmp = $Options{'u'} ) ) { if ( !defined( $Options{'o'} ) ) { - $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; + $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd stop > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } - if ( getpwuid($tmp) ) { - if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd start > /dev/null 2>&1"; - } - print "$0: uid number $tmp exists\n"; exit(6); } - if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd start > /dev/null 2>&1"; - } } push( @mods, 'uidNumber', $tmp ); @@ -914,10 +907,11 @@ if ( defined( my $new_user = $Options{'r $ldap_master->unbind; } -$nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +$nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ( $nscd_status == 0 ) { - system "/etc/init.d/nscd restart > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } if ( defined( $Options{'P'} ) ) { diff -up smbldap-tools-0.9.6/smbldap-usershow.orig smbldap-tools-0.9.6/smbldap-usershow --- smbldap-tools-0.9.6/smbldap-usershow.orig 2010-11-15 14:45:49.000000000 +0000 +++ smbldap-tools-0.9.6/smbldap-usershow 2011-03-07 13:26:20.749922163 +0000 @@ -55,9 +55,10 @@ if ( defined( $Options{'X'} ) ) { $characterSet = "UTF-8"; } -my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1"; +my $nscd_status = system "/etc/rc.d/init.d/nscd status >/dev/null 2>&1"; if ($nscd_status == 0) { - system "/etc/init.d/nscd restart > /dev/null 2>&1"; + system "/usr/sbin/nscd -i passwd > /dev/null 2>&1"; + system "/usr/sbin/nscd -i group > /dev/null 2>&1"; } my $ldap_slave=connect_ldap_slave();