diff options
| author | Richard Sharpe <sharpe@samba.org> | 2003-10-13 18:34:57 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@samba.org> | 2003-10-13 18:34:57 +0000 |
| commit | 0bb70fe0b43fa9e9615e405b12c2adbb4ff04594 (patch) | |
| tree | 9003f6718439ffcd77a263eee43ff0e2e09ccba7 | |
| parent | 447fa1f2242006cd002598bf8d944e63a824ff86 (diff) | |
| download | samba-0bb70fe0b43fa9e9615e405b12c2adbb4ff04594.tar.gz samba-0bb70fe0b43fa9e9615e405b12c2adbb4ff04594.tar.bz2 samba-0bb70fe0b43fa9e9615e405b12c2adbb4ff04594.zip | |
Pull my previous changes into head as well.
(This used to be commit 96f1ce740a8ebca3861bb2006b11301236a6fdb2)
| -rw-r--r-- | source3/nsswitch/wb_common.c | 2 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd.c | 7 |
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) { |