[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Fri May 14 06:54:20 MDT 2010


The branch, master has been updated
       via  3edb95a... s4-libndr: fix ndr_pull_string_array() for non utf16 arrays in s4 as well.
      from  a052aa8... s3-printing: explicitly include "printing/pcap.h" as there is /usr/include/pcap.h.

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


- Log -----------------------------------------------------------------
commit 3edb95a487b3330408392cb856ae42cde5f679f9
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 14 14:51:44 2010 +0200

    s4-libndr: fix ndr_pull_string_array() for non utf16 arrays in s4 as well.
    
    Guenther

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

Summary of changes:
 source4/librpc/ndr/ndr_string.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/librpc/ndr/ndr_string.c b/source4/librpc/ndr/ndr_string.c
index d4e04c1..dfa72b5 100644
--- a/source4/librpc/ndr/ndr_string.c
+++ b/source4/librpc/ndr/ndr_string.c
@@ -444,7 +444,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string_array(struct ndr_pull *ndr, int ndr_f
 		return NDR_ERR_SUCCESS;
 	}
 
-	switch (flags & LIBNDR_STRING_FLAGS) {
+	switch (flags & (LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_STR_NOTERM)) {
 	case LIBNDR_FLAG_STR_NULLTERM:
 		/* 
 		 * here the strings are null terminated


-- 
Samba Shared Repository


More information about the samba-cvs mailing list