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

[tridge at samba.org]

Author: tridge
Date: 2006-04-05 04:44:13 +0000 (Wed, 05 Apr 2006)
New Revision: 14917

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

Log:

fixed length strings don't count any trailing nulls in the length

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-05 03:51:43 UTC (rev 14916)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c	2006-04-05 04:44:13 UTC (rev 14917)
@@ -317,7 +317,10 @@
 
 	flags &= ~LIBNDR_FLAG_STR_CONFORMANT;
 
-	if (!(flags & LIBNDR_FLAG_STR_NOTERM)) {
+	if (!(flags & 
+	      (LIBNDR_FLAG_STR_NOTERM |
+	       LIBNDR_FLAG_STR_FIXLEN15 |
+	       LIBNDR_FLAG_STR_FIXLEN32))) {
 		s_len++;
 	}
 	d_len = convert_string_talloc(ndr, CH_UNIX, chset, s, s_len, (void **)&dest);