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)

diff --git a/source3/nmbd/nmbd_browsesync.c b/source3/nmbd/nmbd_browsesync.c
index 3a20f07b0520797d3b6334101765497198da796e..daa5142b25a696ba5b9de449afb7d1393ada28ae 100644 (file)
--- 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 2fee239b2dc73f77256f35f3782ee4846f8746fb..ee0c021d5dcd6e02cddf26fd8fd33c9b3d611e7c 100644 (file)
--- 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 3ca33c4e53815e8b02ac4358690913f558e43f9b..7875cd06b4e6ee91a896fdbdb0d7940b5af1cdda 100644 (file)
--- 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 30c7d579f18a379d0e022f1fc518db3d32230511..b9952fb446ca63a183499109683909acf0d5f3b9 100644 (file)
--- 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 f2dc80dfe5c09c103f48f4b53f5639bb00be3003..b8ea60dec07d684e180fb1991c0ce5a8c97e8441 100644 (file)
--- 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 e0cae0abe3efc7a1d3e4af17f4c9e5085a07891b..89c751a4efb17ff5416fd5fa422f4910455bd23d 100644 (file)
--- 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 57c1fc84b578a9a508422097ae670fde1b35b8f2..b4d1773e9cee928958bbf06b58e8049fa1efb250 100644 (file)
--- 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);