torture: Use new samba_getpass() in smbtorture3.

[kai/samba.git] / source3 / web / startstop.c

diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index e10dff411806cca65136ce30916ebc164eb7e16b..ec8f802ae95caf3db30b451243b6c071a7998977 100644 (file)
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -5,7 +5,7 @@
    
    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,
@@ -14,77 +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 "../web/swat_proto.h"
-#include "dynconfig.h"
-
-/** Need to wait for daemons to startup */
-#define SLEEP_TIME 3
+#include "web/swat_proto.h"
+#include "dynconfig/dynconfig.h"
+#include "../lib/util/pidfile.h"
 
 /** 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;
        }
 
-       slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", dyn_SBINDIR);
-
-       become_daemon();
-
-       execl(binfile, binfile, "-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;
        }
 
-       slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", dyn_SBINDIR);
-       
-       become_daemon();
-
-       execl(binfile, binfile, "-D", NULL);
-
+       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)
 {
-       pstring binfile;
+       char *binfile = NULL;
 
-       if (geteuid() != 0) return;
+       if (geteuid() != 0) {
+               return;
+       }
 
        if (fork()) {
-               sleep(SLEEP_TIME);
                return;
        }
 
-       slprintf(binfile, sizeof(pstring) - 1, "%s/winbindd", dyn_SBINDIR);
-
-       become_daemon();
-
-       execl(binfile, binfile, NULL);
-
+       if (asprintf(&binfile, "%s/winbindd", get_dyn_SBINDIR()) > 0) {
+               become_daemon(true, false, false);
+               execl(binfile, binfile, NULL);
+       }
        exit(0);
 }
 
@@ -92,7 +86,7 @@ void start_winbindd(void)
 /* stop smbd */
 void stop_smbd(void)
 {
-       pid_t pid = pidfile_pid("smbd");
+       pid_t pid = pidfile_pid(lp_piddir(), "smbd");
 
        if (geteuid() != 0) return;
 
@@ -104,7 +98,7 @@ void stop_smbd(void)
 /* stop nmbd */
 void stop_nmbd(void)
 {
-       pid_t pid = pidfile_pid("nmbd");
+       pid_t pid = pidfile_pid(lp_piddir(), "nmbd");
 
        if (geteuid() != 0) return;
 
@@ -116,7 +110,7 @@ void stop_nmbd(void)
 /* stop winbindd */
 void stop_winbindd(void)
 {
-       pid_t pid = pidfile_pid("winbindd");
+       pid_t pid = pidfile_pid(lp_piddir(), "winbindd");
 
        if (geteuid() != 0) return;
 
@@ -126,12 +120,11 @@ void stop_winbindd(void)
 }
 #endif
 /* kill a specified process */
-void kill_pid(pid_t pid)
+void kill_pid(struct server_id pid)
 {
        if (geteuid() != 0) return;
 
-       if (pid <= 0) return;
+       if (procid_to_pid(&pid) <= 0) return;
 
-       kill(pid, SIGTERM);
-       sleep(SLEEP_TIME);
+       kill(procid_to_pid(&pid), SIGTERM);
 }