--- smbldap-groupadd 2009-03-04 16:46:42.000000000 +0000
+++ smbldap-groupadd 2009-03-06 10:38:36.000000000 +0000
@@ -47,10 +47,11 @@
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";
}
@@ -146,7 +147,8 @@
$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'}) {
--- smbldap-groupdel 2009-03-03 21:29:44.000000000 +0000
+++ smbldap-groupdel 2009-03-03 21:32:09.000000000 +0000
@@ -54,10 +54,11 @@
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))) {
--- smbldap-groupmod 2009-03-06 10:39:43.000000000 +0000
+++ smbldap-groupmod 2009-03-06 10:41:27.000000000 +0000
@@ -63,10 +63,11 @@
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');
@@ -220,10 +221,11 @@
$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
--- smbldap_tools.pm 2009-03-06 10:44:24.000000000 +0000
+++ smbldap_tools.pm 2009-03-06 10:43:17.000000000 +0000
@@ -742,9 +742,10 @@
# $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) ) {
@@ -762,7 +763,8 @@
}
}
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}",
--- smbldap-useradd 2009-03-03 21:28:00.000000000 +0000
+++ smbldap-useradd 2009-03-06 10:50:08.000000000 +0000
@@ -83,10 +83,11 @@
# 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
@@ -176,7 +177,8 @@
}
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;
--- smbldap-userdel 2008-04-22 09:13:29.000000000 +0100
+++ smbldap-userdel 2009-03-06 10:51:31.000000000 +0000
@@ -93,10 +93,11 @@
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
--- smbldap-usermod 2009-03-03 21:32:34.000000000 +0000
+++ smbldap-usermod 2009-03-06 10:39:26.000000000 +0000
@@ -237,22 +237,15 @@
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 );
@@ -878,10 +871,11 @@
$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'} ) ) {
--- smbldap-usershow 2008-04-22 09:13:29.000000000 +0100
+++ smbldap-usershow 2009-03-06 10:53:36.000000000 +0000
@@ -44,9 +44,10 @@
# Read only first @ARGV
my $user = $ARGV[0];
-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();