Changeset 245

Timestamp:

May 31, 2009, 6:01:46 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Made SWAT workable (#51, 54, 55) in 3.2 branch

Location:

branches/samba-3.2.x/source/web

Files:

• cgi.c (modified) (2 diffs)
• startstop.c (modified) (9 diffs)

branches/samba-3.2.x/source/web/cgi.c ¶

@@ -315 +315 @@
         }
 
+#ifndef __OS2__
         pwd = getpwnam_alloc(NULL, user);
         if (!pwd) {
@@ -329 +330 @@
         }
         TALLOC_FREE(pwd);
+#endif
 }
 

branches/samba-3.2.x/source/web/startstop.c ¶

@@ -19 +19 @@
 
 #include "includes.h"
+
+#ifdef __OS2__
+        /* fork() in klibc on OS/2 ends all children when parent 
+           is closed, therefore we use spawn() */
+#include "process.h"
+#define SWAT_HELPER(WHAT, WHO) \
+        asprintf(&binfile, "%s/swathelp.cmd", get_dyn_SWATDIR()); \
+        int rc; \
+        rc=spawnl(P_NOWAIT, binfile, binfile, #WHAT, #WHO, NULL);
+#endif
+
 #include "web/swat_proto.h"
 #include "dynconfig.h"
@@ -31 +42 @@
                  return;
         }
-
+#ifdef __OS2__
+        /* fork() in klibc on OS/2 ends all children when parent 
+           is closed, therefore we use spawn() */
+        SWAT_HELPER(start, smbd)       
+#else                      
         if (fork()) {
                 return;
@@ -41 +56 @@
         }
         exit(0);
+#endif
 }
 
@@ -51 +67 @@
                 return;
         }
-
+#ifdef __OS2__
+        /* fork() in klibc on OS/2 ends all children when parent 
+           is closed, therefore we use spawn() */
+        SWAT_HELPER(start, nmbd)
+#else   
         if (fork()) {
                 return;
@@ -61 +81 @@
         }
         exit(0);
+#endif
 }
 
@@ -71 +92 @@
                 return;
         }
-
+#ifdef __OS2__
+        /* fork() in klibc on OS/2 ends all children when parent 
+           is closed, therefore we use spawn() */
+        SWAT_HELPER(start, winbindd)
+#else   
         if (fork()) {
                 return;
@@ -81 +106 @@
         }
         exit(0);
+#endif
 }
 
@@ -88 +114 @@
 {
         pid_t pid = pidfile_pid("smbd");
-
         if (geteuid() != 0) return;
 
+#ifdef __OS2__  /* we do it a bit nicer */
+        if (smbd_running()) {
+                char *binfile = NULL;
+                SWAT_HELPER(stop, smbd)
+        }
+#else
         if (pid <= 0) return;
 
         kill(pid, SIGTERM);
+#endif
 }
-
 /* stop nmbd */
 void stop_nmbd(void)
 {
         pid_t pid = pidfile_pid("nmbd");
-
         if (geteuid() != 0) return;
 
+#ifdef __OS2__  /* we do it a bit nicer */
+        if (nmbd_running()) {
+                char *binfile = NULL;
+                SWAT_HELPER(stop, nmbd)
+        }
+#else
         if (pid <= 0) return;
 
         kill(pid, SIGTERM);
+#endif
 }
+
 #ifdef WITH_WINBIND
 /* stop winbindd */
@@ -115 +153 @@
         if (geteuid() != 0) return;
 
+#ifdef __OS2__  /* we do it a bit nicer */
+        if (winbindd_running()) {
+                char *binfile = NULL;
+                SWAT_HELPER(stop, winbindd)
+        }
+#else
         if (pid <= 0) return;
 
         kill(pid, SIGTERM);
+#endif
 }
 #endif