svn commit: samba r18747 - in branches/SAMBA_3_0/source: . libmsrpc
python rpc_client rpcclient sam utils
jerry at samba.org
jerry at samba.org
Wed Sep 20 22:49:04 GMT 2006
Author: jerry
Date: 2006-09-20 22:49:02 +0000 (Wed, 20 Sep 2006)
New Revision: 18747
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18747
Log:
replace rpccli_lsa_close() with rpccli_lsa_Close()
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0/source/libmsrpc/cac_lsarpc.c
branches/SAMBA_3_0/source/python/py_lsa.c
branches/SAMBA_3_0/source/rpc_client/cli_lsarpc.c
branches/SAMBA_3_0/source/rpcclient/cmd_lsarpc.c
branches/SAMBA_3_0/source/rpcclient/cmd_test.c
branches/SAMBA_3_0/source/rpcclient/rpcclient.c
branches/SAMBA_3_0/source/sam/idmap_rid.c
branches/SAMBA_3_0/source/utils/net_domain.c
branches/SAMBA_3_0/source/utils/net_rpc.c
branches/SAMBA_3_0/source/utils/net_rpc_join.c
branches/SAMBA_3_0/source/utils/net_rpc_rights.c
branches/SAMBA_3_0/source/utils/net_util.c
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in 2006-09-20 22:31:04 UTC (rev 18746)
+++ branches/SAMBA_3_0/source/Makefile.in 2006-09-20 22:49:02 UTC (rev 18747)
@@ -320,7 +320,7 @@
RPC_UNIXINFO_OBJ = librpc/gen_ndr/srv_unixinfo.o rpc_server/srv_unixinfo_nt.o
REGFIO_OBJ = registry/regfio.o
-RPC_REG_OBJ = rpc_server/srv_reg.o rpc_server/srv_reg_nt.o $(REGFIO_OBJ)
+RPC_REG_OBJ = librpc/gen_ndr/srv_winreg.o rpc_server/srv_winreg_nt.o $(REGFIO_OBJ)
RPC_LSA_DS_OBJ = rpc_server/srv_lsa_ds.o rpc_server/srv_lsa_ds_nt.o
Modified: branches/SAMBA_3_0/source/libmsrpc/cac_lsarpc.c
===================================================================
--- branches/SAMBA_3_0/source/libmsrpc/cac_lsarpc.c 2006-09-20 22:31:04 UTC (rev 18746)
+++ branches/SAMBA_3_0/source/libmsrpc/cac_lsarpc.c 2006-09-20 22:49:02 UTC (rev 18747)
@@ -124,7 +124,7 @@
return CAC_FAILURE;
}
- hnd->status = rpccli_lsa_close(pipe_hnd, mem_ctx, pol);
+ hnd->status = rpccli_lsa_Close(pipe_hnd, mem_ctx, pol);
TALLOC_FREE(pol);
Modified: branches/SAMBA_3_0/source/python/py_lsa.c
===================================================================
--- branches/SAMBA_3_0/source/python/py_lsa.c 2006-09-20 22:31:04 UTC (rev 18746)
+++ branches/SAMBA_3_0/source/python/py_lsa.c 2006-09-20 22:49:02 UTC (rev 18747)
@@ -125,7 +125,7 @@
/* Call rpc function */
- result = rpccli_lsa_close(hnd->cli, hnd->mem_ctx, &hnd->pol);
+ result = rpccli_lsa_Close(hnd->cli, hnd->mem_ctx, &hnd->pol);
/* Cleanup samba stuff */
Modified: branches/SAMBA_3_0/source/rpc_client/cli_lsarpc.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_client/cli_lsarpc.c 2006-09-20 22:31:04 UTC (rev 18746)
+++ branches/SAMBA_3_0/source/rpc_client/cli_lsarpc.c 2006-09-20 22:49:02 UTC (rev 18747)
@@ -127,14 +127,6 @@
return result;
}
-/** Close a LSA policy handle */
-
-NTSTATUS rpccli_lsa_close(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
- POLICY_HND *pol)
-{
- return rpccli_lsa_Close( cli, mem_ctx, pol);
-}
-
/** Lookup a list of sids */
NTSTATUS rpccli_lsa_lookup_sids(struct rpc_pipe_client *cli,
Modified: branches/SAMBA_3_0/source/rpcclient/cmd_lsarpc.c
===================================================================
--- branches/SAMBA_3_0/source/rpcclient/cmd_lsarpc.c 2006-09-20 22:31:04 UTC (rev 18746)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_lsarpc.c 2006-09-20 22:49:02 UTC (rev 18747)
@@ -51,7 +51,7 @@
if (!NT_STATUS_IS_OK(result))
goto done;
- rpccli_lsa_close(cli, mem_ctx, &pol);
+ rpccli_lsa_Close(cli, mem_ctx, &pol);
*sid = sids[0];
@@ -208,7 +208,7 @@
display_lsa_query_info(&dom, mem_ctx);
- rpccli_lsa_close(cli, mem_ctx, &pol);
+ rpccli_lsa_Close(cli, mem_ctx, &pol);
done:
return result;
@@ -256,7 +256,7 @@
sid_type_lookup(types[i]), types[i]);
}
- rpccli_lsa_close(cli, mem_ctx, &pol);
+ rpccli_lsa_Close(cli, mem_ctx, &pol);
done:
return result;
@@ -324,7 +324,7 @@
names[i] ? names[i] : "*unknown*", types[i]);
}
- rpccli_lsa_close(cli, mem_ctx, &pol);
+ rpccli_lsa_Close(cli, mem_ctx, &pol);
done:
return result;
@@ -387,7 +387,7 @@
}
}
- rpccli_lsa_close(cli, mem_ctx, &pol);
+ rpccli_lsa_Close(cli, mem_ctx, &pol);
done:
return result;
}
@@ -441,7 +441,7 @@
privs_high[i], privs_low[i], privs_high[i], privs_low[i]);
}
- rpccli_lsa_close(cli, mem_ctx, &pol);
+ rpccli_lsa_Close(cli, mem_ctx, &pol);
done:
return result;
}
@@ -480,7 +480,7 @@
/* Print results */
printf("%s -> %s (language: 0x%x)\n", argv[1], description, lang_id_desc);
- rpccli_lsa_close(cli, mem_ctx, &pol);
+ rpccli_lsa_Close(cli, mem_ctx, &pol);
done:
return result;
}
@@ -534,7 +534,7 @@
printf("%s\n", sid_str);
}
- rpccli_lsa_close(cli, mem_ctx, &pol);
+ rpccli_lsa_Close(cli, mem_ctx, &pol);
done:
return result;
}
@@ -576,7 +576,7 @@
printf("Account for SID %s successfully created\n\n", argv[1]);
result = NT_STATUS_OK;
- rpccli_lsa_close(cli, mem_ctx, &dom_pol);
+ rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
done:
return result;
}
@@ -632,7 +632,7 @@
printf("%u\t%u\t%u\n", set[i].luid.high, set[i].luid.low, set[i].attr);
}
- rpccli_lsa_close(cli, mem_ctx, &dom_pol);
+ rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
done:
return result;
}
@@ -680,7 +680,7 @@
printf("\t%s\n", rights[i]);
}
- rpccli_lsa_close(cli, mem_ctx, &dom_pol);
+ rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
done:
return result;
}
@@ -719,7 +719,7 @@
if (!NT_STATUS_IS_OK(result))
goto done;
- rpccli_lsa_close(cli, mem_ctx, &dom_pol);
+ rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
done:
return result;
}
@@ -758,7 +758,7 @@
if (!NT_STATUS_IS_OK(result))
goto done;
- rpccli_lsa_close(cli, mem_ctx, &dom_pol);
+ rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
done:
return result;
@@ -796,7 +796,7 @@
printf("%u:%u (0x%x:0x%x)\n", luid.high, luid.low, luid.high, luid.low);
- rpccli_lsa_close(cli, mem_ctx, &pol);
+ rpccli_lsa_Close(cli, mem_ctx, &pol);
done:
return result;
}
@@ -836,7 +836,7 @@
display_sec_desc(sdb->sd);
- rpccli_lsa_close(cli, mem_ctx, &pol);
+ rpccli_lsa_Close(cli, mem_ctx, &pol);
done:
return result;
}
@@ -944,7 +944,7 @@
done:
if (&pol)
- rpccli_lsa_close(cli, mem_ctx, &pol);
+ rpccli_lsa_Close(cli, mem_ctx, &pol);
return result;
}
@@ -982,7 +982,7 @@
done:
if (&pol)
- rpccli_lsa_close(cli, mem_ctx, &pol);
+ rpccli_lsa_Close(cli, mem_ctx, &pol);
return result;
}
@@ -1031,7 +1031,7 @@
done:
if (&pol)
- rpccli_lsa_close(cli, mem_ctx, &pol);
+ rpccli_lsa_Close(cli, mem_ctx, &pol);
return result;
}
Modified: branches/SAMBA_3_0/source/rpcclient/cmd_test.c
===================================================================
--- branches/SAMBA_3_0/source/rpcclient/cmd_test.c 2006-09-20 22:31:04 UTC (rev 18746)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_test.c 2006-09-20 22:49:02 UTC (rev 18747)
@@ -43,7 +43,7 @@
if (!NT_STATUS_IS_OK(status))
goto done;
- status = rpccli_lsa_close(lsa_pipe, mem_ctx, &pol);
+ status = rpccli_lsa_Close(lsa_pipe, mem_ctx, &pol);
if (!NT_STATUS_IS_OK(status))
goto done;
Modified: branches/SAMBA_3_0/source/rpcclient/rpcclient.c
===================================================================
--- branches/SAMBA_3_0/source/rpcclient/rpcclient.c 2006-09-20 22:31:04 UTC (rev 18746)
+++ branches/SAMBA_3_0/source/rpcclient/rpcclient.c 2006-09-20 22:49:02 UTC (rev 18747)
@@ -168,7 +168,7 @@
got_domain_sid = True;
sid_copy( &domain_sid, dom_sid );
- rpccli_lsa_close(lsapipe, mem_ctx, &pol);
+ rpccli_lsa_Close(lsapipe, mem_ctx, &pol);
cli_rpc_pipe_close(lsapipe);
talloc_destroy(mem_ctx);
Modified: branches/SAMBA_3_0/source/sam/idmap_rid.c
===================================================================
--- branches/SAMBA_3_0/source/sam/idmap_rid.c 2006-09-20 22:31:04 UTC (rev 18746)
+++ branches/SAMBA_3_0/source/sam/idmap_rid.c 2006-09-20 22:49:02 UTC (rev 18747)
@@ -326,7 +326,7 @@
status = NT_STATUS_OK;
out:
- rpccli_lsa_close(pipe_hnd, mem_ctx, &pol);
+ rpccli_lsa_Close(pipe_hnd, mem_ctx, &pol);
cli_rpc_pipe_close(pipe_hnd);
talloc_destroy(mem_ctx);
cli_shutdown(cli);
Modified: branches/SAMBA_3_0/source/utils/net_domain.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_domain.c 2006-09-20 22:31:04 UTC (rev 18746)
+++ branches/SAMBA_3_0/source/utils/net_domain.c 2006-09-20 22:49:02 UTC (rev 18747)
@@ -180,7 +180,7 @@
if ( !NT_STATUS_IS_OK(status) )
return status;
- rpccli_lsa_close(pipe_hnd, mem_ctx, &lsa_pol);
+ rpccli_lsa_Close(pipe_hnd, mem_ctx, &lsa_pol);
cli_rpc_pipe_close(pipe_hnd); /* Done with this pipe */
/* Bail out if domain didn't get set. */
Modified: branches/SAMBA_3_0/source/utils/net_rpc.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_rpc.c 2006-09-20 22:31:04 UTC (rev 18746)
+++ branches/SAMBA_3_0/source/utils/net_rpc.c 2006-09-20 22:49:02 UTC (rev 18747)
@@ -81,7 +81,7 @@
return result;
}
- rpccli_lsa_close(lsa_pipe, mem_ctx, &pol);
+ rpccli_lsa_Close(lsa_pipe, mem_ctx, &pol);
cli_rpc_pipe_close(lsa_pipe);
return NT_STATUS_OK;
@@ -2036,7 +2036,7 @@
*type = types[0];
}
- rpccli_lsa_close(pipe_hnd, mem_ctx, &lsa_pol);
+ rpccli_lsa_Close(pipe_hnd, mem_ctx, &lsa_pol);
done:
if (pipe_hnd) {
@@ -4109,7 +4109,7 @@
DEBUG(1, ("\n"));
}
- rpccli_lsa_close(pipe_hnd, mem_ctx, &lsa_pol);
+ rpccli_lsa_Close(pipe_hnd, mem_ctx, &lsa_pol);
return NT_STATUS_OK;
}
@@ -5722,7 +5722,7 @@
* Close the pipes and clean up
*/
- nt_status = rpccli_lsa_close(pipe_hnd, mem_ctx, &connect_hnd);
+ nt_status = rpccli_lsa_Close(pipe_hnd, mem_ctx, &connect_hnd);
if (NT_STATUS_IS_ERR(nt_status)) {
DEBUG(0, ("Couldn't close LSA pipe. Error was %s\n",
nt_errstr(nt_status)));
@@ -5984,7 +5984,7 @@
} while (NT_STATUS_EQUAL(nt_status, STATUS_MORE_ENTRIES));
/* close this connection before doing next one */
- nt_status = rpccli_lsa_close(pipe_hnd, mem_ctx, &connect_hnd);
+ nt_status = rpccli_lsa_Close(pipe_hnd, mem_ctx, &connect_hnd);
if (NT_STATUS_IS_ERR(nt_status)) {
DEBUG(0, ("Couldn't properly close lsa policy handle. Error was %s\n",
nt_errstr(nt_status)));
@@ -6108,7 +6108,7 @@
} while (NT_STATUS_EQUAL(nt_status, STATUS_MORE_ENTRIES));
/* close this connection before doing next one */
- nt_status = rpccli_lsa_close(pipe_hnd, mem_ctx, &connect_hnd);
+ nt_status = rpccli_lsa_Close(pipe_hnd, mem_ctx, &connect_hnd);
if (NT_STATUS_IS_ERR(nt_status)) {
DEBUG(0, ("Couldn't properly close lsa policy handle. Error was %s\n",
nt_errstr(nt_status)));
Modified: branches/SAMBA_3_0/source/utils/net_rpc_join.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_rpc_join.c 2006-09-20 22:31:04 UTC (rev 18746)
+++ branches/SAMBA_3_0/source/utils/net_rpc_join.c 2006-09-20 22:49:02 UTC (rev 18747)
@@ -193,7 +193,7 @@
5, &domain, &domain_sid),
"error querying info policy");
- rpccli_lsa_close(pipe_hnd, mem_ctx, &lsa_pol);
+ rpccli_lsa_Close(pipe_hnd, mem_ctx, &lsa_pol);
cli_rpc_pipe_close(pipe_hnd); /* Done with this pipe */
/* Bail out if domain didn't get set. */
Modified: branches/SAMBA_3_0/source/utils/net_rpc_rights.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_rpc_rights.c 2006-09-20 22:31:04 UTC (rev 18746)
+++ branches/SAMBA_3_0/source/utils/net_rpc_rights.c 2006-09-20 22:49:02 UTC (rev 18747)
@@ -48,7 +48,7 @@
fstrcpy( name, names[0] );
}
- rpccli_lsa_close(pipe_hnd, mem_ctx, &pol);
+ rpccli_lsa_Close(pipe_hnd, mem_ctx, &pol);
return result;
}
@@ -81,7 +81,7 @@
if ( NT_STATUS_IS_OK(result) )
sid_copy( sid, &sids[0] );
- rpccli_lsa_close(pipe_hnd, mem_ctx, &pol);
+ rpccli_lsa_Close(pipe_hnd, mem_ctx, &pol);
return result;
}
@@ -391,7 +391,7 @@
result = enum_privileges_for_user(pipe_hnd, mem_ctx, &pol, &sid );
done:
- rpccli_lsa_close(pipe_hnd, mem_ctx, &pol);
+ rpccli_lsa_Close(pipe_hnd, mem_ctx, &pol);
return result;
}
@@ -442,7 +442,7 @@
argv[0], nt_errstr(result));
}
- rpccli_lsa_close(pipe_hnd, mem_ctx, &dom_pol);
+ rpccli_lsa_Close(pipe_hnd, mem_ctx, &dom_pol);
return result;
}
@@ -493,7 +493,7 @@
argv[0], nt_errstr(result));
}
- rpccli_lsa_close(pipe_hnd, mem_ctx, &dom_pol);
+ rpccli_lsa_Close(pipe_hnd, mem_ctx, &dom_pol);
return result;
}
Modified: branches/SAMBA_3_0/source/utils/net_util.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_util.c 2006-09-20 22:31:04 UTC (rev 18746)
+++ branches/SAMBA_3_0/source/utils/net_util.c 2006-09-20 22:49:02 UTC (rev 18747)
@@ -81,7 +81,7 @@
done:
if (is_valid_policy_hnd(&pol)) {
- rpccli_lsa_close(lsa_pipe, mem_ctx, &pol);
+ rpccli_lsa_Close(lsa_pipe, mem_ctx, &pol);
}
cli_rpc_pipe_close(lsa_pipe);
More information about the samba-cvs
mailing list