* fixed level2 of QueryUserInfo

 * added per-field testing of SetUserInfo

 * fixed strlen_m()
(This used to be commit 26238b0f8a5752bb0f611c4aa492b964e419209a)

1 files changed, 40 insertions, 0 deletions

diff --git a/source4/librpc/ndr/ndr_srvsvc.c b/source4/librpc/ndr/ndr_srvsvc.c
index 4937e7e914..877ffea51d 100644
--- a/source4/librpc/ndr/ndr_srvsvc.c
+++ b/source4/librpc/ndr/ndr_srvsvc.c
@@ -1436,8 +1436,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetConn0));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -1504,8 +1506,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetConn1));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -1626,8 +1630,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetFile2));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -1692,8 +1698,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetFile3));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -1837,8 +1845,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetSess0));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -1904,8 +1914,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetSess1));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -1981,8 +1993,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetSess2));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -2046,8 +2060,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetSess10));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -2133,8 +2149,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetSess502));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -2326,8 +2344,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetShare0));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -2390,8 +2410,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetShare1));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -2477,8 +2499,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetShare2));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -2542,8 +2566,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetShare501));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -2640,8 +2666,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetShare502));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -2847,8 +2875,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->disk, r->size, sizeof(r->disk[0]));
+	{
 		NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS|NDR_BUFFERS, r->disk, r->size));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -2880,8 +2910,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetDisk0));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -2967,8 +2999,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->addr, r->count, sizeof(r->addr[0]));
+	{
 		NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS|NDR_BUFFERS, r->addr, r->count));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -3042,8 +3076,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetTransport0));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -3127,8 +3163,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetTransport1));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }
@@ -3171,8 +3209,10 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->array, r->count, sizeof(r->array[0]));
+	{
 		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->array, sizeof(r->array[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_srvsvc_NetTransport2));
 	}
+	}
 done:
 	return NT_STATUS_OK;
 }