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

(This used to be commit 5cd3310b78a85243eb436d05db3228c3495f9162)

3 files changed, 4 insertions, 46 deletions

diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index 1ecc6f3c38..731ef0f60b 100644
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -109,11 +109,9 @@ struct ndr_print {
 #define LIBNDR_FLAG_STR_NULLTERM	(1<<6)
 #define LIBNDR_FLAG_STR_SIZE2		(1<<7)
 #define LIBNDR_FLAG_STR_BYTESIZE	(1<<8)
-#define LIBNDR_FLAG_STR_FIXLEN32	(1<<9)
 #define LIBNDR_FLAG_STR_CONFORMANT	(1<<10)
 #define LIBNDR_FLAG_STR_CHARLEN		(1<<11)
 #define LIBNDR_FLAG_STR_UTF8		(1<<12)
-#define LIBNDR_FLAG_STR_FIXLEN15	(1<<13)
 #define LIBNDR_STRING_FLAGS		(0x7FFC)
 
 
diff --git a/source4/librpc/ndr/ndr_sec_helper.c b/source4/librpc/ndr/ndr_sec_helper.c
index 30eaf9c6f4..5a0178bd25 100644
--- a/source4/librpc/ndr/ndr_sec_helper.c
+++ b/source4/librpc/ndr/ndr_sec_helper.c
@@ -187,6 +187,9 @@ enum ndr_err_code ndr_pull_dom_sid28(struct ndr_pull *ndr, int ndr_flags, struct
 	if (!NDR_ERR_CODE_IS_SUCCESS(status)) {
 		/* handle a w2k bug which send random data in the buffer */
 		ZERO_STRUCTP(sid);
+	} else if (sid->num_auths == 0 && sid->sub_auths) {
+		talloc_free(sid->sub_auths);
+		sid->sub_auths = NULL;
 	}
 
 	return NDR_ERR_SUCCESS;
diff --git a/source4/librpc/ndr/ndr_string.c b/source4/librpc/ndr/ndr_string.c
index 69a7eca1a8..79548f81bc 100644
--- a/source4/librpc/ndr/ndr_string.c
+++ b/source4/librpc/ndr/ndr_string.c
@@ -259,24 +259,6 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, int ndr_flags,
 		*s = as;
 		break;
 
-	case LIBNDR_FLAG_STR_FIXLEN15:
-	case LIBNDR_FLAG_STR_FIXLEN32:
-		len1 = (flags & LIBNDR_FLAG_STR_FIXLEN32)?32:15;
-		NDR_PULL_NEED_BYTES(ndr, len1*byte_mul);
-		ret = convert_string_talloc(ndr->current_mem_ctx,
-					    ndr->iconv_convenience,
-					    chset, CH_UNIX, 
-					    ndr->data+ndr->offset, 
-					    len1*byte_mul,
-					    (void **)&as);
-		if (ret == -1) {
-			return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-					      "Bad character conversion");
-		}
-		NDR_CHECK(ndr_pull_advance(ndr, len1*byte_mul));
-		*s = as;
-		break;
-
 	case LIBNDR_FLAG_STR_NOTERM:
 		if (!(ndr->flags & LIBNDR_FLAG_REMAINING)) {
 			return ndr_pull_error(ndr, NDR_ERR_STRING, "Bad string flags 0x%x (missing NDR_REMAINING)\n",
@@ -349,10 +331,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_string(struct ndr_push *ndr, int ndr_flags,
 
 	flags &= ~LIBNDR_FLAG_STR_CONFORMANT;
 
-	if (!(flags & 
-	      (LIBNDR_FLAG_STR_NOTERM |
-	       LIBNDR_FLAG_STR_FIXLEN15 |
-	       LIBNDR_FLAG_STR_FIXLEN32))) {
+	if (!(flags & LIBNDR_FLAG_STR_NOTERM)) {
 		s_len++;
 	}
 	d_len = convert_string_talloc(ndr, ndr->iconv_convenience, CH_UNIX, chset, s, s_len, (void **)&dest);
@@ -399,21 +378,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_string(struct ndr_push *ndr, int ndr_flags,
 		NDR_CHECK(ndr_push_bytes(ndr, dest, d_len));
 		break;
 
-	case LIBNDR_FLAG_STR_FIXLEN15:
-	case LIBNDR_FLAG_STR_FIXLEN32: {
-		ssize_t fix_len = (flags & LIBNDR_FLAG_STR_FIXLEN32)?32:15;
-		uint32_t pad_len = fix_len - d_len;
-		if (d_len > fix_len) {
-			return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
-					      "Bad character conversion");
-		}
-		NDR_CHECK(ndr_push_bytes(ndr, dest, d_len));
-		if (pad_len != 0) {
-			NDR_CHECK(ndr_push_zero(ndr, pad_len));
-		}
-		break;
-	}
-
 	default:
 		if (ndr->flags & LIBNDR_FLAG_REMAINING) {
 			NDR_CHECK(ndr_push_bytes(ndr, dest, d_len));
@@ -439,13 +403,6 @@ _PUBLIC_ size_t ndr_string_array_size(struct ndr_push *ndr, const char *s)
 	unsigned byte_mul = 2;
 	unsigned c_len_term = 1;
 
-	if (flags & LIBNDR_FLAG_STR_FIXLEN32) {
-		return 32;
-	}
-	if (flags & LIBNDR_FLAG_STR_FIXLEN15) {
-		return 15;
-	}
-	
 	c_len = s?strlen_m(s):0;
 
 	if (flags & (LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_UTF8)) {