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 13b9af53bf)

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[];

source3/nmbd/nmbd_serverlistdb.c

@@ -22,7 +22,6 @@
 */
 
 #include "includes.h"
-#include "smb.h"
 
 extern int ClientNMB;
 

source3/nmbd/nmbd_subnetdb.c

@@ -24,7 +24,6 @@
 */
 
 #include "includes.h"
-#include "smb.h"
 
 extern int ClientNMB;
 extern int ClientDGRAM;

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;

source3/nmbd/nmbd_workgroupdb.c

@@ -22,7 +22,6 @@
 */
 
 #include "includes.h"
-#include "smb.h"
 
 extern int ClientNMB;
 

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 */
 

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);