sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-14 20:23:54 +03:00
Code Activity

r22372: split out become_daemon() into it's own function

Browse Source 
this remove the dependency of util.o to swrap_close
which causes sometrouble with the pidl tests
on some hosts

metze
This commit is contained in:
Stefan Metzmacher
2007-04-19 14:14:11 +00:00
committed by Gerald (Jerry) Carter
parent 76fbe90596
commit 8cd36c47aa
2 changed files with 2 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/lib/util/config.mk
View File

@@ -26,7 +26,8 @@ OBJ_FILES = xfile.o \
ms_fnmatch.o \ ms_fnmatch.o \
mutex.o \ mutex.o \
idtree.o \ idtree.o \
module.o module.o \
become_daemon.o
PUBLIC_DEPENDENCIES = \ PUBLIC_DEPENDENCIES = \
LIBTALLOC LIBCRYPTO \ LIBTALLOC LIBCRYPTO \
SOCKET_WRAPPER EXT_NSL \ SOCKET_WRAPPER EXT_NSL \

66
source/lib/util/util.c
View File

@@ -141,42 +141,6 @@ _PUBLIC_ BOOL directory_create_or_exist(const char *dname, uid_t uid,
} }
/*******************************************************************
Close the low 3 fd's and open dev/null in their place.
********************************************************************/
static void close_low_fds(BOOL stderr_too)
{
#ifndef VALGRIND
int fd;
int i;
close(0);
close(1);
if (stderr_too)
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++) {
if (i == 2 && !stderr_too)
continue;
fd = open("/dev/null",O_RDWR,0);
if (fd < 0)
fd = open("/dev/null",O_WRONLY,0);
if (fd < 0) {
DEBUG(0,("Can't open /dev/null\n"));
return;
}
if (fd != i) {
DEBUG(0,("Didn't get file descriptor %d\n",i));
return;
}
}
#endif
}
/** /**
Set a fd into blocking/nonblocking mode. Uses POSIX O_NONBLOCK if available, Set a fd into blocking/nonblocking mode. Uses POSIX O_NONBLOCK if available,
else else
@@ -223,36 +187,6 @@ _PUBLIC_ void msleep(unsigned int t)
select(0,NULL,NULL,NULL,&tval); select(0,NULL,NULL,NULL,&tval);
} }
/**
Become a daemon, discarding the controlling terminal.
**/
_PUBLIC_ void become_daemon(BOOL Fork)
{
if (Fork) {
if (fork()) {
_exit(0);
}
}
/* detach from the terminal */
#ifdef HAVE_SETSID
setsid();
#elif defined(TIOCNOTTY)
{
int i = open("/dev/tty", O_RDWR, 0);
if (i != -1) {
ioctl(i, (int) TIOCNOTTY, (char *)0);
close(i);
}
}
#endif /* HAVE_SETSID */
/* Close fd's 0,1,2. Needed if started by rsh */
close_low_fds(False); /* Don't close stderr, let the debug system
attach it to the logfile */
}
/** /**
Get my own name, return in malloc'ed storage. Get my own name, return in malloc'ed storage.
**/ **/