svn commit: samba r14958 - in branches/SAMBA_4_0/source/librpc/ndr: .

tridge at samba.org tridge at samba.org
Fri Apr 7 11:18:34 GMT 2006


Author: tridge
Date: 2006-04-07 11:18:34 +0000 (Fri, 07 Apr 2006)
New Revision: 14958

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14958

Log:

fixed big-endian dcerpc connections for the new string handling code

Modified:
   branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c	2006-04-07 10:59:10 UTC (rev 14957)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c	2006-04-07 11:18:34 UTC (rev 14958)
@@ -564,6 +564,10 @@
 		return NT_STATUS_OK;
 	}
 
+	if (NDR_BE(ndr) && chset == CH_UTF16) {
+		chset = CH_UTF16BE;
+	}
+
 	NDR_PULL_NEED_BYTES(ndr, length*byte_mul);
 
 	ret = convert_string_talloc(ndr->current_mem_ctx,
@@ -584,6 +588,10 @@
 {
 	ssize_t ret, required;
 
+	if (NDR_BE(ndr) && chset == CH_UTF16) {
+		chset = CH_UTF16BE;
+	}
+
 	required = byte_mul * length;
 	
 	NDR_PUSH_NEED_BYTES(ndr, required);



More information about the samba-cvs mailing list