diff options
| -rwxr-xr-x | source3/script/installswat.sh | 2 | ||||
| -rw-r--r-- | source3/utils/smbrun.c | 74 | ||||
| -rw-r--r-- | source3/utils/torture.c | 14 | ||||
| -rw-r--r-- | source3/web/statuspage.c | 6 |
4 files changed, 20 insertions, 76 deletions
diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh index 8afbc52eba..8868d4cbb1 100755 --- a/source3/script/installswat.sh +++ b/source3/script/installswat.sh @@ -3,7 +3,7 @@ SWATDIR=$1 SRCDIR=$2/ -BOOKDIR=$3 +BOOKDIR=$SWATDIR/using_samba echo Installing SWAT in $SWATDIR echo Installing the Samba Web Administration Tool diff --git a/source3/utils/smbrun.c b/source3/utils/smbrun.c deleted file mode 100644 index b7c678411c..0000000000 --- a/source3/utils/smbrun.c +++ /dev/null @@ -1,74 +0,0 @@ -/* - Unix SMB/Netbios implementation. - Version 1.9. - external program running routine - Copyright (C) Andrew Tridgell 1992-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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. -*/ - -#include "includes.h" - - -/******************************************************************* -close the low 3 fd's and open dev/null in their place -********************************************************************/ -static void close_fds(void) -{ - int fd; - int i; - close(0); close(1); close(2); - /* try and use up these file descriptors, so silly - library routines writing to stdout etc won't cause havoc */ - for (i=0;i<3;i++) { - fd = open("/dev/null",O_RDWR,0); - if (fd < 0) fd = open("/dev/null",O_WRONLY,0); - if (fd != i) return; - } -} - - -/* -This is a wrapper around the system() call to allow commands to run correctly -as non root from a program which is switching between root and non-root - -It takes 3 arguments as uid,gid,command and runs command after -becoming a non-root user */ - int main(int argc,char *argv[]) -{ - uid_t uid; - gid_t gid; - - close_fds(); - - if (argc != 4) exit(2); - - uid = (uid_t)atoi(argv[1]); - gid = (gid_t)atoi(argv[2]); - - become_user_permanently( uid, gid); - - /* paranoia :-) */ - if (getuid() != uid) - return(3); - - if (geteuid() != getuid()) - return(4); - - /* this is to make sure that the system() call doesn't run forever */ - alarm(30); - - return(system(argv[3])); -} diff --git a/source3/utils/torture.c b/source3/utils/torture.c index fe22b60a89..4e6789e6ae 100644 --- a/source3/utils/torture.c +++ b/source3/utils/torture.c @@ -2538,6 +2538,20 @@ static void run_opentest(int dummy) cli_unlink(&cli1, fname); + + printf("testing ctemp\n"); + { + char *tmp_path; + fnum1 = cli_ctemp(&cli1, "\\", &tmp_path); + if (fnum1 == -1) { + printf("ctemp failed (%s)\n", cli_errstr(&cli1)); + return; + } + printf("ctemp gave path %s\n", tmp_path); + cli_close(&cli1, fnum1); + cli_unlink(&cli1, tmp_path); + } + close_connection(&cli1); } diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c index 5c800797c0..27a40d1695 100644 --- a/source3/web/statuspage.c +++ b/source3/web/statuspage.c @@ -21,6 +21,7 @@ #include "includes.h" +static pid_t smbd_pid; static char *tstring(time_t t) { @@ -93,7 +94,8 @@ static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st struct connections_data crec; memcpy(&crec, dbuf.dptr, sizeof(crec)); - if (crec.cnum != -1 || !process_exists(crec.pid)) return 0; + if (crec.cnum != -1 || !process_exists(crec.pid) || + (crec.pid == smbd_pid)) return 0; printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td>\n", (int)crec.pid, @@ -133,6 +135,8 @@ void status_page(void) int refresh_interval=30; TDB_CONTEXT *tdb; + smbd_pid = pidfile_pid("smbd"); + if (cgi_variable("smbd_restart")) { stop_smbd(); start_smbd(); |