svn commit: samba r9844 - in
branches/tmp/RPCREWRITE/source/rpcclient: .
jra at samba.org
jra at samba.org
Wed Aug 31 21:15:05 GMT 2005
Author: jra
Date: 2005-08-31 21:15:04 +0000 (Wed, 31 Aug 2005)
New Revision: 9844
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9844
Log:
Worked out how the new cmd structure should look.
Jeremy
Modified:
branches/tmp/RPCREWRITE/source/rpcclient/cmd_dfs.c
branches/tmp/RPCREWRITE/source/rpcclient/rpcclient.h
Changeset:
Modified: branches/tmp/RPCREWRITE/source/rpcclient/cmd_dfs.c
===================================================================
--- branches/tmp/RPCREWRITE/source/rpcclient/cmd_dfs.c 2005-08-31 21:09:59 UTC (rev 9843)
+++ branches/tmp/RPCREWRITE/source/rpcclient/cmd_dfs.c 2005-08-31 21:15:04 UTC (rev 9844)
@@ -24,7 +24,7 @@
/* Check DFS is supported by the remote server */
-static NTSTATUS cmd_dfs_exist(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+static NTSTATUS cmd_dfs_exist(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
int argc, const char **argv)
{
BOOL dfs_exists;
@@ -35,7 +35,7 @@
return NT_STATUS_OK;
}
- result = cli_dfs_exist(cli, mem_ctx, &dfs_exists);
+ result = rpccli_dfs_exist(cli, mem_ctx, &dfs_exists);
if (NT_STATUS_IS_OK(result))
printf("dfs is %spresent\n", dfs_exists ? "" : "not ");
@@ -43,7 +43,7 @@
return result;
}
-static NTSTATUS cmd_dfs_add(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+static NTSTATUS cmd_dfs_add(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
int argc, const char **argv)
{
NTSTATUS result;
@@ -61,13 +61,13 @@
sharename = argv[3];
comment = argv[4];
- result = cli_dfs_add(cli, mem_ctx, entrypath, servername,
+ result = rpccli_dfs_add(cli, mem_ctx, entrypath, servername,
sharename, comment, flags);
return result;
}
-static NTSTATUS cmd_dfs_remove(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+static NTSTATUS cmd_dfs_remove(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
int argc, const char **argv)
{
NTSTATUS result;
@@ -82,7 +82,7 @@
servername = argv[2];
sharename = argv[3];
- result = cli_dfs_remove(cli, mem_ctx, entrypath, servername,
+ result = rpccli_dfs_remove(cli, mem_ctx, entrypath, servername,
sharename);
return result;
@@ -168,7 +168,7 @@
/* Enumerate dfs shares */
-static NTSTATUS cmd_dfs_enum(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+static NTSTATUS cmd_dfs_enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
int argc, const char **argv)
{
DFS_INFO_CTR ctr;
@@ -183,7 +183,7 @@
if (argc == 2)
info_level = atoi(argv[1]);
- result = cli_dfs_enum(cli, mem_ctx, info_level, &ctr);
+ result = rpccli_dfs_enum(cli, mem_ctx, info_level, &ctr);
if (NT_STATUS_IS_OK(result))
display_dfs_info_ctr(&ctr);
@@ -191,7 +191,7 @@
return result;
}
-static NTSTATUS cmd_dfs_getinfo(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+static NTSTATUS cmd_dfs_getinfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
int argc, const char **argv)
{
NTSTATUS result;
@@ -212,7 +212,7 @@
if (argc == 5)
info_level = atoi(argv[4]);
- result = cli_dfs_get_info(cli, mem_ctx, entrypath, servername,
+ result = rpccli_dfs_get_info(cli, mem_ctx, entrypath, servername,
sharename, info_level, &ctr);
if (NT_STATUS_IS_OK(result))
@@ -227,11 +227,11 @@
{ "DFS" },
- { "dfsexist", RPC_RTYPE_NTSTATUS, cmd_dfs_exist, NULL, PI_NETDFS, "Query DFS support", "" },
- { "dfsadd", RPC_RTYPE_NTSTATUS, cmd_dfs_add, NULL, PI_NETDFS, "Add a DFS share", "" },
- { "dfsremove", RPC_RTYPE_NTSTATUS, cmd_dfs_remove, NULL, PI_NETDFS, "Remove a DFS share", "" },
- { "dfsgetinfo",RPC_RTYPE_NTSTATUS, cmd_dfs_getinfo, NULL, PI_NETDFS, "Query DFS share info", "" },
- { "dfsenum", RPC_RTYPE_NTSTATUS, cmd_dfs_enum, NULL, PI_NETDFS, "Enumerate dfs shares", "" },
+ { "dfsexist", RPC_RTYPE_NTSTATUS, cmd_dfs_exist, NULL, PI_NETDFS, NULL, "Query DFS support", "" },
+ { "dfsadd", RPC_RTYPE_NTSTATUS, cmd_dfs_add, NULL, PI_NETDFS, NULL, "Add a DFS share", "" },
+ { "dfsremove", RPC_RTYPE_NTSTATUS, cmd_dfs_remove, NULL, PI_NETDFS, NULL, "Remove a DFS share", "" },
+ { "dfsgetinfo",RPC_RTYPE_NTSTATUS, cmd_dfs_getinfo, NULL, PI_NETDFS, NULL, "Query DFS share info", "" },
+ { "dfsenum", RPC_RTYPE_NTSTATUS, cmd_dfs_enum, NULL, PI_NETDFS, NULL, "Enumerate dfs shares", "" },
{ NULL }
};
Modified: branches/tmp/RPCREWRITE/source/rpcclient/rpcclient.h
===================================================================
--- branches/tmp/RPCREWRITE/source/rpcclient/rpcclient.h 2005-08-31 21:09:59 UTC (rev 9843)
+++ branches/tmp/RPCREWRITE/source/rpcclient/rpcclient.h 2005-08-31 21:15:04 UTC (rev 9844)
@@ -30,11 +30,12 @@
struct cmd_set {
const char *name;
- RPC_RETURN_TYPE returntype;
- NTSTATUS (*ntfn)(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc,
- const char **argv);
- WERROR (*wfn)(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv);
- int pipe_idx;
+ RPC_RETURN_TYPE returntype;
+ NTSTATUS (*ntfn)(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, int argc,
+ const char **argv);
+ WERROR (*wfn)(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv);
+ int pipe_idx;
+ struct rpc_pipe_client *rpc_pipe;
const char *description;
const char *usage;
};
More information about the samba-cvs
mailing list