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 | |
| 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)
| -rw-r--r-- | source3/nmbd/nmbd_browsesync.c | 1 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_serverlistdb.c | 1 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_subnetdb.c | 1 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_synclists.c | 1 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_workgroupdb.c | 1 | ||||
| -rw-r--r-- | source3/nsswitch/wb_common.c | 3 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd.c | 6 |
7 files changed, 7 insertions, 7 deletions
diff --git a/source3/nmbd/nmbd_browsesync.c b/source3/nmbd/nmbd_browsesync.c index 3a20f07b05..daa5142b25 100644 --- a/source3/nmbd/nmbd_browsesync.c +++ b/source3/nmbd/nmbd_browsesync.c @@ -22,7 +22,6 @@ */ #include "includes.h" -#include "smb.h" /* This is our local master browser list database. */ extern ubi_dlList lmb_browserlist[]; diff --git a/source3/nmbd/nmbd_serverlistdb.c b/source3/nmbd/nmbd_serverlistdb.c index 2fee239b2d..ee0c021d5d 100644 --- a/source3/nmbd/nmbd_serverlistdb.c +++ b/source3/nmbd/nmbd_serverlistdb.c @@ -22,7 +22,6 @@ */ #include "includes.h" -#include "smb.h" extern int ClientNMB; diff --git a/source3/nmbd/nmbd_subnetdb.c b/source3/nmbd/nmbd_subnetdb.c index 3ca33c4e53..7875cd06b4 100644 --- a/source3/nmbd/nmbd_subnetdb.c +++ b/source3/nmbd/nmbd_subnetdb.c @@ -24,7 +24,6 @@ */ #include "includes.h" -#include "smb.h" extern int ClientNMB; extern int ClientDGRAM; diff --git a/source3/nmbd/nmbd_synclists.c b/source3/nmbd/nmbd_synclists.c index 30c7d579f1..b9952fb446 100644 --- a/source3/nmbd/nmbd_synclists.c +++ b/source3/nmbd/nmbd_synclists.c @@ -28,7 +28,6 @@ also allows us to have more than 1 sync going at once (tridge) */ #include "includes.h" -#include "smb.h" struct sync_record { struct sync_record *next, *prev; diff --git a/source3/nmbd/nmbd_workgroupdb.c b/source3/nmbd/nmbd_workgroupdb.c index f2dc80dfe5..b8ea60dec0 100644 --- a/source3/nmbd/nmbd_workgroupdb.c +++ b/source3/nmbd/nmbd_workgroupdb.c @@ -22,7 +22,6 @@ */ #include "includes.h" -#include "smb.h" extern int ClientNMB; 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); |