Changeset 171 for branches/samba-3.0

Timestamp:

Apr 14, 2009, 4:33:28 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Fix for Ticket #53 and #54

File:

• branches/samba-3.0/source/web/startstop.c (modified) (6 diffs)

branches/samba-3.0/source/web/startstop.c

@@ -18 +18 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-
 #include "includes.h"
+#ifdef __OS2__
+#include "process.h"
+#define exists(filename) (!access(filename, F_OK))
+#define SWAT_HELPER(WHAT, WHO)        slprintf(binfile, sizeof(pstring) - 1, "swathelp.cmd"); \
+                                      int rc; \
+                                      rc=spawnl(P_NOWAIT, binfile, binfile, #WHAT, #WHO, NULL);
+//                                    printf("BINDIR: %s",dyn_BINDIR); \
+//                                    printf("SBINDIR: %s",dyn_SBINDIR); \
+//                                    printf("SWATDIR: %s",dyn_SWATDIR); \
+//                                    printf(#WHAT " " #WHO " pid:%i", rc);
+#endif
 #include "web/swat_proto.h"
 #include "dynconfig.h"
-
 
 /** Startup smbd from web interface. */
@@ -28 +37 @@
 {
         pstring binfile;
-
         if (geteuid() != 0) return;
 
+#ifdef __OS2__  /* because fork() in our libc ends all child when parent is closed we use spawn() */
+        SWAT_HELPER(start, smbd)       
+#else                      
         if (fork()) {
                 return;
         }
-
         slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", dyn_SBINDIR);
-
         become_daemon(True, False);
-
         execl(binfile, binfile, "-D", NULL);
-
         exit(0);
+#endif
 }
-
 /* startup nmbd */
 void start_nmbd(void)
 {
         pstring binfile;
-
         if (geteuid() != 0) return;
 
+#ifdef __OS2__  /* because fork() in our libc ends all child when parent is closed we use spawn() */
+        SWAT_HELPER(start, nmbd)
+#else   
         if (fork()) {
                 return;
         }
-
         slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", dyn_SBINDIR);
         
         become_daemon(True, False);
-
         execl(binfile, binfile, "-D", NULL);
-
         exit(0);
+#endif
 }
-
 /** Startup winbindd from web interface. */
 void start_winbindd(void)
@@ -71 +77 @@
         if (geteuid() != 0) return;
 
+#ifdef __OS2__  /* because fork() in our libc ends all child when parent is closed we use spawn() */
+        SWAT_HELPER(start, winbindd)
+#else   
+
         if (fork()) {
                 return;
         }
-
         slprintf(binfile, sizeof(pstring) - 1, "%s/winbindd", dyn_SBINDIR);
-
         become_daemon(True, False);
-
         execl(binfile, binfile, NULL);
-
         exit(0);
+#endif
 }
-
 
 /* stop smbd */
@@ -89 +95 @@
 {
         pid_t pid = pidfile_pid("smbd");
-
         if (geteuid() != 0) return;
 
+#ifdef __OS2__  /* we do it a bit nicer */
+        if (smbd_running()) {
+        pstring binfile;
+        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;     
 
-        if (geteuid() != 0) return;
-
+#ifdef __OS2__  /* we do it a bit nicer */
+        if (nmbd_running()) {
+        pstring binfile;
+        SWAT_HELPER(stop, nmbd)
+        }
+#else
         if (pid <= 0) return;
 
         kill(pid, SIGTERM);
+#endif
 }
+
 #ifdef WITH_WINBIND
 /* stop winbindd */
@@ -116 +134 @@
         if (geteuid() != 0) return;
 
+#ifdef __OS2__  /* we do it a bit nicer */
+        if (winbindd_running()) {
+        pstring binfile;
+        SWAT_HELPER(stop, winbindd)
+        }
+#else
         if (pid <= 0) return;
 
         kill(pid, SIGTERM);
+#endif
 }
 #endif
@@ -125 +150 @@
 {
         if (geteuid() != 0) return;
-
-        if (procid_to_pid(&pid) <= 0) return;
+ 
+    if (procid_to_pid(&pid) <= 0) return;
 
         kill(procid_to_pid(&pid), SIGTERM);