Pull my previous changes into head as well.

(This used to be commit 96f1ce740a8ebca3861bb2006b11301236a6fdb2)

diff --git a/source3/nsswitch/wb_common.c b/source3/nsswitch/wb_common.c
index 79553e9e4fa48a254e1d8e0b36de1734e52d15ba..468b532cbeaf550aefb68ee617a5df0539a7a0e3 100644 (file)
--- a/source3/nsswitch/wb_common.c
+++ b/source3/nsswitch/wb_common.c
@@ -191,6 +191,8 @@ static int winbind_named_pipe_sock(const char *dir)
        
        if (connect(fd, (struct sockaddr *)&sunaddr, 
                    sizeof(sunaddr)) == -1) {
+               DEBUG(10, ("error connecting to pipe socket: %s\n", 
+                       strerror(errno)));
                close(fd);
                return -1;
        }

diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 6a0056f917e1ad98e5ce31ede932a0ca3aeb8eed..4f161604b5d3bd01cf1fff65bfa22ad4684a1636 100644 (file)
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -479,6 +479,13 @@ static void client_write(struct winbindd_cli_state *state)
        int num_written;
        
        /* Write some data */
+       /*
+        * The fancy calculation of data below allows us to handle the 
+        * case where write (sys_write) does not write all the data we 
+        * gave it. In that case, we will come back through here again
+        * because of the loop above us, and we want to pick up where
+        * we left off.
+        */
        
        if (!state->write_extra_data) {