summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/nmbd/nmbd_browsesync.c1
-rw-r--r--source3/nmbd/nmbd_serverlistdb.c1
-rw-r--r--source3/nmbd/nmbd_subnetdb.c1
-rw-r--r--source3/nmbd/nmbd_synclists.c1
-rw-r--r--source3/nmbd/nmbd_workgroupdb.c1
-rw-r--r--source3/nsswitch/wb_common.c3
-rw-r--r--source3/nsswitch/winbindd.c6
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);