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

Volker Lendecke vlendec at samba.org
Sat Nov 7 16:30:35 MST 2009


The branch, v3-5-test has been updated
       via  0af2b97... s3: Do not directly reference the ndr_table_* in rpcclient
       via  06b7a09... tdb: Fix a C++ warning
      from  8a438cc... s3: Do the printing for DEBUGLEVEL>=10 centrally

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


- Log -----------------------------------------------------------------
commit 0af2b974c6899798c96798734a09f84a17a56566
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 1 20:21:52 2009 +0100

    s3: Do not directly reference the ndr_table_* in rpcclient

commit 06b7a09c02aa5345d675c04449d54f6c0f8c13d0
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 6 14:04:49 2009 +0100

    tdb: Fix a C++ warning

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

Summary of changes:
 lib/tdb/common/check.c           |    3 +-
 source3/include/proto.h          |    2 +
 source3/rpc_client/cli_pipe.c    |   14 +++
 source3/rpcclient/cmd_dfs.c      |   24 ++++--
 source3/rpcclient/cmd_drsuapi.c  |   12 ++-
 source3/rpcclient/cmd_dssetup.c  |    5 +-
 source3/rpcclient/cmd_echo.c     |   16 +++-
 source3/rpcclient/cmd_epmapper.c |    6 +-
 source3/rpcclient/cmd_eventlog.c |   40 +++++++--
 source3/rpcclient/cmd_lsarpc.c   |  124 ++++++++++++++++++++-------
 source3/rpcclient/cmd_netlogon.c |  100 +++++++++++++++++-----
 source3/rpcclient/cmd_ntsvcs.c   |   35 ++++++--
 source3/rpcclient/cmd_samr.c     |  136 ++++++++++++++++++++++--------
 source3/rpcclient/cmd_shutdown.c |   13 ++-
 source3/rpcclient/cmd_spoolss.c  |  175 ++++++++++++++++++++++++++++++--------
 source3/rpcclient/cmd_srvsvc.c   |   65 +++++++++++---
 source3/rpcclient/cmd_test.c     |    2 +-
 source3/rpcclient/cmd_wkssvc.c   |   20 ++++-
 source3/rpcclient/rpcclient.c    |   73 +++++++++++-----
 source3/rpcclient/rpcclient.h    |    3 +-
 20 files changed, 664 insertions(+), 204 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/common/check.c b/lib/tdb/common/check.c
index 4924734..f0a15f8 100644
--- a/lib/tdb/common/check.c
+++ b/lib/tdb/common/check.c
@@ -329,7 +329,8 @@ int tdb_check(struct tdb_context *tdb,
 	}
 
 	/* One big malloc: pointers then bit arrays. */
-	hashes = calloc(1, sizeof(hashes[0]) * (1+tdb->header.hash_size)
+	hashes = (unsigned char **)calloc(
+			1, sizeof(hashes[0]) * (1+tdb->header.hash_size)
 			+ BITMAP_BITS / CHAR_BIT * (1+tdb->header.hash_size));
 	if (!hashes) {
 		tdb->ecode = TDB_ERR_OOM;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index baa4482..c4a8b41 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5706,6 +5706,8 @@ bool prs_data_blob(prs_struct *prs, DATA_BLOB *blob, TALLOC_CTX *mem_ctx);
 bool smb_register_ndr_interface(const struct ndr_interface_table *interface);
 const struct ndr_interface_table *get_iface_from_syntax(
         const struct ndr_syntax_id *syntax);
+bool ndr_syntax_from_string(const char *s, uint32_t version,
+                            struct ndr_syntax_id *syntax);
 const char *get_pipe_name_from_syntax(TALLOC_CTX *mem_ctx,
 				      const struct ndr_syntax_id *syntax);
 void init_rpc_hdr(RPC_HDR *hdr, enum dcerpc_pkt_type pkt_type, uint8 flags,
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 9ff84f8..bd7bf32 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -195,6 +195,20 @@ const char *get_pipe_name_from_syntax(TALLOC_CTX *mem_ctx,
 	return result;
 }
 
+bool ndr_syntax_from_string(const char *s, uint32_t version,
+			    struct ndr_syntax_id *syntax)
+{
+	NTSTATUS status;
+	status = GUID_from_string(s, &syntax->uuid);
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(10, ("GUID_from_string returned %s\n",
+			   nt_errstr(status)));
+		return false;
+	}
+	syntax->if_version = version;
+	return true;
+}
+
 /********************************************************************
  Map internal value to wire value.
  ********************************************************************/
diff --git a/source3/rpcclient/cmd_dfs.c b/source3/rpcclient/cmd_dfs.c
index d55261b..8fdc772 100644
--- a/source3/rpcclient/cmd_dfs.c
+++ b/source3/rpcclient/cmd_dfs.c
@@ -318,12 +318,24 @@ struct cmd_set dfs_commands[] = {
 
 	{ "DFS" },
 
-	{ "dfsversion",	RPC_RTYPE_WERROR, NULL, cmd_dfs_version, &ndr_table_netdfs.syntax_id, NULL, "Query DFS support",    "" },
-	{ "dfsadd",	RPC_RTYPE_WERROR, NULL, cmd_dfs_add,     &ndr_table_netdfs.syntax_id, NULL, "Add a DFS share",      "" },
-	{ "dfsremove",	RPC_RTYPE_WERROR, NULL, cmd_dfs_remove,  &ndr_table_netdfs.syntax_id, NULL, "Remove a DFS share",   "" },
-	{ "dfsgetinfo",	RPC_RTYPE_WERROR, NULL, cmd_dfs_getinfo, &ndr_table_netdfs.syntax_id, NULL, "Query DFS share info", "" },
-	{ "dfsenum",	RPC_RTYPE_WERROR, NULL, cmd_dfs_enum,    &ndr_table_netdfs.syntax_id, NULL, "Enumerate dfs shares", "" },
-	{ "dfsenumex",	RPC_RTYPE_WERROR, NULL, cmd_dfs_enumex,  &ndr_table_netdfs.syntax_id, NULL, "Enumerate dfs shares", "" },
+	{ "dfsversion",	RPC_RTYPE_WERROR, NULL, cmd_dfs_version,
+	  NDR_NETDFS_UUID, NDR_NETDFS_VERSION, NULL,
+	  "Query DFS support",    "" },
+	{ "dfsadd",	RPC_RTYPE_WERROR, NULL, cmd_dfs_add,
+	  NDR_NETDFS_UUID, NDR_NETDFS_VERSION, NULL,
+	  "Add a DFS share",      "" },
+	{ "dfsremove",	RPC_RTYPE_WERROR, NULL, cmd_dfs_remove,
+	  NDR_NETDFS_UUID, NDR_NETDFS_VERSION, NULL,
+	  "Remove a DFS share",   "" },
+	{ "dfsgetinfo",	RPC_RTYPE_WERROR, NULL, cmd_dfs_getinfo,
+	  NDR_NETDFS_UUID, NDR_NETDFS_VERSION, NULL,
+	  "Query DFS share info", "" },
+	{ "dfsenum",	RPC_RTYPE_WERROR, NULL, cmd_dfs_enum,
+	  NDR_NETDFS_UUID, NDR_NETDFS_VERSION, NULL,
+	  "Enumerate dfs shares", "" },
+	{ "dfsenumex",	RPC_RTYPE_WERROR, NULL, cmd_dfs_enumex,
+	  NDR_NETDFS_UUID, NDR_NETDFS_VERSION, NULL,
+	  "Enumerate dfs shares", "" },
 
 	{ NULL }
 };
diff --git a/source3/rpcclient/cmd_drsuapi.c b/source3/rpcclient/cmd_drsuapi.c
index 8fbd798..b760ce3 100644
--- a/source3/rpcclient/cmd_drsuapi.c
+++ b/source3/rpcclient/cmd_drsuapi.c
@@ -566,8 +566,14 @@ static WERROR cmd_drsuapi_getncchanges(struct rpc_pipe_client *cli,
 struct cmd_set drsuapi_commands[] = {
 
 	{ "DRSUAPI" },
-	{ "dscracknames", RPC_RTYPE_WERROR, NULL, cmd_drsuapi_cracknames, &ndr_table_drsuapi.syntax_id, NULL, "Crack Name", "" },
-	{ "dsgetdcinfo", RPC_RTYPE_WERROR, NULL, cmd_drsuapi_getdcinfo, &ndr_table_drsuapi.syntax_id, NULL, "Get Domain Controller Info", "" },
-	{ "dsgetncchanges", RPC_RTYPE_WERROR, NULL, cmd_drsuapi_getncchanges, &ndr_table_drsuapi.syntax_id, NULL, "Get NC Changes", "" },
+	{ "dscracknames", RPC_RTYPE_WERROR, NULL, cmd_drsuapi_cracknames,
+	  NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION, NULL,
+	  "Crack Name", "" },
+	{ "dsgetdcinfo", RPC_RTYPE_WERROR, NULL, cmd_drsuapi_getdcinfo,
+	  NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION, NULL,
+	  "Get Domain Controller Info", "" },
+	{ "dsgetncchanges", RPC_RTYPE_WERROR, NULL, cmd_drsuapi_getncchanges,
+	  NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION, NULL,
+	  "Get NC Changes", "" },
 	{ NULL }
 };
diff --git a/source3/rpcclient/cmd_dssetup.c b/source3/rpcclient/cmd_dssetup.c
index f2fd124..c8332e6 100644
--- a/source3/rpcclient/cmd_dssetup.c
+++ b/source3/rpcclient/cmd_dssetup.c
@@ -63,7 +63,10 @@ struct cmd_set ds_commands[] = {
 
 	{ "LSARPC-DS" },
 
-	{ "dsroledominfo",   RPC_RTYPE_WERROR, NULL, cmd_ds_dsrole_getprimarydominfo, &ndr_table_dssetup.syntax_id, NULL, "Get Primary Domain Information", "" },
+	{ "dsroledominfo",   RPC_RTYPE_WERROR, NULL,
+	  cmd_ds_dsrole_getprimarydominfo,
+	  NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION, NULL,
+	  "Get Primary Domain Information", "" },
 
 { NULL }
 };
diff --git a/source3/rpcclient/cmd_echo.c b/source3/rpcclient/cmd_echo.c
index d90ef34..846b2d6 100644
--- a/source3/rpcclient/cmd_echo.c
+++ b/source3/rpcclient/cmd_echo.c
@@ -176,9 +176,17 @@ struct cmd_set echo_commands[] = {
 
 	{ "ECHO" },
 
-	{ "echoaddone", RPC_RTYPE_NTSTATUS, cmd_echo_add_one,     NULL, &ndr_table_rpcecho.syntax_id, NULL, "Add one to a number", "" },
-	{ "echodata",   RPC_RTYPE_NTSTATUS, cmd_echo_data,        NULL, &ndr_table_rpcecho.syntax_id, NULL, "Echo data",           "" },
-	{ "sinkdata",   RPC_RTYPE_NTSTATUS, cmd_echo_sink_data,   NULL, &ndr_table_rpcecho.syntax_id, NULL, "Sink data",           "" },
-	{ "sourcedata", RPC_RTYPE_NTSTATUS, cmd_echo_source_data, NULL, &ndr_table_rpcecho.syntax_id, NULL, "Source data",         "" },
+	{ "echoaddone", RPC_RTYPE_NTSTATUS, cmd_echo_add_one,     NULL,
+	  NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION, NULL,
+	  "Add one to a number", "" },
+	{ "echodata",   RPC_RTYPE_NTSTATUS, cmd_echo_data,        NULL,
+	  NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION, NULL,
+	  "Echo data",           "" },
+	{ "sinkdata",   RPC_RTYPE_NTSTATUS, cmd_echo_sink_data,   NULL,
+	  NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION, NULL,
+	  "Sink data",           "" },
+	{ "sourcedata", RPC_RTYPE_NTSTATUS, cmd_echo_source_data, NULL,
+	  NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION, NULL,
+	  "Source data",         "" },
 	{ NULL }
 };
diff --git a/source3/rpcclient/cmd_epmapper.c b/source3/rpcclient/cmd_epmapper.c
index cb33416..89462d7 100644
--- a/source3/rpcclient/cmd_epmapper.c
+++ b/source3/rpcclient/cmd_epmapper.c
@@ -126,8 +126,10 @@ struct cmd_set epmapper_commands[] = {
 	{ "EPMAPPER" },
 
 	{ "epmmap", RPC_RTYPE_NTSTATUS, cmd_epmapper_map,     NULL,
-	  &ndr_table_epmapper.syntax_id, NULL, "Map a binding", "" },
+	  NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION, NULL,
+	  "Map a binding", "" },
 	{ "epmlookup", RPC_RTYPE_NTSTATUS, cmd_epmapper_lookup,     NULL,
-	  &ndr_table_epmapper.syntax_id, NULL, "Lookup bindings", "" },
+	  NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION, NULL,
+	  "Lookup bindings", "" },
 	{ NULL }
 };
diff --git a/source3/rpcclient/cmd_eventlog.c b/source3/rpcclient/cmd_eventlog.c
index d839bf4..94e5bfd 100644
--- a/source3/rpcclient/cmd_eventlog.c
+++ b/source3/rpcclient/cmd_eventlog.c
@@ -491,13 +491,37 @@ static NTSTATUS cmd_eventlog_loginfo(struct rpc_pipe_client *cli,
 
 struct cmd_set eventlog_commands[] = {
 	{ "EVENTLOG" },
-	{ "eventlog_readlog",		RPC_RTYPE_NTSTATUS,	cmd_eventlog_readlog,		NULL,	&ndr_table_eventlog.syntax_id,	NULL,	"Read Eventlog", "" },
-	{ "eventlog_numrecord",		RPC_RTYPE_NTSTATUS,	cmd_eventlog_numrecords,	NULL,	&ndr_table_eventlog.syntax_id,	NULL,	"Get number of records", "" },
-	{ "eventlog_oldestrecord",	RPC_RTYPE_NTSTATUS,	cmd_eventlog_oldestrecord,	NULL,	&ndr_table_eventlog.syntax_id,	NULL,	"Get oldest record", "" },
-	{ "eventlog_reportevent",	RPC_RTYPE_NTSTATUS,	cmd_eventlog_reportevent,	NULL,	&ndr_table_eventlog.syntax_id,	NULL,	"Report event", "" },
-	{ "eventlog_reporteventsource",	RPC_RTYPE_NTSTATUS,	cmd_eventlog_reporteventsource,	NULL,	&ndr_table_eventlog.syntax_id,	NULL,	"Report event and source", "" },
-	{ "eventlog_registerevsource",	RPC_RTYPE_NTSTATUS,	cmd_eventlog_registerevsource,	NULL,	&ndr_table_eventlog.syntax_id,	NULL,	"Register event source", "" },
-	{ "eventlog_backuplog",		RPC_RTYPE_NTSTATUS,	cmd_eventlog_backuplog,		NULL,	&ndr_table_eventlog.syntax_id,	NULL,	"Backup Eventlog File", "" },
-	{ "eventlog_loginfo",		RPC_RTYPE_NTSTATUS,	cmd_eventlog_loginfo,		NULL,	&ndr_table_eventlog.syntax_id,	NULL,	"Get Eventlog Information", "" },
+	{ "eventlog_readlog",		RPC_RTYPE_NTSTATUS,
+	  cmd_eventlog_readlog,		NULL,
+	  NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,	NULL,
+	  "Read Eventlog", "" },
+	{ "eventlog_numrecord",		RPC_RTYPE_NTSTATUS,
+	  cmd_eventlog_numrecords,	NULL,
+	  NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,	NULL,
+	  "Get number of records", "" },
+	{ "eventlog_oldestrecord",	RPC_RTYPE_NTSTATUS,
+	  cmd_eventlog_oldestrecord,	NULL,
+	  NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,	NULL,
+	  "Get oldest record", "" },
+	{ "eventlog_reportevent",	RPC_RTYPE_NTSTATUS,
+	  cmd_eventlog_reportevent,	NULL,
+	  NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,	NULL,
+	  "Report event", "" },
+	{ "eventlog_reporteventsource",	RPC_RTYPE_NTSTATUS,
+	  cmd_eventlog_reporteventsource,	NULL,
+	  NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,	NULL,
+	  "Report event and source", "" },
+	{ "eventlog_registerevsource",	RPC_RTYPE_NTSTATUS,
+	  cmd_eventlog_registerevsource,	NULL,
+	  NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,	NULL,
+	  "Register event source", "" },
+	{ "eventlog_backuplog",		RPC_RTYPE_NTSTATUS,
+	  cmd_eventlog_backuplog,		NULL,
+	  NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,	NULL,
+	  "Backup Eventlog File", "" },
+	{ "eventlog_loginfo",		RPC_RTYPE_NTSTATUS,
+	  cmd_eventlog_loginfo,		NULL,
+	  NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,	NULL,
+	  "Get Eventlog Information", "" },
 	{ NULL }
 };
diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index 45868bf..d86015d 100644
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -1975,38 +1975,98 @@ struct cmd_set lsarpc_commands[] = {
 
 	{ "LSARPC" },
 
-	{ "lsaquery", 	         RPC_RTYPE_NTSTATUS, cmd_lsa_query_info_policy,  NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query info policy",                    "" },
-	{ "lookupsids",          RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_sids,        NULL, &ndr_table_lsarpc.syntax_id, NULL, "Convert SIDs to names",                "" },
-	{ "lookupsids3",         RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_sids3,       NULL, &ndr_table_lsarpc.syntax_id, NULL, "Convert SIDs to names",                "" },
-	{ "lookupnames",         RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names,       NULL, &ndr_table_lsarpc.syntax_id, NULL, "Convert names to SIDs",                "" },
-	{ "lookupnames4",        RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names4,      NULL, &ndr_table_lsarpc.syntax_id, NULL, "Convert names to SIDs",                "" },
-	{ "lookupnames_level",   RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names_level, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Convert names to SIDs",                "" },
-	{ "enumtrust", 	         RPC_RTYPE_NTSTATUS, cmd_lsa_enum_trust_dom,     NULL, &ndr_table_lsarpc.syntax_id, NULL, "Enumerate trusted domains",            "Usage: [preferred max number] [enum context (0)]" },
-	{ "enumprivs", 	         RPC_RTYPE_NTSTATUS, cmd_lsa_enum_privilege,     NULL, &ndr_table_lsarpc.syntax_id, NULL, "Enumerate privileges",                 "" },
-	{ "getdispname",         RPC_RTYPE_NTSTATUS, cmd_lsa_get_dispname,       NULL, &ndr_table_lsarpc.syntax_id, NULL, "Get the privilege name",               "" },
-	{ "lsaenumsid",          RPC_RTYPE_NTSTATUS, cmd_lsa_enum_sids,          NULL, &ndr_table_lsarpc.syntax_id, NULL, "Enumerate the LSA SIDS",               "" },
-	{ "lsacreateaccount",    RPC_RTYPE_NTSTATUS, cmd_lsa_create_account,     NULL, &ndr_table_lsarpc.syntax_id, NULL, "Create a new lsa account",   "" },
-	{ "lsaenumprivsaccount", RPC_RTYPE_NTSTATUS, cmd_lsa_enum_privsaccounts, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Enumerate the privileges of an SID",   "" },
-	{ "lsaenumacctrights",   RPC_RTYPE_NTSTATUS, cmd_lsa_enum_acct_rights,   NULL, &ndr_table_lsarpc.syntax_id, NULL, "Enumerate the rights of an SID",   "" },
-	{ "lsaaddpriv",          RPC_RTYPE_NTSTATUS, cmd_lsa_add_priv,           NULL, &ndr_table_lsarpc.syntax_id, NULL, "Assign a privilege to a SID", "" },
-	{ "lsadelpriv",          RPC_RTYPE_NTSTATUS, cmd_lsa_del_priv,           NULL, &ndr_table_lsarpc.syntax_id, NULL, "Revoke a privilege from a SID", "" },
-	{ "lsaaddacctrights",    RPC_RTYPE_NTSTATUS, cmd_lsa_add_acct_rights,    NULL, &ndr_table_lsarpc.syntax_id, NULL, "Add rights to an account",   "" },
-	{ "lsaremoveacctrights", RPC_RTYPE_NTSTATUS, cmd_lsa_remove_acct_rights, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Remove rights from an account",   "" },
-	{ "lsalookupprivvalue",  RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_priv_value,  NULL, &ndr_table_lsarpc.syntax_id, NULL, "Get a privilege value given its name", "" },
-	{ "lsaquerysecobj",      RPC_RTYPE_NTSTATUS, cmd_lsa_query_secobj,       NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query LSA security object", "" },
-	{ "lsaquerytrustdominfo",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfo, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query LSA trusted domains info (given a SID)", "" },
-	{ "lsaquerytrustdominfobyname",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfobyname, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query LSA trusted domains info (given a name), only works for Windows > 2k", "" },
-	{ "lsaquerytrustdominfobysid",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfobysid, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query LSA trusted domains info (given a SID)", "" },
-	{ "getusername",          RPC_RTYPE_NTSTATUS, cmd_lsa_get_username, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Get username", "" },
-	{ "createsecret",         RPC_RTYPE_NTSTATUS, cmd_lsa_create_secret, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Create Secret", "" },
-	{ "deletesecret",         RPC_RTYPE_NTSTATUS, cmd_lsa_delete_secret, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Delete Secret", "" },
-	{ "querysecret",          RPC_RTYPE_NTSTATUS, cmd_lsa_query_secret, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Query Secret", "" },
-	{ "setsecret",            RPC_RTYPE_NTSTATUS, cmd_lsa_set_secret, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Set Secret", "" },
-	{ "retrieveprivatedata",  RPC_RTYPE_NTSTATUS, cmd_lsa_retrieve_private_data, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Retrieve Private Data", "" },
-	{ "storeprivatedata",     RPC_RTYPE_NTSTATUS, cmd_lsa_store_private_data, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Store Private Data", "" },
-	{ "createtrustdom",       RPC_RTYPE_NTSTATUS, cmd_lsa_create_trusted_domain, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Create Trusted Domain", "" },
-	{ "deletetrustdom",       RPC_RTYPE_NTSTATUS, cmd_lsa_delete_trusted_domain, NULL, &ndr_table_lsarpc.syntax_id, NULL, "Delete Trusted Domain", "" },
-
+	{ "lsaquery", 	         RPC_RTYPE_NTSTATUS, cmd_lsa_query_info_policy,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Query info policy",                    "" },
+	{ "lookupsids",          RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_sids,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Convert SIDs to names",                "" },
+	{ "lookupsids3",         RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_sids3,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Convert SIDs to names",                "" },
+	{ "lookupnames",         RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Convert names to SIDs",                "" },
+	{ "lookupnames4",        RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names4,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Convert names to SIDs",                "" },
+	{ "lookupnames_level",   RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names_level,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Convert names to SIDs",                "" },
+	{ "enumtrust", 	         RPC_RTYPE_NTSTATUS, cmd_lsa_enum_trust_dom,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Enumerate trusted domains",            "Usage: [preferred max number] [enum context (0)]" },
+	{ "enumprivs", 	         RPC_RTYPE_NTSTATUS, cmd_lsa_enum_privilege,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Enumerate privileges",                 "" },
+	{ "getdispname",         RPC_RTYPE_NTSTATUS, cmd_lsa_get_dispname,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Get the privilege name",               "" },
+	{ "lsaenumsid",          RPC_RTYPE_NTSTATUS, cmd_lsa_enum_sids,
+          NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Enumerate the LSA SIDS",               "" },
+	{ "lsacreateaccount",    RPC_RTYPE_NTSTATUS, cmd_lsa_create_account,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Create a new lsa account",   "" },
+	{ "lsaenumprivsaccount", RPC_RTYPE_NTSTATUS, cmd_lsa_enum_privsaccounts,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Enumerate the privileges of an SID",   "" },
+	{ "lsaenumacctrights",   RPC_RTYPE_NTSTATUS, cmd_lsa_enum_acct_rights,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Enumerate the rights of an SID",   "" },
+	{ "lsaaddpriv",          RPC_RTYPE_NTSTATUS, cmd_lsa_add_priv,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Assign a privilege to a SID", "" },
+	{ "lsadelpriv",          RPC_RTYPE_NTSTATUS, cmd_lsa_del_priv,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Revoke a privilege from a SID", "" },
+	{ "lsaaddacctrights",    RPC_RTYPE_NTSTATUS, cmd_lsa_add_acct_rights,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Add rights to an account",   "" },
+	{ "lsaremoveacctrights", RPC_RTYPE_NTSTATUS, cmd_lsa_remove_acct_rights,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Remove rights from an account",   "" },
+	{ "lsalookupprivvalue",  RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_priv_value,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Get a privilege value given its name", "" },
+	{ "lsaquerysecobj",      RPC_RTYPE_NTSTATUS, cmd_lsa_query_secobj,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Query LSA security object", "" },
+	{ "lsaquerytrustdominfo",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfo,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Query LSA trusted domains info (given a SID)", "" },
+	{ "lsaquerytrustdominfobyname",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfobyname,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Query LSA trusted domains info (given a name), only works for Windows > 2k", "" },
+	{ "lsaquerytrustdominfobysid",RPC_RTYPE_NTSTATUS, cmd_lsa_query_trustdominfobysid,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Query LSA trusted domains info (given a SID)", "" },
+	{ "getusername",          RPC_RTYPE_NTSTATUS, cmd_lsa_get_username,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Get username", "" },
+	{ "createsecret",         RPC_RTYPE_NTSTATUS, cmd_lsa_create_secret,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Create Secret", "" },
+	{ "deletesecret",         RPC_RTYPE_NTSTATUS, cmd_lsa_delete_secret,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Delete Secret", "" },
+	{ "querysecret",          RPC_RTYPE_NTSTATUS, cmd_lsa_query_secret,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Query Secret", "" },
+	{ "setsecret",            RPC_RTYPE_NTSTATUS, cmd_lsa_set_secret,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Set Secret", "" },
+	{ "retrieveprivatedata",  RPC_RTYPE_NTSTATUS, cmd_lsa_retrieve_private_data,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Retrieve Private Data", "" },
+	{ "storeprivatedata",     RPC_RTYPE_NTSTATUS, cmd_lsa_store_private_data,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Store Private Data", "" },
+	{ "createtrustdom",       RPC_RTYPE_NTSTATUS, cmd_lsa_create_trusted_domain,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,	  "Create Trusted Domain", "" },
+	{ "deletetrustdom",       RPC_RTYPE_NTSTATUS, cmd_lsa_delete_trusted_domain,
+	  NULL, NDR_LSARPC_UUID, NDR_LSARPC_VERSION, NULL,
+	  "Delete Trusted Domain", "" },
 	{ NULL }
 };
 
diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index 2fbadf2..736668f 100644
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -1156,28 +1156,84 @@ struct cmd_set netlogon_commands[] = {
 
 	{ "NETLOGON" },
 
-	{ "logonctrl2", RPC_RTYPE_WERROR, NULL, cmd_netlogon_logon_ctrl2, &ndr_table_netlogon.syntax_id, NULL, "Logon Control 2",     "" },
-	{ "getanydcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_getanydcname, &ndr_table_netlogon.syntax_id, NULL, "Get trusted DC name",     "" },
-	{ "getdcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_getdcname, &ndr_table_netlogon.syntax_id, NULL, "Get trusted PDC name",     "" },
-	{ "dsr_getdcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcname, &ndr_table_netlogon.syntax_id, NULL, "Get trusted DC name",     "" },
-	{ "dsr_getdcnameex", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcnameex, &ndr_table_netlogon.syntax_id, NULL, "Get trusted DC name",     "" },
-	{ "dsr_getdcnameex2", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcnameex2, &ndr_table_netlogon.syntax_id, NULL, "Get trusted DC name",     "" },
-	{ "dsr_getsitename", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getsitename, &ndr_table_netlogon.syntax_id, NULL, "Get sitename",     "" },
-	{ "dsr_getforesttrustinfo", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getforesttrustinfo, &ndr_table_netlogon.syntax_id, NULL, "Get Forest Trust Info",     "" },
-	{ "logonctrl",  RPC_RTYPE_WERROR, NULL, cmd_netlogon_logon_ctrl, &ndr_table_netlogon.syntax_id, NULL, "Logon Control",       "" },
-	{ "samsync",    RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_sync,    NULL, &ndr_table_netlogon.syntax_id, NULL, "Sam Synchronisation", "" },
-	{ "samdeltas",  RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_deltas,  NULL, &ndr_table_netlogon.syntax_id, NULL, "Query Sam Deltas",    "" },
-	{ "samlogon",   RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_logon,   NULL, &ndr_table_netlogon.syntax_id, NULL, "Sam Logon",           "" },
-	{ "change_trust_pw",   RPC_RTYPE_NTSTATUS, cmd_netlogon_change_trust_pw,   NULL, &ndr_table_netlogon.syntax_id, NULL, "Change Trust Account Password",           "" },
-	{ "gettrustrid", RPC_RTYPE_WERROR, NULL, cmd_netlogon_gettrustrid, &ndr_table_netlogon.syntax_id, NULL, "Get trust rid",     "" },
-	{ "dsr_enumtrustdom", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_enumtrustdom, &ndr_table_netlogon.syntax_id, NULL, "Enumerate trusted domains",     "" },
-	{ "dsenumdomtrusts",  RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_enumtrustdom, &ndr_table_netlogon.syntax_id, NULL, "Enumerate all trusted domains in an AD forest",     "" },
-	{ "deregisterdnsrecords", RPC_RTYPE_WERROR, NULL, cmd_netlogon_deregisterdnsrecords, &ndr_table_netlogon.syntax_id, NULL, "Deregister DNS records",     "" },
-	{ "netrenumtrusteddomains", RPC_RTYPE_WERROR, NULL, cmd_netlogon_enumtrusteddomains, &ndr_table_netlogon.syntax_id, NULL, "Enumerate trusted domains",     "" },
-	{ "netrenumtrusteddomainsex", RPC_RTYPE_WERROR, NULL, cmd_netlogon_enumtrusteddomainsex, &ndr_table_netlogon.syntax_id, NULL, "Enumerate trusted domains",     "" },
-	{ "getdcsitecoverage", RPC_RTYPE_WERROR, NULL, cmd_netlogon_getdcsitecoverage, &ndr_table_netlogon.syntax_id, NULL, "Get the Site-Coverage from a DC",     "" },
-	{ "database_redo", RPC_RTYPE_NTSTATUS, cmd_netlogon_database_redo, NULL, &ndr_table_netlogon.syntax_id, NULL, "Replicate single object from a DC",     "" },
-	{ "capabilities", RPC_RTYPE_NTSTATUS, cmd_netlogon_capabilities, NULL, &ndr_table_netlogon.syntax_id, NULL, "Return Capabilities",     "" },
+	{ "logonctrl2", RPC_RTYPE_WERROR, NULL, cmd_netlogon_logon_ctrl2,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Logon Control 2",     "" },
+	{ "getanydcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_getanydcname,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Get trusted DC name",     "" },
+	{ "getdcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_getdcname,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Get trusted PDC name",     "" },
+	{ "dsr_getdcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcname,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Get trusted DC name",     "" },
+	{ "dsr_getdcnameex", RPC_RTYPE_WERROR, NULL,
+	  cmd_netlogon_dsr_getdcnameex,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Get trusted DC name",     "" },
+	{ "dsr_getdcnameex2", RPC_RTYPE_WERROR, NULL,
+	  cmd_netlogon_dsr_getdcnameex2,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Get trusted DC name",     "" },
+	{ "dsr_getsitename", RPC_RTYPE_WERROR, NULL,
+	  cmd_netlogon_dsr_getsitename,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Get sitename",     "" },
+	{ "dsr_getforesttrustinfo", RPC_RTYPE_WERROR, NULL,
+	  cmd_netlogon_dsr_getforesttrustinfo,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Get Forest Trust Info",     "" },
+	{ "logonctrl",  RPC_RTYPE_WERROR, NULL, cmd_netlogon_logon_ctrl,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Logon Control",       "" },
+	{ "samsync",    RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_sync,    NULL,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Sam Synchronisation", "" },
+	{ "samdeltas",  RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_deltas,  NULL,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Query Sam Deltas",    "" },
+	{ "samlogon",   RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_logon,   NULL,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Sam Logon",           "" },
+	{ "change_trust_pw",   RPC_RTYPE_NTSTATUS,
+	  cmd_netlogon_change_trust_pw,   NULL,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Change Trust Account Password",           "" },
+	{ "gettrustrid", RPC_RTYPE_WERROR, NULL, cmd_netlogon_gettrustrid,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Get trust rid",     "" },
+	{ "dsr_enumtrustdom", RPC_RTYPE_WERROR, NULL,
+	  cmd_netlogon_dsr_enumtrustdom,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Enumerate trusted domains",     "" },
+	{ "dsenumdomtrusts",  RPC_RTYPE_WERROR, NULL,
+	  cmd_netlogon_dsr_enumtrustdom,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Enumerate all trusted domains in an AD forest",     "" },
+	{ "deregisterdnsrecords", RPC_RTYPE_WERROR, NULL,
+	  cmd_netlogon_deregisterdnsrecords,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Deregister DNS records",     "" },
+	{ "netrenumtrusteddomains", RPC_RTYPE_WERROR, NULL,
+	  cmd_netlogon_enumtrusteddomains,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Enumerate trusted domains",     "" },
+	{ "netrenumtrusteddomainsex", RPC_RTYPE_WERROR, NULL,
+	  cmd_netlogon_enumtrusteddomainsex,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Enumerate trusted domains",     "" },
+	{ "getdcsitecoverage", RPC_RTYPE_WERROR, NULL,
+	  cmd_netlogon_getdcsitecoverage,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Get the Site-Coverage from a DC",     "" },
+	{ "database_redo", RPC_RTYPE_NTSTATUS,
+	  cmd_netlogon_database_redo, NULL,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Replicate single object from a DC",     "" },
+	{ "capabilities", RPC_RTYPE_NTSTATUS, cmd_netlogon_capabilities, NULL,
+	  NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION, NULL,
+	  "Return Capabilities",     "" },
 
 	{ NULL }
 };
diff --git a/source3/rpcclient/cmd_ntsvcs.c b/source3/rpcclient/cmd_ntsvcs.c
index a345cdc..8801825 100644
--- a/source3/rpcclient/cmd_ntsvcs.c
+++ b/source3/rpcclient/cmd_ntsvcs.c
@@ -275,12 +275,33 @@ static WERROR cmd_ntsvcs_get_dev_list(struct rpc_pipe_client *cli,
 struct cmd_set ntsvcs_commands[] = {
 
 	{ "NTSVCS" },
-	{ "ntsvcs_getversion", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_version, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS version", "" },
-	{ "ntsvcs_validatedevinst", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_validate_dev_inst, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS device instance", "" },
-	{ "ntsvcs_hwprofflags", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_hw_prof_flags, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS HW prof flags", "" },
-	{ "ntsvcs_hwprofinfo", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_hw_prof_info, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS HW prof info", "" },
-	{ "ntsvcs_getdevregprop", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_dev_reg_prop, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS device registry property", "" },
-	{ "ntsvcs_getdevlistsize", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_dev_list_size, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS device list size", "" },
-	{ "ntsvcs_getdevlist", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_dev_list, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS device list", "" },
+	{ "ntsvcs_getversion", RPC_RTYPE_WERROR, NULL,
+	  cmd_ntsvcs_get_version,
+	  NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION, NULL,
+	  "Query NTSVCS version", "" },
+	{ "ntsvcs_validatedevinst", RPC_RTYPE_WERROR, NULL,
+	  cmd_ntsvcs_validate_dev_inst,
+	  NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION, NULL,
+	  "Query NTSVCS device instance", "" },
+	{ "ntsvcs_hwprofflags", RPC_RTYPE_WERROR, NULL,
+	  cmd_ntsvcs_hw_prof_flags,
+	  NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION, NULL,
+	  "Query NTSVCS HW prof flags", "" },
+	{ "ntsvcs_hwprofinfo", RPC_RTYPE_WERROR, NULL,
+	  cmd_ntsvcs_get_hw_prof_info,
+	  NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION, NULL,
+	  "Query NTSVCS HW prof info", "" },
+	{ "ntsvcs_getdevregprop", RPC_RTYPE_WERROR, NULL,
+	  cmd_ntsvcs_get_dev_reg_prop,
+	  NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION, NULL,
+	  "Query NTSVCS device registry property", "" },
+	{ "ntsvcs_getdevlistsize", RPC_RTYPE_WERROR, NULL,


-- 
Samba Shared Repository


More information about the samba-cvs mailing list