sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Moved become_daemon() and close_low_fds() to shared util lib

Browse Source
This commit is contained in:
Steven Danneman 2009-02-20 15:10:21 -08:00
parent 5bd7f9c61b
commit 116ce19b10
6 changed files with 20 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/util/become_daemon.c
View File

@ -28,14 +28,15 @@
/*******************************************************************
Close the low 3 fd's and open dev/null in their place.
********************************************************************/
static void close_low_fds(bool stderr_too)
_PUBLIC_ void close_low_fds(bool stderr_too)
{
#ifndef VALGRIND
int fd;
int i;
close(0);
close(1);
close(1);
if (stderr_too)
close(2);
@ -61,11 +62,11 @@ static void close_low_fds(bool stderr_too)
#endif
}
/**
/****************************************************************************
Become a daemon, discarding the controlling terminal.
**/
****************************************************************************/
_PUBLIC_ void become_daemon(bool Fork)
_PUBLIC_ void become_daemon(bool Fork, bool no_process_group)
{
if (Fork) {
if (fork()) {
@ -73,14 +74,14 @@ _PUBLIC_ void become_daemon(bool Fork)
}
}
/* detach from the terminal */
/* detach from the terminal */
#ifdef HAVE_SETSID
setsid();
if (!no_process_group) setsid();
#elif defined(TIOCNOTTY)
{
int i = open("/dev/tty", O_RDWR, 0);
if (!no_process_group) {
int i = sys_open("/dev/tty", O_RDWR, 0);
if (i != -1) {
ioctl(i, (int) TIOCNOTTY, (char *)0);
ioctl(i, (int) TIOCNOTTY, (char *)0);
close(i);
}
}
@ -90,4 +91,3 @@ _PUBLIC_ void become_daemon(bool Fork)
close_low_fds(false); /* Don't close stderr, let the debug system
attach it to the logfile */
}

9
lib/util/util.h
View File

@ -724,12 +724,15 @@ _PUBLIC_ int idr_remove(struct idr_context *idp, int id);
/* The following definitions come from lib/util/become_daemon.c */
#if _SAMBA_BUILD_ == 4
/**
Close the low 3 fd's and open dev/null in their place
**/
_PUBLIC_ void close_low_fds(bool stderr_too);
/**
Become a daemon, discarding the controlling terminal.
**/
_PUBLIC_ void become_daemon(bool fork);
#endif
_PUBLIC_ void become_daemon(bool fork, bool no_process_group);
/**
* Load a ini-style file.

3
source3/Makefile.in
View File

@ -338,7 +338,8 @@ UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \
../lib/util/util_file.o ../lib/util/data_blob.o \
../lib/util/util.o ../lib/util/fsusage.o \
../lib/util/params.o ../lib/util/talloc_stack.o \
../lib/util/genrand.o ../lib/util/util_net.o
../lib/util/genrand.o ../lib/util/util_net.o \
../lib/util/become_daemon.o
CRYPTO_OBJ = ../lib/crypto/crc32.o ../lib/crypto/md5.o \
../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \

2
source3/include/proto.h
View File

@ -1139,11 +1139,9 @@ int set_message_bcc(char *buf,int num_bytes);
ssize_t message_push_blob(uint8 **outbuf, DATA_BLOB blob);
char *unix_clean_name(TALLOC_CTX *ctx, const char *s);
char *clean_name(TALLOC_CTX *ctx, const char *s);
void close_low_fds(bool stderr_too);
ssize_t write_data_at_offset(int fd, const char *buffer, size_t N, SMB_OFF_T pos);
int set_blocking(int fd, bool set);
void smb_msleep(unsigned int t);
void become_daemon(bool Fork, bool no_process_group);
bool reinit_after_fork(struct messaging_context *msg_ctx,
struct event_context *ev_ctx,
bool parent_longlived);

67
source3/lib/util.c
View File

@ -797,43 +797,6 @@ char *clean_name(TALLOC_CTX *ctx, const char *s)
return unix_clean_name(ctx, str);
}
/*******************************************************************
Close the low 3 fd's and open dev/null in their place.
********************************************************************/
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 = sys_open("/dev/null",O_RDWR,0);
if (fd < 0)
fd = sys_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
}
/*******************************************************************
Write data into an fd at a given offset. Ignore seek errors.
********************************************************************/
@ -924,36 +887,6 @@ void smb_msleep(unsigned int t)
#endif
}
/****************************************************************************
Become a daemon, discarding the controlling terminal.
****************************************************************************/
void become_daemon(bool Fork, bool no_process_group)
{
if (Fork) {
if (sys_fork()) {
_exit(0);
}
}
/* detach from the terminal */
#ifdef HAVE_SETSID
if (!no_process_group) setsid();
#elif defined(TIOCNOTTY)
if (!no_process_group) {
int i = sys_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 */
}
bool reinit_after_fork(struct messaging_context *msg_ctx,
struct event_context *ev_ctx,
bool parent_longlived)

2
source4/smbd/server.c
View File

@ -277,7 +277,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
if (opt_daemon) {
DEBUG(3,("Becoming a daemon.\n"));
become_daemon(true);
become_daemon(true, false);
}
cleanup_tmp_files(cmdline_lp_ctx);