s3: re-run make samba3-idl.

Guenther

1 files changed, 28 insertions, 28 deletions

diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 0c70b83e3c..72b5e2ecda 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -13,9 +13,9 @@ NTSTATUS rpccli_spoolss_EnumPrinters(struct rpc_pipe_client *cli,
 				     uint32_t level /* [in]  */,
 				     DATA_BLOB *buffer /* [in] [unique] */,
 				     uint32_t offered /* [in]  */,
-				     union spoolss_PrinterInfo *info /* [out] [unique,switch_is(level),size_is(count)] */,
+				     uint32_t *count /* [out] [ref] */,
+				     union spoolss_PrinterInfo *info /* [out] [unique,switch_is(level),size_is(*count)] */,
 				     uint32_t *needed /* [out] [ref] */,
-				     uint32_t count /* [out]  */,
 				     WERROR *werror)
 {
 	struct spoolss_EnumPrinters r;
@@ -51,11 +51,11 @@ NTSTATUS rpccli_spoolss_EnumPrinters(struct rpc_pipe_client *cli,
 	}
 
 	/* Return variables */
+	*count = *r.out.count;
 	if (info && r.out.info) {
-		memcpy(info, r.out.info, count * sizeof(*info));
+		memcpy(info, r.out.info, *count * sizeof(*info));
 	}
 	*needed = *r.out.needed;
-	return NT_STATUS_NOT_SUPPORTED;
 
 	/* Return result */
 	if (werror) {
@@ -230,9 +230,9 @@ NTSTATUS rpccli_spoolss_EnumJobs(struct rpc_pipe_client *cli,
 				 uint32_t level /* [in]  */,
 				 DATA_BLOB *buffer /* [in] [unique] */,
 				 uint32_t offered /* [in]  */,
-				 union spoolss_JobInfo *info /* [out] [unique,switch_is(level),size_is(count)] */,
+				 uint32_t *count /* [out] [ref] */,
+				 union spoolss_JobInfo *info /* [out] [unique,switch_is(level),size_is(*count)] */,
 				 uint32_t *needed /* [out] [ref] */,
-				 uint32_t count /* [out]  */,
 				 WERROR *werror)
 {
 	struct spoolss_EnumJobs r;
@@ -269,11 +269,11 @@ NTSTATUS rpccli_spoolss_EnumJobs(struct rpc_pipe_client *cli,
 	}
 
 	/* Return variables */
+	*count = *r.out.count;
 	if (info && r.out.info) {
-		memcpy(info, r.out.info, count * sizeof(*info));
+		memcpy(info, r.out.info, *count * sizeof(*info));
 	}
 	*needed = *r.out.needed;
-	return NT_STATUS_NOT_SUPPORTED;
 
 	/* Return result */
 	if (werror) {
@@ -527,9 +527,9 @@ NTSTATUS rpccli_spoolss_EnumPrinterDrivers(struct rpc_pipe_client *cli,
 					   uint32_t level /* [in]  */,
 					   DATA_BLOB *buffer /* [in] [unique] */,
 					   uint32_t offered /* [in]  */,
-					   union spoolss_DriverInfo *info /* [out] [unique,switch_is(level),size_is(count)] */,
+					   uint32_t *count /* [out] [ref] */,
+					   union spoolss_DriverInfo *info /* [out] [unique,switch_is(level),size_is(*count)] */,
 					   uint32_t *needed /* [out] [ref] */,
-					   uint32_t count /* [out]  */,
 					   WERROR *werror)
 {
 	struct spoolss_EnumPrinterDrivers r;
@@ -565,11 +565,11 @@ NTSTATUS rpccli_spoolss_EnumPrinterDrivers(struct rpc_pipe_client *cli,
 	}
 
 	/* Return variables */
+	*count = *r.out.count;
 	if (info && r.out.info) {
-		memcpy(info, r.out.info, count * sizeof(*info));
+		memcpy(info, r.out.info, *count * sizeof(*info));
 	}
 	*needed = *r.out.needed;
-	return NT_STATUS_NOT_SUPPORTED;
 
 	/* Return result */
 	if (werror) {
@@ -780,9 +780,9 @@ NTSTATUS rpccli_spoolss_EnumPrintProcessors(struct rpc_pipe_client *cli,
 					    uint32_t level /* [in]  */,
 					    DATA_BLOB *buffer /* [in] [unique] */,
 					    uint32_t offered /* [in]  */,
-					    union spoolss_PrintProcessorInfo *info /* [out] [unique,switch_is(level),size_is(count)] */,
+					    uint32_t *count /* [out] [ref] */,
+					    union spoolss_PrintProcessorInfo *info /* [out] [unique,switch_is(level),size_is(*count)] */,
 					    uint32_t *needed /* [out] [ref] */,
-					    uint32_t count /* [out]  */,
 					    WERROR *werror)
 {
 	struct spoolss_EnumPrintProcessors r;
@@ -818,11 +818,11 @@ NTSTATUS rpccli_spoolss_EnumPrintProcessors(struct rpc_pipe_client *cli,
 	}
 
 	/* Return variables */
+	*count = *r.out.count;
 	if (info && r.out.info) {
-		memcpy(info, r.out.info, count * sizeof(*info));
+		memcpy(info, r.out.info, *count * sizeof(*info));
 	}
 	*needed = *r.out.needed;
-	return NT_STATUS_NOT_SUPPORTED;
 
 	/* Return result */
 	if (werror) {
@@ -1684,9 +1684,9 @@ NTSTATUS rpccli_spoolss_EnumForms(struct rpc_pipe_client *cli,
 				  uint32_t level /* [in]  */,
 				  DATA_BLOB *buffer /* [in] [unique] */,
 				  uint32_t offered /* [in]  */,
-				  union spoolss_FormInfo *info /* [out] [unique,switch_is(level),size_is(count)] */,
+				  uint32_t *count /* [out] [ref] */,
+				  union spoolss_FormInfo *info /* [out] [unique,switch_is(level),size_is(*count)] */,
 				  uint32_t *needed /* [out] [ref] */,
-				  uint32_t count /* [out]  */,
 				  WERROR *werror)
 {
 	struct spoolss_EnumForms r;
@@ -1721,11 +1721,11 @@ NTSTATUS rpccli_spoolss_EnumForms(struct rpc_pipe_client *cli,
 	}
 
 	/* Return variables */
+	*count = *r.out.count;
 	if (info && r.out.info) {
-		memcpy(info, r.out.info, count * sizeof(*info));
+		memcpy(info, r.out.info, *count * sizeof(*info));
 	}
 	*needed = *r.out.needed;
-	return NT_STATUS_NOT_SUPPORTED;
 
 	/* Return result */
 	if (werror) {
@@ -1741,9 +1741,9 @@ NTSTATUS rpccli_spoolss_EnumPorts(struct rpc_pipe_client *cli,
 				  uint32_t level /* [in]  */,
 				  DATA_BLOB *buffer /* [in] [unique] */,
 				  uint32_t offered /* [in]  */,
-				  union spoolss_PortInfo *info /* [out] [unique,switch_is(level),size_is(count)] */,
+				  uint32_t *count /* [out] [ref] */,
+				  union spoolss_PortInfo *info /* [out] [unique,switch_is(level),size_is(*count)] */,
 				  uint32_t *needed /* [out] [ref] */,
-				  uint32_t count /* [out]  */,
 				  WERROR *werror)
 {
 	struct spoolss_EnumPorts r;
@@ -1778,11 +1778,11 @@ NTSTATUS rpccli_spoolss_EnumPorts(struct rpc_pipe_client *cli,
 	}
 
 	/* Return variables */
+	*count = *r.out.count;
 	if (info && r.out.info) {
-		memcpy(info, r.out.info, count * sizeof(*info));
+		memcpy(info, r.out.info, *count * sizeof(*info));
 	}
 	*needed = *r.out.needed;
-	return NT_STATUS_NOT_SUPPORTED;
 
 	/* Return result */
 	if (werror) {
@@ -1798,9 +1798,9 @@ NTSTATUS rpccli_spoolss_EnumMonitors(struct rpc_pipe_client *cli,
 				     uint32_t level /* [in]  */,
 				     DATA_BLOB *buffer /* [in] [unique] */,
 				     uint32_t offered /* [in]  */,
-				     union spoolss_MonitorInfo *info /* [out] [unique,switch_is(level),size_is(count)] */,
+				     uint32_t *count /* [out] [ref] */,
+				     union spoolss_MonitorInfo *info /* [out] [unique,switch_is(level),size_is(*count)] */,
 				     uint32_t *needed /* [out] [ref] */,
-				     uint32_t count /* [out]  */,
 				     WERROR *werror)
 {
 	struct spoolss_EnumMonitors r;
@@ -1835,11 +1835,11 @@ NTSTATUS rpccli_spoolss_EnumMonitors(struct rpc_pipe_client *cli,
 	}
 
 	/* Return variables */
+	*count = *r.out.count;
 	if (info && r.out.info) {
-		memcpy(info, r.out.info, count * sizeof(*info));
+		memcpy(info, r.out.info, *count * sizeof(*info));
 	}
 	*needed = *r.out.needed;
-	return NT_STATUS_NOT_SUPPORTED;
 
 	/* Return result */
 	if (werror) {