diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-12-01 03:14:30 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-12-01 03:14:30 +0000 |
| commit | 8f84d170af0cdf55d02558cc51ac77c344990ac6 (patch) | |
| tree | 1d23f5fc428d6475b0c102d0e15c6d42e3ac72e1 /source3/nsswitch | |
| parent | f634f24cf8466b12b54e2b6b7d52adba174603dc (diff) | |
| download | samba-8f84d170af0cdf55d02558cc51ac77c344990ac6.tar.gz samba-8f84d170af0cdf55d02558cc51ac77c344990ac6.tar.bz2 samba-8f84d170af0cdf55d02558cc51ac77c344990ac6.zip | |
Remove extra headers, and ensure that we correctly bail out of winbindd if we
can't create the socket.
Andrew Bartlett
(This used to be commit 13b9af53bff8e42126a38f93c3bdd5b4d9b20aba)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/wb_common.c | 3 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd.c | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source3/nsswitch/wb_common.c b/source3/nsswitch/wb_common.c index e0cae0abe3..89c751a4ef 100644 --- a/source3/nsswitch/wb_common.c +++ b/source3/nsswitch/wb_common.c @@ -24,8 +24,7 @@ Boston, MA 02111-1307, USA. */ -#include "winbind_nss_config.h" -#include "winbindd_nss.h" +#include "winbind_client.h" /* Global variables. These are effectively the client state information */ diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c index 57c1fc84b5..b4d1773e9c 100644 --- a/source3/nsswitch/winbindd.c +++ b/source3/nsswitch/winbindd.c @@ -519,6 +519,12 @@ static void process_loop(void) /* Initialise fd lists for select() */ listen_sock = open_winbindd_socket(); + + if (listen_sock == -1) { + perror("open_winbind_socket"); + exit(1); + } + maxfd = listen_sock; FD_ZERO(&r_fds); |