[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-263-g13a0941

Andrew Bartlett abartlet at samba.org
Sat Apr 19 08:04:26 GMT 2008


The branch, v4-0-test has been updated
       via  13a0941d3432dc7dae552048265ad1e762b781d4 (commit)
       via  e8da1559f7282127264c671c485e812f669b97ba (commit)
       via  fa459913039673e55aa9300962f01e5079dd20d8 (commit)
      from  50f6a72b674f58a24c1a6c42e4dd56dc4e9f5a1e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 13a0941d3432dc7dae552048265ad1e762b781d4
Merge: e8da1559f7282127264c671c485e812f669b97ba 50f6a72b674f58a24c1a6c42e4dd56dc4e9f5a1e
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Apr 19 09:59:07 2008 +0200

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

commit e8da1559f7282127264c671c485e812f669b97ba
Merge: fa459913039673e55aa9300962f01e5079dd20d8 3c217518ba9a7b64fe6c842187499f1ee5189567
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Apr 18 18:21:52 2008 +0200

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

commit fa459913039673e55aa9300962f01e5079dd20d8
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Apr 18 11:37:43 2008 +0200

    Fix samba3 protocol to correctly include the NULL terminator
    
    Andrew Bartlett

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

Summary of changes:
 source/winbind/wb_samba3_cmd.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbind/wb_samba3_cmd.c b/source/winbind/wb_samba3_cmd.c
index f43947e..f0aaaa7 100644
--- a/source/winbind/wb_samba3_cmd.c
+++ b/source/winbind/wb_samba3_cmd.c
@@ -720,6 +720,9 @@ static void list_users_recv(struct composite_context *ctx)
 	if (NT_STATUS_IS_OK(status)) {
 		s3call->response.extra_data.data = extra_data;
 		s3call->response.length += extra_data_len;
+		if (extra_data) {
+			s3call->response.length += 1;
+		}
 	}
 
 	wbsrv_samba3_async_epilogue(status, s3call);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list