diff options
| author | Jeremy Allison <jra@samba.org> | 2013-06-10 13:33:40 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2013-06-20 13:41:01 +0200 |
| commit | d4091c5809f174b68714fa50fa501c99617c016e (patch) | |
| tree | bf22be9374d71080945945dc914548a39e57c560 /source3/winbindd/winbindd.c | |
| parent | fc13489c91e790ff8952aff1e7db1e6189894e30 (diff) | |
| download | samba-d4091c5809f174b68714fa50fa501c99617c016e.tar.gz samba-d4091c5809f174b68714fa50fa501c99617c016e.tar.bz2 samba-d4091c5809f174b68714fa50fa501c99617c016e.zip | |
Fix bug #9166 - Starting smbd or nmbd with stdin from /dev/null results in "EOF on stdin"
Only install the stdin handler if it's a pipe or fifo.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3/winbindd/winbindd.c')
| -rw-r--r-- | source3/winbindd/winbindd.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index 7a0700dffa..141ca5c7c5 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/winbindd/winbindd.c @@ -308,6 +308,8 @@ bool winbindd_setup_stdin_handler(bool parent, bool foreground) bool *is_parent; if (foreground) { + struct stat st; + is_parent = talloc(winbind_event_context(), bool); if (!is_parent) { return false; @@ -318,8 +320,19 @@ bool winbindd_setup_stdin_handler(bool parent, bool foreground) /* if we are running in the foreground then look for EOF on stdin, and exit if it happens. This allows us to die if the parent process dies + Only do this on a pipe or socket, no other device. */ - tevent_add_fd(winbind_event_context(), is_parent, 0, TEVENT_FD_READ, winbindd_stdin_handler, is_parent); + if (fstat(0, &st) != 0) { + return false; + } + if (S_ISFIFO(st.st_mode) || S_ISSOCK(st.st_mode)) { + tevent_add_fd(winbind_event_context(), + is_parent, + 0, + TEVENT_FD_READ, + winbindd_stdin_handler, + is_parent); + } } return true; |