Changeset 3187b26 for npl/fileserver/smb-ldap-tool/modified/smbldap_tools.pm

Timestamp:

03/12/18 14:22:15 (7 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

master, perl-5.22

Children:

fdfd619

Parents:

1051986

Message:

flush nscd cache when modifying users

File:

• npl/fileserver/smb-ldap-tool/modified/smbldap_tools.pm (modified) (14 diffs)

npl/fileserver/smb-ldap-tool/modified/smbldap_tools.pm

@@ -241 +241 @@
         undef $smbconf{$parameter_smb};
   }
-  
+
 }
 
@@ -287 +287 @@
                                                                          # debug => 0xffff,
                                                                         );
-                                                                        
+
         if ($ldap_master)
         {
@@ -542 +542 @@
                                                                                   ]
                                                                 );
-        
+
         $add->code && warn "failed to add entry: ", $add->error ;
         sleep($wait);
@@ -564 +564 @@
         $name =~ s/.$//s;
 
-        my ($lmpassword,$ntpassword) = ntlmgen $name;   
+        my ($lmpassword,$ntpassword) = ntlmgen $name;
         my $modify = $ldap->modify ( "uid=$user,$config{computersdn}",
                                                                                 changes => [
@@ -581 +581 @@
                                                                                                    ]
                                                                           );
-        
+
         $modify->code && die "failed to add entry: ", $modify->error ;
 
@@ -594 +594 @@
         if (!defined(get_group_dn($group))) {
           print "$0: group \"$group\" doesn't exist\n";
-          exit (6); 
+          exit (6);
         }
         if (!defined($dn_line)) {
@@ -666 +666 @@
   }
 
-  
+
 sub add_grouplist_user
 {
@@ -683 +683 @@
         my $dn_line;
         my $dn = get_dn_from_line($dn_line);
-        
+
         if (!defined($dn_line = get_user_dn($user))) {
           print "$0: user $user doesn't exist\n";
@@ -725 +725 @@
   {
         my ($gname, $gid, $force) = @_;
-        my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1";
-        if ($nscd_status == 0) {
-          system "/etc/init.d/nscd stop > /dev/null 2>&1";
-        }
+        # my $nscd_status = system "/etc/init.d/nscd status >/dev/null 2>&1";
+        # if ($nscd_status == 0) {
+        #   system "/etc/init.d/nscd stop > /dev/null 2>&1";
+        # }
         if (!defined($gid)) {
           #while (defined(getgrgid($config{GID_START}))) {
@@ -742 +742 @@
           }
         }
-        if ($nscd_status == 0) {
-          system "/etc/init.d/nscd start > /dev/null 2>&1";
-        }
+        # if ($nscd_status == 0) {
+          # system "/etc/init.d/nscd start > /dev/null 2>&1";
+          system "nscd -i passwd; nscd -i group";
+        # }
         my $modify = $ldap->add ( "cn=$gname,$config{groupsdn}",
                                                                          attrs => [
@@ -752 +753 @@
                                                                                           ]
                                                                    );
-        
+
         $modify->code && die "failed to add entry: ", $modify->error ;
         return $gid;
@@ -1078 +1079 @@
         }
         my $entry = $next_uid_mesg->entry(0);
-            
+
         $nextuid = $entry->get_value($attribute);
         my $modify=$ldap->modify( "$config{sambaUnixIdPooldn}",
@@ -1103 +1104 @@
 
 sub utf8Encode {
-  my $arg = shift; 
+  my $arg = shift;
 
   return to_utf8(
@@ -1118 +1119 @@
                                    -charset => 'ISO-8859-1',
                                   );
-}   
+}
 
 1;
-