Merge from HEAD.

- null termination of winbind request fix
 - bail out if we can't open winbind socket
(This used to be commit 102e490d68)

source3/nsswitch/winbindd.c

@@ -362,7 +362,7 @@ void winbind_process_packet(struct winbindd_cli_state *state)
 	/* Process request */
 	
 	/* Ensure null termination of entire request */
-	state->request.domain[sizeof(state->request.domain)-1]='\0';
+	state->request.null_term = '\0';
 
 	state->pid = state->request.pid;
 	
@@ -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);

source3/nsswitch/winbindd_nss.h

@@ -36,7 +36,7 @@
 
 /* Update this when you change the interface.  */
 
-#define WINBIND_INTERFACE_VERSION 5
+#define WINBIND_INTERFACE_VERSION 6
 
 /* Socket commands */
 
@@ -156,7 +156,7 @@ struct winbindd_request {
 		} name;
 		uint32 num_entries;  /* getpwent, getgrent */
 	} data;
-	fstring domain;      /* {set,get,end}{pw,gr}ent() */
+	char null_term;
 };
 
 /* Response values */