Changeset 454 for trunk/server/source3/web

Timestamp:

Jun 4, 2010, 3:11:43 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

Location:

trunk/server/source3/web

Files:

• cgi.c (modified) (2 diffs)
• startstop.c (modified) (10 diffs)
• swat.c (modified) (1 diff)

trunk/server/source3/web/cgi.c

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

trunk/server/source3/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", getcwd(NULL, _MAX_PATH)); \
+        int rc; \
+        rc=spawnl(P_NOWAIT, binfile, binfile, #WHAT, #WHO, NULL);
+#endif
+
 #include "web/swat_proto.h"
 #include "dynconfig.h"
@@ -32 +43 @@
         }
 
+#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 +57 @@
         }
         exit(0);
+#endif
 }
 
@@ -52 +69 @@
         }
 
+#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 +83 @@
         }
         exit(0);
+#endif
 }
 
@@ -72 +95 @@
         }
 
+#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 +109 @@
         }
         exit(0);
+#endif
 }
 
@@ -91 +120 @@
         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
 }
 
@@ -103 +139 @@
         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
@@ -115 +158 @@
         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

trunk/server/source3/web/swat.c

@@ -1437 +1437 @@
         load_printers();
 
+#ifndef __OS2__
         cgi_setup(get_dyn_SWATDIR(), !demo_mode);
+#else
+
+#if 0
+        debug_set_logfile("swat.log"); // this produces a logfile in the dir where swat.exe is located. 
+#endif
+
+        fstring path;
+        fstrcpy(path, getcwd(NULL, _MAX_PATH));
+        fstrcat(path, "/swat");
+        cgi_setup(path, !demo_mode);
+#endif
 
         print_header();