summaryrefslogtreecommitdiff
path: root/source3/nsswitch
diff options
context:
space:
mode:
authorRichard Sharpe <sharpe@samba.org>2003-10-13 17:31:02 +0000
committerRichard Sharpe <sharpe@samba.org>2003-10-13 17:31:02 +0000
commit87f7226a0a945fd7b81eba260e72a197f4b2d4c0 (patch)
tree48682e827c74eb5faf13c9fb04dfade45ccdd99f /source3/nsswitch
parent1a07a93be20376dc8c2e429b8b40831f4d4ef796 (diff)
downloadsamba-87f7226a0a945fd7b81eba260e72a197f4b2d4c0.tar.gz
samba-87f7226a0a945fd7b81eba260e72a197f4b2d4c0.tar.bz2
samba-87f7226a0a945fd7b81eba260e72a197f4b2d4c0.zip
Add a better error message to wb_common.c when unable to connect to a pipe
socket and add a comment to winbindd.c to explain the fancy calculation of buffer offset. (This used to be commit 7c7ef9680b7378e12ffdd0bf95ee7ad673bea2f5)
Diffstat (limited to 'source3/nsswitch')
-rw-r--r--source3/nsswitch/wb_common.c2
-rw-r--r--source3/nsswitch/winbindd.c7
2 files changed, 9 insertions, 0 deletions
diff --git a/source3/nsswitch/wb_common.c b/source3/nsswitch/wb_common.c
index 79553e9e4f..468b532cbe 100644
--- 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 6a0056f917..4f161604b5 100644
--- 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) {