s3: Do not directly reference the ndr_table_* in rpcclient

[samba.git] / source3 / rpcclient / cmd_srvsvc.c

diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c
index 9efd4c979291807d9e3a50af5670b3d032987963..bea498202aad93f60c1583437eef3e7f739d9e98 100644 (file)
--- a/source3/rpcclient/cmd_srvsvc.c
+++ b/source3/rpcclient/cmd_srvsvc.c
@@ -172,7 +172,6 @@ static WERROR cmd_srvsvc_srv_query_info(struct rpc_pipe_client *cli,
        union srvsvc_NetSrvInfo info;
        WERROR result;
        NTSTATUS status;
-       const char *server_name;
 
        if (argc > 2) {
                printf("Usage: %s [infolevel]\n", argv[0]);
@@ -182,12 +181,8 @@ static WERROR cmd_srvsvc_srv_query_info(struct rpc_pipe_client *cli,
        if (argc == 2)
                info_level = atoi(argv[1]);
 
-       server_name = talloc_asprintf_strupper_m(mem_ctx, "\\\\%s",
-                                                cli->desthost);
-       W_ERROR_HAVE_NO_MEMORY(server_name);
-
        status = rpccli_srvsvc_NetSrvGetInfo(cli, mem_ctx,
-                                            server_name,
+                                            cli->srv_name_slash,
                                             info_level,
                                             &info,
                                             &result);
@@ -878,19 +873,58 @@ struct cmd_set srvsvc_commands[] = {
 
        { "SRVSVC" },
 
-       { "srvinfo",     RPC_RTYPE_WERROR, NULL, cmd_srvsvc_srv_query_info, PI_SRVSVC, NULL, "Server query info", "" },
-       { "netshareenum",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_enum, PI_SRVSVC, NULL, "Enumerate shares", "" },
-       { "netshareenumall",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_enum_all, PI_SRVSVC, NULL, "Enumerate all shares", "" },
-       { "netsharegetinfo",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_get_info, PI_SRVSVC, NULL, "Get Share Info", "" },
-       { "netsharesetinfo",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_set_info, PI_SRVSVC, NULL, "Set Share Info", "" },
-       { "netfileenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_enum,  PI_SRVSVC, NULL, "Enumerate open files", "" },
-       { "netremotetod",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_remote_tod, PI_SRVSVC, NULL, "Fetch remote time of day", "" },
-       { "netnamevalidate", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_name_validate, PI_SRVSVC, NULL, "Validate sharename", "" },
-       { "netfilegetsec", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_get_sec, PI_SRVSVC, NULL, "Get File security", "" },
-       { "netsessdel", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_del, PI_SRVSVC, NULL, "Delete Session", "" },
-       { "netsessenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_enum, PI_SRVSVC, NULL, "Enumerate Sessions", "" },
-       { "netdiskenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_disk_enum, PI_SRVSVC, NULL, "Enumerate Disks", "" },
-       { "netconnenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_conn_enum, PI_SRVSVC, NULL, "Enumerate Connections", "" },
+       { "srvinfo",     RPC_RTYPE_WERROR, NULL,
+         cmd_srvsvc_srv_query_info,
+         NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
+         NULL, "Server query info", "" },
+       { "netshareenum",RPC_RTYPE_WERROR, NULL,
+         cmd_srvsvc_net_share_enum,
+         NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION, NULL,
+         "Enumerate shares", "" },
+       { "netshareenumall",RPC_RTYPE_WERROR, NULL,
+         cmd_srvsvc_net_share_enum_all,
+         NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION, NULL,
+         "Enumerate all shares", "" },
+       { "netsharegetinfo",RPC_RTYPE_WERROR, NULL,
+         cmd_srvsvc_net_share_get_info,
+         NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION, NULL,
+         "Get Share Info", "" },
+       { "netsharesetinfo",RPC_RTYPE_WERROR, NULL,
+         cmd_srvsvc_net_share_set_info,
+         NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION, NULL,
+         "Set Share Info", "" },
+       { "netfileenum", RPC_RTYPE_WERROR, NULL,
+         cmd_srvsvc_net_file_enum,
+         NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION, NULL,
+         "Enumerate open files", "" },
+       { "netremotetod",RPC_RTYPE_WERROR, NULL,
+         cmd_srvsvc_net_remote_tod,
+         NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION, NULL,
+         "Fetch remote time of day", "" },
+       { "netnamevalidate", RPC_RTYPE_WERROR, NULL,
+         cmd_srvsvc_net_name_validate,
+         NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION, NULL,
+         "Validate sharename", "" },
+       { "netfilegetsec", RPC_RTYPE_WERROR, NULL,
+         cmd_srvsvc_net_file_get_sec,
+         NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION, NULL,
+         "Get File security", "" },
+       { "netsessdel", RPC_RTYPE_WERROR, NULL,
+         cmd_srvsvc_net_sess_del,
+         NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION, NULL,
+         "Delete Session", "" },
+       { "netsessenum", RPC_RTYPE_WERROR, NULL,
+         cmd_srvsvc_net_sess_enum,
+         NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION, NULL,
+         "Enumerate Sessions", "" },
+       { "netdiskenum", RPC_RTYPE_WERROR, NULL,
+         cmd_srvsvc_net_disk_enum,
+         NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION, NULL,
+         "Enumerate Disks", "" },
+       { "netconnenum", RPC_RTYPE_WERROR, NULL,
+         cmd_srvsvc_net_conn_enum,
+         NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION, NULL,
+         "Enumerate Connections", "" },
 
        { NULL }
 };