From 66a0d692564e5392588247696e2156b85252cbea Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 5 Apr 2006 04:44:13 +0000
Subject: r14917: fixed length strings don't count any trailing nulls in the
 length (This used to be commit 28d9a4d1a7aab0852f7f718621830f06cd7ff39b)

---
 source4/librpc/ndr/ndr_string.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4/librpc/ndr/ndr_string.c')

diff --git a/source4/librpc/ndr/ndr_string.c b/source4/librpc/ndr/ndr_string.c
index 80b900211d..46f58c9788 100644
--- a/source4/librpc/ndr/ndr_string.c
+++ b/source4/librpc/ndr/ndr_string.c
@@ -317,7 +317,10 @@ _PUBLIC_ NTSTATUS ndr_push_string(struct ndr_push *ndr, int ndr_flags, const cha
 
 	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);
-- 
cgit