[SCM] Samba Shared Repository - branch v3-5-test updated

Volker Lendecke vlendec at samba.org
Sat Nov 7 03:11:03 MST 2009


The branch, v3-5-test has been updated
       via  8a438cc... s3: Do the printing for DEBUGLEVEL>=10 centrally
      from  657cbb2... s3: Register the ndr_interfaces dynamically

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 8a438cc8b7d3ebf082427f175e58af8b74994b03
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Nov 7 10:28:40 2009 +0100

    s3: Do the printing for DEBUGLEVEL>=10 centrally
    
    12 insertions(+), 10651 deletions(-)
    
    I think that says it all :-)

-----------------------------------------------------------------------

Summary of changes:
 librpc/gen_ndr/cli_dfs.c                |  368 -------
 librpc/gen_ndr/cli_drsuapi.c            |  400 -------
 librpc/gen_ndr/cli_dssetup.c            |  176 ---
 librpc/gen_ndr/cli_echo.c               |  160 ---
 librpc/gen_ndr/cli_epmapper.c           |  128 ---
 librpc/gen_ndr/cli_eventlog.c           |  400 -------
 librpc/gen_ndr/cli_initshutdown.c       |   48 -
 librpc/gen_ndr/cli_lsa.c                | 1312 -----------------------
 librpc/gen_ndr/cli_netlogon.c           |  752 -------------
 librpc/gen_ndr/cli_ntsvcs.c             | 1040 ------------------
 librpc/gen_ndr/cli_samr.c               | 1088 -------------------
 librpc/gen_ndr/cli_spoolss.c            | 1760 -------------------------------
 librpc/gen_ndr/cli_srvsvc.c             |  864 ---------------
 librpc/gen_ndr/cli_svcctl.c             |  704 ------------
 librpc/gen_ndr/cli_winreg.c             |  560 ----------
 librpc/gen_ndr/cli_wkssvc.c             |  496 ---------
 pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm |   26 -
 source3/librpc/gen_ndr/cli_wbint.c      |  368 -------
 source3/rpc_client/ndr.c                |   13 +-
 19 files changed, 12 insertions(+), 10651 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/cli_dfs.c b/librpc/gen_ndr/cli_dfs.c
index 685e3b5..6ce5b5f 100644
--- a/librpc/gen_ndr/cli_dfs.c
+++ b/librpc/gen_ndr/cli_dfs.c
@@ -37,10 +37,6 @@ struct tevent_req *rpccli_dfs_GetManagerVersion_send(TALLOC_CTX *mem_ctx,
 	/* Out parameters */
 	state->orig.out.version = _version;
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_GetManagerVersion, &state->orig);
-	}
-
 	state->out_mem_ctx = talloc_named_const(state, 0,
 			     "rpccli_dfs_GetManagerVersion_out_memory");
 	if (tevent_req_nomem(state->out_mem_ctx, req)) {
@@ -89,10 +85,6 @@ static void rpccli_dfs_GetManagerVersion_done(struct tevent_req *subreq)
 	/* Reset temporary structure */
 	ZERO_STRUCT(state->tmp);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_GetManagerVersion, &state->orig);
-	}
-
 	tevent_req_done(req);
 }
 
@@ -124,10 +116,6 @@ NTSTATUS rpccli_dfs_GetManagerVersion(struct rpc_pipe_client *cli,
 
 	/* In parameters */
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_GetManagerVersion, &r);
-	}
-
 	status = cli->dispatch(cli,
 				mem_ctx,
 				&ndr_table_netdfs,
@@ -138,10 +126,6 @@ NTSTATUS rpccli_dfs_GetManagerVersion(struct rpc_pipe_client *cli,
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_GetManagerVersion, &r);
-	}
-
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
 	}
@@ -195,10 +179,6 @@ struct tevent_req *rpccli_dfs_Add_send(TALLOC_CTX *mem_ctx,
 	/* Result */
 	ZERO_STRUCT(state->orig.out.result);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_Add, &state->orig);
-	}
-
 	/* make a temporary copy, that we pass to the dispatch function */
 	state->tmp = state->orig;
 
@@ -243,10 +223,6 @@ static void rpccli_dfs_Add_done(struct tevent_req *subreq)
 	/* Reset temporary structure */
 	ZERO_STRUCT(state->tmp);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_Add, &state->orig);
-	}
-
 	tevent_req_done(req);
 }
 
@@ -292,10 +268,6 @@ NTSTATUS rpccli_dfs_Add(struct rpc_pipe_client *cli,
 	r.in.comment = comment;
 	r.in.flags = flags;
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_Add, &r);
-	}
-
 	status = cli->dispatch(cli,
 				mem_ctx,
 				&ndr_table_netdfs,
@@ -306,10 +278,6 @@ NTSTATUS rpccli_dfs_Add(struct rpc_pipe_client *cli,
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_Add, &r);
-	}
-
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
 	}
@@ -362,10 +330,6 @@ struct tevent_req *rpccli_dfs_Remove_send(TALLOC_CTX *mem_ctx,
 	/* Result */
 	ZERO_STRUCT(state->orig.out.result);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_Remove, &state->orig);
-	}
-
 	/* make a temporary copy, that we pass to the dispatch function */
 	state->tmp = state->orig;
 
@@ -410,10 +374,6 @@ static void rpccli_dfs_Remove_done(struct tevent_req *subreq)
 	/* Reset temporary structure */
 	ZERO_STRUCT(state->tmp);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_Remove, &state->orig);
-	}
-
 	tevent_req_done(req);
 }
 
@@ -455,10 +415,6 @@ NTSTATUS rpccli_dfs_Remove(struct rpc_pipe_client *cli,
 	r.in.servername = servername;
 	r.in.sharename = sharename;
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_Remove, &r);
-	}
-
 	status = cli->dispatch(cli,
 				mem_ctx,
 				&ndr_table_netdfs,
@@ -469,10 +425,6 @@ NTSTATUS rpccli_dfs_Remove(struct rpc_pipe_client *cli,
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_Remove, &r);
-	}
-
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
 	}
@@ -529,10 +481,6 @@ struct tevent_req *rpccli_dfs_SetInfo_send(TALLOC_CTX *mem_ctx,
 	/* Result */
 	ZERO_STRUCT(state->orig.out.result);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_SetInfo, &state->orig);
-	}
-
 	/* make a temporary copy, that we pass to the dispatch function */
 	state->tmp = state->orig;
 
@@ -577,10 +525,6 @@ static void rpccli_dfs_SetInfo_done(struct tevent_req *subreq)
 	/* Reset temporary structure */
 	ZERO_STRUCT(state->tmp);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_SetInfo, &state->orig);
-	}
-
 	tevent_req_done(req);
 }
 
@@ -626,10 +570,6 @@ NTSTATUS rpccli_dfs_SetInfo(struct rpc_pipe_client *cli,
 	r.in.level = level;
 	r.in.info = info;
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_SetInfo, &r);
-	}
-
 	status = cli->dispatch(cli,
 				mem_ctx,
 				&ndr_table_netdfs,
@@ -640,10 +580,6 @@ NTSTATUS rpccli_dfs_SetInfo(struct rpc_pipe_client *cli,
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_SetInfo, &r);
-	}
-
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
 	}
@@ -700,10 +636,6 @@ struct tevent_req *rpccli_dfs_GetInfo_send(TALLOC_CTX *mem_ctx,
 	/* Result */
 	ZERO_STRUCT(state->orig.out.result);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_GetInfo, &state->orig);
-	}
-
 	state->out_mem_ctx = talloc_named_const(state, 0,
 			     "rpccli_dfs_GetInfo_out_memory");
 	if (tevent_req_nomem(state->out_mem_ctx, req)) {
@@ -755,10 +687,6 @@ static void rpccli_dfs_GetInfo_done(struct tevent_req *subreq)
 	/* Reset temporary structure */
 	ZERO_STRUCT(state->tmp);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_GetInfo, &state->orig);
-	}
-
 	tevent_req_done(req);
 }
 
@@ -803,10 +731,6 @@ NTSTATUS rpccli_dfs_GetInfo(struct rpc_pipe_client *cli,
 	r.in.sharename = sharename;
 	r.in.level = level;
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_GetInfo, &r);
-	}
-
 	status = cli->dispatch(cli,
 				mem_ctx,
 				&ndr_table_netdfs,
@@ -817,10 +741,6 @@ NTSTATUS rpccli_dfs_GetInfo(struct rpc_pipe_client *cli,
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_GetInfo, &r);
-	}
-
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
 	}
@@ -878,10 +798,6 @@ struct tevent_req *rpccli_dfs_Enum_send(TALLOC_CTX *mem_ctx,
 	/* Result */
 	ZERO_STRUCT(state->orig.out.result);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_Enum, &state->orig);
-	}
-
 	state->out_mem_ctx = talloc_named_const(state, 0,
 			     "rpccli_dfs_Enum_out_memory");
 	if (tevent_req_nomem(state->out_mem_ctx, req)) {
@@ -938,10 +854,6 @@ static void rpccli_dfs_Enum_done(struct tevent_req *subreq)
 	/* Reset temporary structure */
 	ZERO_STRUCT(state->tmp);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_Enum, &state->orig);
-	}
-
 	tevent_req_done(req);
 }
 
@@ -985,10 +897,6 @@ NTSTATUS rpccli_dfs_Enum(struct rpc_pipe_client *cli,
 	r.in.info = info;
 	r.in.total = total;
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_Enum, &r);
-	}
-
 	status = cli->dispatch(cli,
 				mem_ctx,
 				&ndr_table_netdfs,
@@ -999,10 +907,6 @@ NTSTATUS rpccli_dfs_Enum(struct rpc_pipe_client *cli,
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_Enum, &r);
-	}
-
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
 	}
@@ -1055,10 +959,6 @@ struct tevent_req *rpccli_dfs_Rename_send(TALLOC_CTX *mem_ctx,
 	/* Result */
 	ZERO_STRUCT(state->orig.out.result);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_Rename, &state->orig);
-	}
-
 	/* make a temporary copy, that we pass to the dispatch function */
 	state->tmp = state->orig;
 
@@ -1103,10 +1003,6 @@ static void rpccli_dfs_Rename_done(struct tevent_req *subreq)
 	/* Reset temporary structure */
 	ZERO_STRUCT(state->tmp);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_Rename, &state->orig);
-	}
-
 	tevent_req_done(req);
 }
 
@@ -1142,10 +1038,6 @@ NTSTATUS rpccli_dfs_Rename(struct rpc_pipe_client *cli,
 
 	/* In parameters */
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_Rename, &r);
-	}
-
 	status = cli->dispatch(cli,
 				mem_ctx,
 				&ndr_table_netdfs,
@@ -1156,10 +1048,6 @@ NTSTATUS rpccli_dfs_Rename(struct rpc_pipe_client *cli,
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_Rename, &r);
-	}
-
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
 	}
@@ -1206,10 +1094,6 @@ struct tevent_req *rpccli_dfs_Move_send(TALLOC_CTX *mem_ctx,
 	/* Result */
 	ZERO_STRUCT(state->orig.out.result);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_Move, &state->orig);
-	}
-
 	/* make a temporary copy, that we pass to the dispatch function */
 	state->tmp = state->orig;
 
@@ -1254,10 +1138,6 @@ static void rpccli_dfs_Move_done(struct tevent_req *subreq)
 	/* Reset temporary structure */
 	ZERO_STRUCT(state->tmp);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_Move, &state->orig);
-	}
-
 	tevent_req_done(req);
 }
 
@@ -1293,10 +1173,6 @@ NTSTATUS rpccli_dfs_Move(struct rpc_pipe_client *cli,
 
 	/* In parameters */
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_Move, &r);
-	}
-
 	status = cli->dispatch(cli,
 				mem_ctx,
 				&ndr_table_netdfs,
@@ -1307,10 +1183,6 @@ NTSTATUS rpccli_dfs_Move(struct rpc_pipe_client *cli,
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_Move, &r);
-	}
-
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
 	}
@@ -1357,10 +1229,6 @@ struct tevent_req *rpccli_dfs_ManagerGetConfigInfo_send(TALLOC_CTX *mem_ctx,
 	/* Result */
 	ZERO_STRUCT(state->orig.out.result);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_ManagerGetConfigInfo, &state->orig);
-	}
-
 	/* make a temporary copy, that we pass to the dispatch function */
 	state->tmp = state->orig;
 
@@ -1405,10 +1273,6 @@ static void rpccli_dfs_ManagerGetConfigInfo_done(struct tevent_req *subreq)
 	/* Reset temporary structure */
 	ZERO_STRUCT(state->tmp);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_ManagerGetConfigInfo, &state->orig);
-	}
-
 	tevent_req_done(req);
 }
 
@@ -1444,10 +1308,6 @@ NTSTATUS rpccli_dfs_ManagerGetConfigInfo(struct rpc_pipe_client *cli,
 
 	/* In parameters */
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_ManagerGetConfigInfo, &r);
-	}
-
 	status = cli->dispatch(cli,
 				mem_ctx,
 				&ndr_table_netdfs,
@@ -1458,10 +1318,6 @@ NTSTATUS rpccli_dfs_ManagerGetConfigInfo(struct rpc_pipe_client *cli,
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_ManagerGetConfigInfo, &r);
-	}
-
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
 	}
@@ -1508,10 +1364,6 @@ struct tevent_req *rpccli_dfs_ManagerSendSiteInfo_send(TALLOC_CTX *mem_ctx,
 	/* Result */
 	ZERO_STRUCT(state->orig.out.result);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_ManagerSendSiteInfo, &state->orig);
-	}
-
 	/* make a temporary copy, that we pass to the dispatch function */
 	state->tmp = state->orig;
 
@@ -1556,10 +1408,6 @@ static void rpccli_dfs_ManagerSendSiteInfo_done(struct tevent_req *subreq)
 	/* Reset temporary structure */
 	ZERO_STRUCT(state->tmp);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_ManagerSendSiteInfo, &state->orig);
-	}
-
 	tevent_req_done(req);
 }
 
@@ -1595,10 +1443,6 @@ NTSTATUS rpccli_dfs_ManagerSendSiteInfo(struct rpc_pipe_client *cli,
 
 	/* In parameters */
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_ManagerSendSiteInfo, &r);
-	}
-
 	status = cli->dispatch(cli,
 				mem_ctx,
 				&ndr_table_netdfs,
@@ -1609,10 +1453,6 @@ NTSTATUS rpccli_dfs_ManagerSendSiteInfo(struct rpc_pipe_client *cli,
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_ManagerSendSiteInfo, &r);
-	}
-
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
 	}
@@ -1678,10 +1518,6 @@ struct tevent_req *rpccli_dfs_AddFtRoot_send(TALLOC_CTX *mem_ctx,
 	/* Result */
 	ZERO_STRUCT(state->orig.out.result);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_AddFtRoot, &state->orig);
-	}
-
 	state->out_mem_ctx = talloc_named_const(state, 0,
 			     "rpccli_dfs_AddFtRoot_out_memory");
 	if (tevent_req_nomem(state->out_mem_ctx, req)) {
@@ -1735,10 +1571,6 @@ static void rpccli_dfs_AddFtRoot_done(struct tevent_req *subreq)
 	/* Reset temporary structure */
 	ZERO_STRUCT(state->tmp);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_AddFtRoot, &state->orig);
-	}
-
 	tevent_req_done(req);
 }
 
@@ -1792,10 +1624,6 @@ NTSTATUS rpccli_dfs_AddFtRoot(struct rpc_pipe_client *cli,
 	r.in.flags = flags;
 	r.in.unknown2 = unknown2;
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_AddFtRoot, &r);
-	}
-
 	status = cli->dispatch(cli,
 				mem_ctx,
 				&ndr_table_netdfs,
@@ -1806,10 +1634,6 @@ NTSTATUS rpccli_dfs_AddFtRoot(struct rpc_pipe_client *cli,
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_OUT_DEBUG(dfs_AddFtRoot, &r);
-	}
-
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
 	}
@@ -1872,10 +1696,6 @@ struct tevent_req *rpccli_dfs_RemoveFtRoot_send(TALLOC_CTX *mem_ctx,
 	/* Result */
 	ZERO_STRUCT(state->orig.out.result);
 
-	if (DEBUGLEVEL >= 10) {
-		NDR_PRINT_IN_DEBUG(dfs_RemoveFtRoot, &state->orig);
-	}
-
 	state->out_mem_ctx = talloc_named_const(state, 0,
 			     "rpccli_dfs_RemoveFtRoot_out_memory");
 	if (tevent_req_nomem(state->out_mem_ctx, req)) {
@@ -1929,10 +1749,6 @@ static void rpccli_dfs_RemoveFtRoot_done(struct tevent_req *subreq)


-- 
Samba Shared Repository


More information about the samba-cvs mailing list