Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

(This used to be commit 08645826817d42c9d4b42ea0fd5e633d7fd08d35)

1 files changed, 71 insertions, 20 deletions

diff --git a/source3/librpc/gen_ndr/cli_unixinfo.c b/source3/librpc/gen_ndr/cli_unixinfo.c
index c8b9a01f3d..c8a6c926ef 100644
--- a/source3/librpc/gen_ndr/cli_unixinfo.c
+++ b/source3/librpc/gen_ndr/cli_unixinfo.c
@@ -6,7 +6,10 @@
 #include "includes.h"
 #include "librpc/gen_ndr/cli_unixinfo.h"
 
-NTSTATUS rpccli_unixinfo_SidToUid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct dom_sid sid, uint64_t *uid)
+NTSTATUS rpccli_unixinfo_SidToUid(struct rpc_pipe_client *cli,
+				  TALLOC_CTX *mem_ctx,
+				  struct dom_sid sid,
+				  uint64_t *uid)
 {
 	struct unixinfo_SidToUid r;
 	NTSTATUS status;
@@ -14,17 +17,24 @@ NTSTATUS rpccli_unixinfo_SidToUid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
 	/* In parameters */
 	r.in.sid = sid;
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(unixinfo_SidToUid, &r);
+	}
 
-	status = cli_do_rpc_ndr(cli, mem_ctx, PI_UNIXINFO, &ndr_table_unixinfo, NDR_UNIXINFO_SIDTOUID, &r);
+	status = cli_do_rpc_ndr(cli,
+				mem_ctx,
+				PI_UNIXINFO,
+				&ndr_table_unixinfo,
+				NDR_UNIXINFO_SIDTOUID,
+				&r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_OUT_DEBUG(unixinfo_SidToUid, &r);
+	}
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
@@ -37,7 +47,10 @@ NTSTATUS rpccli_unixinfo_SidToUid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
 	return r.out.result;
 }
 
-NTSTATUS rpccli_unixinfo_UidToSid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint64_t uid, struct dom_sid *sid)
+NTSTATUS rpccli_unixinfo_UidToSid(struct rpc_pipe_client *cli,
+				  TALLOC_CTX *mem_ctx,
+				  uint64_t uid,
+				  struct dom_sid *sid)
 {
 	struct unixinfo_UidToSid r;
 	NTSTATUS status;
@@ -45,17 +58,24 @@ NTSTATUS rpccli_unixinfo_UidToSid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
 	/* In parameters */
 	r.in.uid = uid;
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(unixinfo_UidToSid, &r);
+	}
 
-	status = cli_do_rpc_ndr(cli, mem_ctx, PI_UNIXINFO, &ndr_table_unixinfo, NDR_UNIXINFO_UIDTOSID, &r);
+	status = cli_do_rpc_ndr(cli,
+				mem_ctx,
+				PI_UNIXINFO,
+				&ndr_table_unixinfo,
+				NDR_UNIXINFO_UIDTOSID,
+				&r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_OUT_DEBUG(unixinfo_UidToSid, &r);
+	}
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
@@ -68,7 +88,10 @@ NTSTATUS rpccli_unixinfo_UidToSid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
 	return r.out.result;
 }
 
-NTSTATUS rpccli_unixinfo_SidToGid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct dom_sid sid, uint64_t *gid)
+NTSTATUS rpccli_unixinfo_SidToGid(struct rpc_pipe_client *cli,
+				  TALLOC_CTX *mem_ctx,
+				  struct dom_sid sid,
+				  uint64_t *gid)
 {
 	struct unixinfo_SidToGid r;
 	NTSTATUS status;
@@ -76,17 +99,24 @@ NTSTATUS rpccli_unixinfo_SidToGid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
 	/* In parameters */
 	r.in.sid = sid;
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(unixinfo_SidToGid, &r);
+	}
 
-	status = cli_do_rpc_ndr(cli, mem_ctx, PI_UNIXINFO, &ndr_table_unixinfo, NDR_UNIXINFO_SIDTOGID, &r);
+	status = cli_do_rpc_ndr(cli,
+				mem_ctx,
+				PI_UNIXINFO,
+				&ndr_table_unixinfo,
+				NDR_UNIXINFO_SIDTOGID,
+				&r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_OUT_DEBUG(unixinfo_SidToGid, &r);
+	}
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
@@ -99,7 +129,10 @@ NTSTATUS rpccli_unixinfo_SidToGid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
 	return r.out.result;
 }
 
-NTSTATUS rpccli_unixinfo_GidToSid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint64_t gid, struct dom_sid *sid)
+NTSTATUS rpccli_unixinfo_GidToSid(struct rpc_pipe_client *cli,
+				  TALLOC_CTX *mem_ctx,
+				  uint64_t gid,
+				  struct dom_sid *sid)
 {
 	struct unixinfo_GidToSid r;
 	NTSTATUS status;
@@ -107,17 +140,24 @@ NTSTATUS rpccli_unixinfo_GidToSid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
 	/* In parameters */
 	r.in.gid = gid;
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(unixinfo_GidToSid, &r);
+	}
 
-	status = cli_do_rpc_ndr(cli, mem_ctx, PI_UNIXINFO, &ndr_table_unixinfo, NDR_UNIXINFO_GIDTOSID, &r);
+	status = cli_do_rpc_ndr(cli,
+				mem_ctx,
+				PI_UNIXINFO,
+				&ndr_table_unixinfo,
+				NDR_UNIXINFO_GIDTOSID,
+				&r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_OUT_DEBUG(unixinfo_GidToSid, &r);
+	}
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
@@ -130,7 +170,11 @@ NTSTATUS rpccli_unixinfo_GidToSid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
 	return r.out.result;
 }
 
-NTSTATUS rpccli_unixinfo_GetPWUid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t *count, uint64_t *uids, struct unixinfo_GetPWUidInfo *infos)
+NTSTATUS rpccli_unixinfo_GetPWUid(struct rpc_pipe_client *cli,
+				  TALLOC_CTX *mem_ctx,
+				  uint32_t *count,
+				  uint64_t *uids,
+				  struct unixinfo_GetPWUidInfo *infos)
 {
 	struct unixinfo_GetPWUid r;
 	NTSTATUS status;
@@ -139,17 +183,24 @@ NTSTATUS rpccli_unixinfo_GetPWUid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
 	r.in.count = count;
 	r.in.uids = uids;
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(unixinfo_GetPWUid, &r);
+	}
 
-	status = cli_do_rpc_ndr(cli, mem_ctx, PI_UNIXINFO, &ndr_table_unixinfo, NDR_UNIXINFO_GETPWUID, &r);
+	status = cli_do_rpc_ndr(cli,
+				mem_ctx,
+				PI_UNIXINFO,
+				&ndr_table_unixinfo,
+				NDR_UNIXINFO_GETPWUID,
+				&r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_OUT_DEBUG(unixinfo_GetPWUid, &r);
+	}
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;