s3-nltest: add dsgetdc command.

Guenther

diff --git a/source3/lib/netapi/examples/netlogon/nltest.c b/source3/lib/netapi/examples/netlogon/nltest.c
index 9e15085261421adc9fd5aa2089225792549168b3..e3ced90a20006fcff5c17d4b8ff7bad1f7f4d2b5 100644 (file)
--- a/source3/lib/netapi/examples/netlogon/nltest.c
+++ b/source3/lib/netapi/examples/netlogon/nltest.c
@@ -35,7 +35,30 @@ enum {
        OPT_SC_QUERY,
        OPT_SC_RESET,
        OPT_SC_VERIFY,
-       OPT_SC_CHANGE_PWD
+       OPT_SC_CHANGE_PWD,
+       OPT_DSGETDC,
+       OPT_PDC,
+       OPT_DS,
+       OPT_DSP,
+       OPT_GC,
+       OPT_KDC,
+       OPT_TIMESERV,
+       OPT_GTIMESERV,
+       OPT_WS,
+       OPT_NETBIOS,
+       OPT_DNS,
+       OPT_IP,
+       OPT_FORCE,
+       OPT_WRITABLE,
+       OPT_AVOIDSELF,
+       OPT_LDAPONLY,
+       OPT_BACKG,
+       OPT_DS_6,
+       OPT_TRY_NEXT_CLOSEST_SITE,
+       OPT_SITE,
+       OPT_ACCOUNT,
+       OPT_RET_DNS,
+       OPT_RET_NETBIOS
 };
 
 /****************************************************************
@@ -101,6 +124,59 @@ static void print_netlogon_info_result(uint32_t level,
 /****************************************************************
 ****************************************************************/
 
+static void print_dc_info_flags(uint32_t flags)
+{
+       if (flags & DS_PDC_FLAG)
+               printf("PDC ");
+       if (flags & DS_GC_FLAG)
+               printf("GC ");
+       if (flags & DS_DS_FLAG)
+               printf("DS ");
+       if (flags & DS_LDAP_FLAG)
+               printf("LDAP ");
+       if (flags & DS_KDC_FLAG)
+               printf("KDC ");
+       if (flags & DS_TIMESERV_FLAG)
+               printf("TIMESERV ");
+       if (flags & DS_GOOD_TIMESERV_FLAG)
+               printf("GTIMESERV ");
+       if (flags & DS_WRITABLE_FLAG)
+               printf("WRITABLE ");
+       if (flags & DS_DNS_FOREST_FLAG)
+               printf("DNS_FOREST ");
+       if (flags & DS_CLOSEST_FLAG)
+               printf("CLOSE_SITE ");
+       if (flags & DS_FULL_SECRET_DOMAIN_6_FLAG)
+               printf("FULL_SECRET ");
+       /* "WS" */
+       printf("\n");
+}
+
+/****************************************************************
+****************************************************************/
+
+static void print_dc_info(struct DOMAIN_CONTROLLER_INFO *dc_info)
+{
+       if (dc_info->flags) {
+               printf("           DC: %s\n", dc_info->domain_controller_name);
+               printf("      Address: %s\n", dc_info->domain_controller_address);
+/*             printf("     Dom Guid: %s\n", X(domain_guid)); */
+               printf("     Dom Name: %s\n", dc_info->domain_name);
+               printf("  Forest Name: %s\n", dc_info->dns_forest_name);
+               printf(" Dc Site Name: %s\n", dc_info->dc_site_name);
+               printf("Our Site Name: %s\n", dc_info->client_site_name);
+               printf("        Flags: ");
+               print_dc_info_flags(dc_info->flags);
+       } else {
+               printf("           DC: %s\n", dc_info->domain_controller_name);
+               printf("      Address: %s\n", dc_info->domain_controller_address);
+               printf("     Dom Name: %s\n", dc_info->domain_name);
+       }
+}
+
+/****************************************************************
+****************************************************************/
+
 int main(int argc, const char **argv)
 {
        int opt;
@@ -109,8 +185,32 @@ int main(int argc, const char **argv)
        char *opt_server = NULL;
        char *opt_domain = NULL;
        int opt_dbflag = 0;
+       int opt_pdc = 0;
+       int opt_ds = 0;
+       int opt_dsp = 0;
+       int opt_gc = 0;
+       int opt_kdc = 0;
+       int opt_timeserv = 0;
+       int opt_gtimeserv = 0;
+       int opt_ws = 0;
+       int opt_netbios = 0;
+       int opt_dns = 0;
+       int opt_ip = 0;
+       int opt_force = 0;
+       int opt_writable = 0;
+       int opt_avoidself = 0;
+       int opt_ldaponly = 0;
+       int opt_backg = 0;
+       int opt_ds_6 = 0;
+       int opt_try_next_closest_site = 0;
+       char *opt_site = NULL;
+       char *opt_account = NULL;
+       int opt_ret_dns = 0;
+       int opt_ret_netbios = 0;
        uint32_t query_level = 0;
        uint8_t *buffer = NULL;
+       uint32_t flags = 0;
+       struct DOMAIN_CONTROLLER_INFO *dc_info = NULL;
 
        poptContext pc;
        struct poptOption long_options[] = {
@@ -121,6 +221,29 @@ int main(int argc, const char **argv)
                {"sc_reset", 0, POPT_ARG_STRING,   &opt_domain, OPT_SC_RESET, "Reset secure channel for domain on server to dcname", "DOMAIN"},
                {"sc_verify", 0, POPT_ARG_STRING,   &opt_domain, OPT_SC_VERIFY, "Verify secure channel for domain on server", "DOMAIN"},
                {"sc_change_pwd", 0, POPT_ARG_STRING,   &opt_domain, OPT_SC_CHANGE_PWD, "Change a secure channel password for domain on server", "DOMAIN"},
+               {"dsgetdc", 0, POPT_ARG_STRING, &opt_domain, OPT_DSGETDC, "Call DsGetDcName", "DOMAIN"},
+               {"pdc", 0, POPT_ARG_NONE, &opt_pdc, OPT_PDC, NULL},
+               {"ds", 0, POPT_ARG_NONE, &opt_ds, OPT_DS, NULL},
+               {"dsp", 0, POPT_ARG_NONE, &opt_dsp, OPT_DSP, NULL},
+               {"gc", 0, POPT_ARG_NONE, &opt_gc, OPT_GC, NULL},
+               {"kdc", 0, POPT_ARG_NONE, &opt_kdc, OPT_KDC, NULL},
+               {"timeserv", 0, POPT_ARG_NONE, &opt_timeserv, OPT_TIMESERV, NULL},
+               {"gtimeserv", 0, POPT_ARG_NONE, &opt_gtimeserv, OPT_GTIMESERV, NULL},
+               {"ws", 0, POPT_ARG_NONE, &opt_ws, OPT_WS, NULL},
+               {"netbios", 0, POPT_ARG_NONE, &opt_netbios, OPT_NETBIOS, NULL},
+               {"dns", 0, POPT_ARG_NONE, &opt_dns, OPT_DNS, NULL},
+               {"ip", 0, POPT_ARG_NONE, &opt_ip, OPT_IP, NULL},
+               {"force", 0, POPT_ARG_NONE, &opt_force, OPT_FORCE, NULL},
+               {"writable", 0, POPT_ARG_NONE, &opt_writable, OPT_WRITABLE, NULL},
+               {"avoidself", 0, POPT_ARG_NONE, &opt_avoidself, OPT_AVOIDSELF, NULL},
+               {"ldaponly", 0, POPT_ARG_NONE, &opt_ldaponly, OPT_LDAPONLY, NULL},
+               {"backg", 0, POPT_ARG_NONE, &opt_backg, OPT_BACKG, NULL},
+               {"ds_6", 0, POPT_ARG_NONE, &opt_ds_6, OPT_DS_6, NULL},
+               {"try_next_closest_site", 0, POPT_ARG_NONE, &opt_try_next_closest_site, OPT_TRY_NEXT_CLOSEST_SITE, NULL},
+               {"site", 0, POPT_ARG_STRING, &opt_site, OPT_SITE, "SITE"},
+               {"account", 0, POPT_ARG_STRING, &opt_account, OPT_ACCOUNT, "ACCOUNT"},
+               {"ret_dns", 0, POPT_ARG_NONE, &opt_ret_dns, OPT_RET_DNS, NULL},
+               {"ret_netbios", 0, POPT_ARG_NONE, &opt_ret_netbios, OPT_RET_NETBIOS, NULL},
                POPT_COMMON_LIBNETAPI_EXAMPLES
                POPT_TABLEEND
        };
@@ -239,10 +362,65 @@ int main(int argc, const char **argv)
 
                        print_netlogon_info_result(query_level, buffer);
 
+                       break;
+               case OPT_DSGETDC:
+                       if (opt_pdc)
+                               flags |= DS_PDC_REQUIRED;
+                       if (opt_ds)
+                               flags |= DS_DIRECTORY_SERVICE_REQUIRED;
+                       if (opt_dsp)
+                               flags |= DS_DIRECTORY_SERVICE_PREFERRED;
+                       if (opt_kdc)
+                               flags |= DS_KDC_REQUIRED;
+                       if (opt_timeserv)
+                               flags |= DS_TIMESERV_REQUIRED;
+                       if (opt_gtimeserv)
+                               flags |= DS_GOOD_TIMESERV_PREFERRED;
+                       if (opt_ws)
+                               flags |= DS_WEB_SERVICE_REQUIRED;
+                       if (opt_netbios)
+                               flags |= DS_IS_FLAT_NAME;
+                       if (opt_dns)
+                               flags |= DS_IS_DNS_NAME;
+                       if (opt_ip)
+                               flags |= DS_IP_REQUIRED;
+                       if (opt_force)
+                               flags |= DS_FORCE_REDISCOVERY;
+                       if (opt_writable)
+                               flags |= DS_WRITABLE_REQUIRED;
+                       if (opt_avoidself)
+                               flags |= DS_AVOID_SELF;
+                       if (opt_ldaponly)
+                               flags |= DS_ONLY_LDAP_NEEDED;
+                       if (opt_backg)
+                               flags |= DS_BACKGROUND_ONLY;
+                       if (opt_ds_6)
+                               flags |= DS_DIRECTORY_SERVICE_6_REQUIRED;
+                       if (opt_try_next_closest_site)
+                               flags |= DS_TRY_NEXTCLOSEST_SITE;
+                       if (opt_ret_dns)
+                               flags |= DS_RETURN_DNS_NAME;
+                       if (opt_ret_netbios)
+                               flags |= DS_RETURN_FLAT_NAME;
+
+                       status = DsGetDcName(opt_server,
+                                            opt_domain,
+                                            NULL, /* domain_guid */
+                                            opt_site,
+                                            flags,
+                                            &dc_info);
+                       if (status != 0) {
+                               fprintf(stderr, "DsGetDcName failed: Status = %d 0x%x %s\n",
+                                       status, status,
+                                       libnetapi_get_error_string(ctx, status));
+                               goto done;
+                       }
+
+                       print_dc_info(dc_info);
+
                        break;
                default:
-                       poptPrintHelp(pc, stderr, 0);
-                       goto done;
+                       continue;
                }
        }