Changeset 988 for vendor/current/source3/lib/smbrun.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/lib/smbrun.c (modified) (12 diffs)

vendor/current/source3/lib/smbrun.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "system/filesys.h"
 
 /* need to move this from here!! need some sleep ... */
@@ -32 +33 @@
         TALLOC_CTX *ctx = talloc_stackframe();
         char *path = NULL;
+        mode_t mask;
 
         path = talloc_asprintf(ctx,
@@ -43 +45 @@
 
         /* now create the file */
+        mask = umask(S_IRWXO | S_IRWXG);
         fd = mkstemp(path);
+        umask(mask);
 
         if (fd == -1) {
@@ -70 +74 @@
         uid_t uid = current_user.ut.uid;
         gid_t gid = current_user.ut.gid;
+        void (*saved_handler)(int);
 
         /*
@@ -91 +96 @@
          */
 
-        CatchChildLeaveStatus();
+        saved_handler = CatchChildLeaveStatus();
                                         
-        if ((pid=sys_fork()) < 0) {
+        if ((pid=fork()) < 0) {
                 DEBUG(0,("smbrun: fork failed with error %s\n", strerror(errno) ));
-                CatchChild(); 
+                (void)CatchSignal(SIGCLD, saved_handler);
                 if (outfd) {
                         close(*outfd);
@@ -120 +125 @@
                 }
 
-                CatchChild(); 
+                (void)CatchSignal(SIGCLD, saved_handler);
 
                 if (wpid != pid) {
@@ -133 +138 @@
                 /* Reset the seek pointer. */
                 if (outfd) {
-                        sys_lseek(*outfd, 0, SEEK_SET);
+                        lseek(*outfd, 0, SEEK_SET);
                 }
 
@@ -145 +150 @@
         }
         
-        CatchChild(); 
+        (void)CatchChild();
         
         /* we are in the child. we exec /bin/sh to do the work for us. we
@@ -234 +239 @@
         gid_t gid = current_user.ut.gid;
         int ifd[2];
+        void (*saved_handler)(int);
         
         /*
@@ -254 +260 @@
          */
 
-        CatchChildLeaveStatus();
+        saved_handler = CatchChildLeaveStatus();
                                         
-        if ((pid=sys_fork()) < 0) {
+        if ((pid=fork()) < 0) {
                 DEBUG(0, ("smbrunsecret: fork failed with error %s\n", strerror(errno)));
-                CatchChild(); 
+                (void)CatchSignal(SIGCLD, saved_handler);
                 return errno;
         }
@@ -290 +296 @@
                 }
 
-                CatchChild(); 
+                (void)CatchSignal(SIGCLD, saved_handler);
 
                 if (wpid != pid) {
@@ -306 +312 @@
         }
         
-        CatchChild(); 
+        (void)CatchChild();
         
         /* we are in the child. we exec /bin/sh to do the work for us. we