Changeset 292

Timestamp:

Jun 30, 2009, 5:32:59 PM (16 years ago)

Author:

Silvan Scherrer

Message:

fix swat, so that it works even when samba is not in x:\samba

Location:

branches/samba-3.0/source/web

Files:

• startstop.c (modified) (1 diff)
• swat.c (modified) (1 diff)

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

@@ -21 +21 @@
 #ifdef __OS2__
 #include "process.h"
-#define SWAT_HELPER(WHAT, WHO)        slprintf(binfile, sizeof(pstring) - 1, "swathelp.cmd"); \
+#define SWAT_HELPER(WHAT, WHO)        slprintf(binfile, sizeof(pstring) - 1, "%s/swathelp.cmd", getcwd(NULL, _MAX_PATH)); \
                                       int rc; \
                                       rc=spawnl(P_NOWAIT, binfile, binfile, #WHAT, #WHO, NULL);

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

@@ -1384 +1384 @@
         load_printers();
 
+#ifndef __OS2__
         cgi_setup(dyn_SWATDIR, !demo_mode);
+#else
+        fstring path;
+        fstrcpy(path, getcwd(NULL, _MAX_PATH));
+        fstrcat(path, "/swat");
+        cgi_setup(path, !demo_mode);
+#endif
 
         print_header();