dynconfig: Have only one dynconfig.o in the common code.

[sfrench/samba-autobuild/.git] / source3 / web / startstop.c

diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 5f7d2e62062b8178729f14e746c7aea574a82536..e23acf8931376fc9d54c2d5c8d07f9667158df2f 100644 (file)
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -1,12 +1,11 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 1.9.
+   Unix SMB/CIFS implementation.
    start/stop nmbd and smbd
    Copyright (C) Andrew Tridgell 1998
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,55 +14,71 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-#include "smb.h"
+#include "web/swat_proto.h"
+#include "dynconfig/dynconfig.h"
 
-/* need to wait for daemons to startup */
-#define SLEEP_TIME 3
 
-/* startup smbd */
+/** Startup smbd from web interface. */
 void start_smbd(void)
 {
-       pstring binfile;
+       char *binfile = NULL;
 
-       if (geteuid() != 0) return;
+       if (geteuid() != 0) {
+                return;
+       }
 
        if (fork()) {
-               sleep(SLEEP_TIME);
                return;
        }
 
-       sprintf(binfile,"%s/smbd", SBINDIR);
-
-       become_daemon();
-
-       execl(binfile, "smbd", "-D", NULL);
-
+       if (asprintf(&binfile, "%s/smbd", get_dyn_SBINDIR()) > 0) {
+               become_daemon(true, false, false);
+               execl(binfile, binfile, "-D", NULL);
+       }
        exit(0);
 }
 
 /* startup nmbd */
 void start_nmbd(void)
 {
-       pstring binfile;
+       char *binfile = NULL;
 
-       if (geteuid() != 0) return;
+       if (geteuid() != 0) {
+               return;
+       }
 
        if (fork()) {
-               sleep(SLEEP_TIME);
                return;
        }
 
-       sprintf(binfile,"%s/nmbd", SBINDIR);
-       
-       become_daemon();
+       if (asprintf(&binfile, "%s/nmbd", get_dyn_SBINDIR()) > 0) {
+               become_daemon(true, false, false);
+               execl(binfile, binfile, "-D", NULL);
+       }
+       exit(0);
+}
+
+/** Startup winbindd from web interface. */
+void start_winbindd(void)
+{
+       char *binfile = NULL;
+
+       if (geteuid() != 0) {
+               return;
+       }
 
-       execl(binfile, "nmbd", "-D", NULL);
+       if (fork()) {
+               return;
+       }
 
+       if (asprintf(&binfile, "%s/winbindd", get_dyn_SBINDIR()) > 0) {
+               become_daemon(true, false, false);
+               execl(binfile, binfile, NULL);
+       }
        exit(0);
 }
 
@@ -71,11 +86,11 @@ void start_nmbd(void)
 /* stop smbd */
 void stop_smbd(void)
 {
-       unsigned pid = pidfile_pid("smbd");
+       pid_t pid = pidfile_pid("smbd");
 
        if (geteuid() != 0) return;
 
-       if (pid == 0) return;
+       if (pid <= 0) return;
 
        kill(pid, SIGTERM);
 }
@@ -83,22 +98,33 @@ void stop_smbd(void)
 /* stop nmbd */
 void stop_nmbd(void)
 {
-       unsigned pid = pidfile_pid("nmbd");
+       pid_t pid = pidfile_pid("nmbd");
 
        if (geteuid() != 0) return;
 
-       if (pid == 0) return;
+       if (pid <= 0) return;
 
        kill(pid, SIGTERM);
 }
-
-/* kill a specified process */
-void kill_pid(int pid)
+#ifdef WITH_WINBIND
+/* stop winbindd */
+void stop_winbindd(void)
 {
+       pid_t pid = pidfile_pid("winbindd");
+
        if (geteuid() != 0) return;
 
        if (pid <= 0) return;
 
        kill(pid, SIGTERM);
-       sleep(SLEEP_TIME);
+}
+#endif
+/* kill a specified process */
+void kill_pid(struct server_id pid)
+{
+       if (geteuid() != 0) return;
+
+       if (procid_to_pid(&pid) <= 0) return;
+
+       kill(procid_to_pid(&pid), SIGTERM);
 }