[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2283-g38780d6

[Volker Lendecke]

The branch, master has been updated
       via  38780d659be8f8bb061409dd7bee60628e0050de (commit)
      from  7c3f31a26213035aa57a4a615c7760bc109edebc (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 38780d659be8f8bb061409dd7bee60628e0050de
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jun 12 17:27:58 2009 +0200

    Fix wb_req_more(): Return 0 when done, read_pkt_send needs that

-----------------------------------------------------------------------

Summary of changes:
 nsswitch/libwbclient/wb_reqtrans.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/libwbclient/wb_reqtrans.c b/nsswitch/libwbclient/wb_reqtrans.c
index 5328423..6dc429b 100644
--- a/nsswitch/libwbclient/wb_reqtrans.c
+++ b/nsswitch/libwbclient/wb_reqtrans.c
@@ -84,6 +84,11 @@ static ssize_t wb_req_more(uint8_t *buf, size_t buflen, void *private_data)
 		return sizeof(struct winbindd_request) - 4;
 	}
 
+	if (buflen > sizeof(struct winbindd_request)) {
+		/* We've been here, we're done */
+		return 0;
+	}
+
 	if ((state->max_extra_data != 0)
 	    && (req->extra_len > state->max_extra_data)) {
 		DEBUG(3, ("Got request with %d bytes extra data on "


-- 
Samba Shared Repository