[mixed commit. sorry!]

1) sorting out NETLOGON schannel (debug fest)

2) patches from Long.

1 files changed, 8 insertions, 6 deletions

diff --git a/source/smbd/server.c b/source/smbd/server.c
index 41d49d5ea12..a9fcf2b3760 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -223,21 +223,23 @@ max can be %d\n",
 				if(FD_ISSET(fd_listenset[i * 2],&lfds)) {
 					s = fd_listenset[i * 2];
 					ClientPort = SMB_PORT;
+
+					/* Clear this so we don't look
+					   at it again. */
+					FD_CLR(fd_listenset[i * 2], &lfds);
 					break;
 				}
-#if 0
 				if(FD_ISSET(fd_listenset[i * 2 + 1],&lfds)) {
 					s = fd_listenset[i * 2 + 1];
 					ClientPort = SMB_PORT2;
+
+					/* Clear this so we don't look
+					   at it again. */
+					FD_CLR(fd_listenset[i * 2 + 1], &lfds);
 					break;
 				}
-#endif
 			}
 
-			/* Clear this so we don't look
-			   at it again. */
-			FD_CLR(s,&lfds);
-
 			Client = accept(s,&addr,&in_addrlen);
 			
 			if (Client == -1 && errno == EINTR)