s3-spoolss: fix rpcclient after setprinter IDL fixes.

[ira/wip.git] / source3 / rpcclient / cmd_srvsvc.c

diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c
index bea498202aad93f60c1583437eef3e7f739d9e98..866b68111d81380a454debb4c3cf504b06ebfad4 100644 (file)
--- a/source3/rpcclient/cmd_srvsvc.c
+++ b/source3/rpcclient/cmd_srvsvc.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../librpc/gen_ndr/cli_srvsvc.h"
 
 /* Display server query info */
 
@@ -873,58 +874,19 @@ struct cmd_set srvsvc_commands[] = {
 
        { "SRVSVC" },
 
-       { "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", "" },
+       { "srvinfo",     RPC_RTYPE_WERROR, NULL, cmd_srvsvc_srv_query_info, &ndr_table_srvsvc.syntax_id, NULL, "Server query info", "" },
+       { "netshareenum",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_enum, &ndr_table_srvsvc.syntax_id, NULL, "Enumerate shares", "" },
+       { "netshareenumall",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_enum_all, &ndr_table_srvsvc.syntax_id, NULL, "Enumerate all shares", "" },
+       { "netsharegetinfo",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_get_info, &ndr_table_srvsvc.syntax_id, NULL, "Get Share Info", "" },
+       { "netsharesetinfo",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_set_info, &ndr_table_srvsvc.syntax_id, NULL, "Set Share Info", "" },
+       { "netfileenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_enum,  &ndr_table_srvsvc.syntax_id, NULL, "Enumerate open files", "" },
+       { "netremotetod",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_remote_tod, &ndr_table_srvsvc.syntax_id, NULL, "Fetch remote time of day", "" },
+       { "netnamevalidate", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_name_validate, &ndr_table_srvsvc.syntax_id, NULL, "Validate sharename", "" },
+       { "netfilegetsec", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_get_sec, &ndr_table_srvsvc.syntax_id, NULL, "Get File security", "" },
+       { "netsessdel", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_del, &ndr_table_srvsvc.syntax_id, NULL, "Delete Session", "" },
+       { "netsessenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_enum, &ndr_table_srvsvc.syntax_id, NULL, "Enumerate Sessions", "" },
+       { "netdiskenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_disk_enum, &ndr_table_srvsvc.syntax_id, NULL, "Enumerate Disks", "" },
+       { "netconnenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_conn_enum, &ndr_table_srvsvc.syntax_id, NULL, "Enumerate Connections", "" },
 
        { NULL }
 };