Added srvinfo and partial logonctrl and logonctrl2 commands.

diff --git a/source/rpcclient/cmd_netlogon.c b/source/rpcclient/cmd_netlogon.c
index 697cf26be1cba4a40b8699dfd8efeade2b4bd42a..184771a7ad395a2ba406fe900fa22e6063653e4a 100644 (file)
--- a/source/rpcclient/cmd_netlogon.c
+++ b/source/rpcclient/cmd_netlogon.c
@@ -24,9 +24,83 @@
 
 extern int DEBUGLEVEL;
 
+static uint32 cmd_netlogon_logon_ctrl2(struct cli_state *cli, int argc,
+                                      char **argv)
+{
+       uint32 query_level = 1;
+       TALLOC_CTX *mem_ctx;
+       uint32 result = NT_STATUS_UNSUCCESSFUL;
+
+       if (argc > 1) {
+               printf("Usage: %s\n", argv[0]);
+               return 0;
+       }
+
+       if (!(mem_ctx = talloc_init())) {
+               DEBUG(0,("cmd_srvsvc_srv_query_info: talloc_init failed\n"));
+               goto done;
+       }
+
+       /* Initialise RPC connection */
+
+       if (!cli_nt_session_open (cli, PIPE_NETLOGON)) {
+               DEBUG(0, ("Could not initialize srvsvc pipe!\n"));
+               goto done;
+       }
+
+       if ((result = cli_netlogon_logon_ctrl2(cli, mem_ctx, query_level))
+            != NT_STATUS_NOPROBLEMO) {
+               goto done;
+       }
+
+       /* Display results */
+
+ done:
+       return result;
+}
+
+static uint32 cmd_netlogon_logon_ctrl(struct cli_state *cli, int argc,
+                                     char **argv)
+{
+       uint32 query_level = 1;
+       TALLOC_CTX *mem_ctx;
+       uint32 result = NT_STATUS_UNSUCCESSFUL;
+
+       if (argc > 1) {
+               printf("Usage: %s\n", argv[0]);
+               return 0;
+       }
+
+       if (!(mem_ctx = talloc_init())) {
+               DEBUG(0,("cmd_srvsvc_srv_query_info: talloc_init failed\n"));
+               goto done;
+       }
+
+       /* Initialise RPC connection */
+
+       if (!cli_nt_session_open (cli, PIPE_NETLOGON)) {
+               DEBUG(0, ("Could not initialize srvsvc pipe!\n"));
+               goto done;
+       }
+
+#if 0
+       if ((result = cli_netlogon_logon_ctrl(cli, mem_ctx, query_level))
+            != NT_STATUS_NOPROBLEMO) {
+               goto done;
+       }
+#endif
+
+       /* Display results */
+
+ done:
+       return result;
+}
+
 /* List of commands exported by this module */
 
 struct cmd_set netlogon_commands[] = {
-       { "NETLOGON",   NULL,                           "" },
+       { "NETLOGON",   NULL,                     "" },
+       { "logonctrl2", cmd_netlogon_logon_ctrl2, "Logon Control 2" },
+       { "logonctrl",  cmd_netlogon_logon_ctrl,  "Logon Control" },
        { NULL, NULL, NULL }
 };

diff --git a/source/rpcclient/cmd_srvsvc.c b/source/rpcclient/cmd_srvsvc.c
index 636e708a09fd776295c41021241f8612bf162359..b804cc383dba3b0366377518b79e974eff246b53 100644 (file)
--- a/source/rpcclient/cmd_srvsvc.c
+++ b/source/rpcclient/cmd_srvsvc.c
@@ -3,6 +3,8 @@
    Version 2.2
    RPC pipe client
 
+   Copyright (C) Andrew Tridgell 1992-1999
+   Copyright (C) Luke Kenneth Casson Leighton 1996 - 1999
    Copyright (C) Tim Potter 2000
 
    This program is free software; you can redistribute it and/or modify
@@ -24,6 +26,160 @@
 
 extern int DEBUGLEVEL;
 
+/* Display server query info */
+
+static char *get_server_type_str(uint32 type)
+{
+       static fstring typestr;
+       int i;
+
+       if (type == SV_TYPE_ALL) {
+               fstrcpy(typestr, "All");
+               return typestr;
+       }
+               
+       typestr[0] = 0;
+
+       for (i = 0; i < 32; i++) {
+               if (type & (1 << i)) {
+                       switch (1 << i) {
+                       case SV_TYPE_WORKSTATION:
+                               fstrcat(typestr, "Wk ");
+                               break;
+                       case SV_TYPE_SERVER:
+                               fstrcat(typestr, "Sv ");
+                               break;
+                       case SV_TYPE_SQLSERVER:
+                               fstrcat(typestr, "Sql ");
+                               break;
+                       case SV_TYPE_DOMAIN_CTRL:
+                               fstrcat(typestr, "PDC ");
+                               break;
+                       case SV_TYPE_DOMAIN_BAKCTRL:
+                               fstrcat(typestr, "BDC ");
+                               break;
+                       case SV_TYPE_TIME_SOURCE:
+                               fstrcat(typestr, "Tim ");
+                               break;
+                       case SV_TYPE_AFP:
+                               fstrcat(typestr, "AFP ");
+                               break;
+                       case SV_TYPE_NOVELL:
+                               fstrcat(typestr, "Nov ");
+                               break;
+                       case SV_TYPE_DOMAIN_MEMBER:
+                               fstrcat(typestr, "Dom ");
+                               break;
+                       case SV_TYPE_PRINTQ_SERVER:
+                               fstrcat(typestr, "PrQ ");
+                               break;
+                       case SV_TYPE_DIALIN_SERVER:
+                               fstrcat(typestr, "Din ");
+                               break;
+                       case SV_TYPE_SERVER_UNIX:
+                               fstrcat(typestr, "Unx ");
+                               break;
+                       case SV_TYPE_NT:
+                               fstrcat(typestr, "NT ");
+                               break;
+                       case SV_TYPE_WFW:
+                               fstrcat(typestr, "Wfw ");
+                               break;
+                       case SV_TYPE_SERVER_MFPN:
+                               fstrcat(typestr, "Mfp ");
+                               break;
+                       case SV_TYPE_SERVER_NT:
+                               fstrcat(typestr, "SNT ");
+                               break;
+                       case SV_TYPE_POTENTIAL_BROWSER:
+                               fstrcat(typestr, "PtB ");
+                               break;
+                       case SV_TYPE_BACKUP_BROWSER:
+                               fstrcat(typestr, "BMB ");
+                               break;
+                       case SV_TYPE_MASTER_BROWSER:
+                               fstrcat(typestr, "LMB ");
+                               break;
+                       case SV_TYPE_DOMAIN_MASTER:
+                               fstrcat(typestr, "DMB ");
+                               break;
+                       case SV_TYPE_SERVER_OSF:
+                               fstrcat(typestr, "OSF ");
+                               break;
+                       case SV_TYPE_SERVER_VMS:
+                               fstrcat(typestr, "VMS ");
+                               break;
+                       case SV_TYPE_WIN95_PLUS:
+                               fstrcat(typestr, "W95 ");
+                               break;
+                       case SV_TYPE_ALTERNATE_XPORT:
+                               fstrcat(typestr, "Xpt ");
+                               break;
+                       case SV_TYPE_LOCAL_LIST_ONLY:
+                               fstrcat(typestr, "Dom ");
+                               break;
+                       case SV_TYPE_DOMAIN_ENUM:
+                               fstrcat(typestr, "Loc ");
+                               break;
+                       }
+               }
+       }
+
+       i = strlen(typestr) - 1;
+
+       if (typestr[i] == ' ')
+               typestr[i] = 0;
+       
+       return typestr;
+}
+
+static void display_server(char *sname, uint32 type, const char *comment)
+{
+       printf("\t%-15.15s%-20s %s\n", sname, get_server_type_str(type), 
+              comment);
+}
+
+static void display_srv_info_101(SRV_INFO_101 *sv101)
+{
+       fstring name;
+       fstring comment;
+
+       unistr2_to_ascii(name, &sv101->uni_name, sizeof(name) - 1);
+       unistr2_to_ascii(comment, &sv101->uni_comment, sizeof(comment) - 1);
+
+       display_server(name, sv101->srv_type, comment);
+
+       printf("\tplatform_id     :\t%d\n", sv101->platform_id);
+       printf("\tos version      :\t%d.%d\n", sv101->ver_major, 
+              sv101->ver_minor);
+
+       printf("\tserver type     :\t0x%x\n", sv101->srv_type);
+}
+
+static void display_srv_info_102(SRV_INFO_102 *sv102)
+{
+       fstring name;
+       fstring comment;
+       fstring usr_path;
+       
+       unistr2_to_ascii(name, &sv102->uni_name, sizeof(name) - 1);
+       unistr2_to_ascii(comment, &sv102->uni_comment, sizeof(comment) - 1);
+       unistr2_to_ascii(usr_path, &sv102->uni_usr_path, sizeof(usr_path) - 1);
+
+       display_server(name, sv102->srv_type, comment);
+
+       printf("\tplatform_id     :\t%d\n", sv102->platform_id);
+       printf("\tos version      :\t%d.%d\n", sv102->ver_major, 
+              sv102->ver_minor);
+
+       printf("\tusers           :\t%x\n", sv102->users);
+       printf("\tdisc, hidden    :\t%x, %x\n", sv102->disc, sv102->hidden);
+       printf("\tannounce, delta :\t%d, %d\n", sv102->announce, 
+              sv102->ann_delta);
+       printf("\tlicenses        :\t%d\n", sv102->licenses);
+       printf("\tuser path       :\t%s\n", usr_path);
+}
+
 /* Server query info */
 
 static uint32 cmd_srvsvc_srv_query_info(struct cli_state *cli, int argc,
@@ -32,6 +188,7 @@ static uint32 cmd_srvsvc_srv_query_info(struct cli_state *cli, int argc,
        uint32 info_level = 101;
        SRV_INFO_CTR ctr;
        TALLOC_CTX *mem_ctx;
+       uint32 result = NT_STATUS_UNSUCCESSFUL;
 
        if (argc > 2) {
                printf("Usage: %s [infolevel]\n", argv[0]);
@@ -41,12 +198,46 @@ static uint32 cmd_srvsvc_srv_query_info(struct cli_state *cli, int argc,
        if (argc == 2)
                info_level = atoi(argv[1]);
 
-       return 0;
+       if (!(mem_ctx = talloc_init())) {
+               DEBUG(0,("cmd_srvsvc_srv_query_info: talloc_init failed\n"));
+               goto done;
+       }
+
+       /* Initialise RPC connection */
+
+       if (!cli_nt_session_open (cli, PIPE_SRVSVC)) {
+               DEBUG(0, ("Could not initialize srvsvc pipe!\n"));
+               goto done;
+       }
+
+       if ((result = cli_srvsvc_net_srv_get_info(cli, mem_ctx, info_level,
+                                                 &ctr)
+            != NT_STATUS_NOPROBLEMO)) {
+               goto done;
+       }
+
+       /* Display results */
+
+       switch (info_level) {
+       case 101:
+               display_srv_info_101(&ctr.srv.sv101);
+               break;
+       case 102:
+               display_srv_info_102(&ctr.srv.sv102);
+               break;
+       default:
+               printf("unsupported info level %d\n", info_level);
+               break;
+       }
+
+ done:
+       return result;
 }
 
 /* List of commands exported by this module */
 
 struct cmd_set srvsvc_commands[] = {
        { "SRVSVC",     NULL,                       "" },
+       { "srvinfo",    cmd_srvsvc_srv_query_info,  "Server query info" },
        { NULL, NULL, NULL }
 };