Changeset 745 for trunk/server/source3/utils/net_ads.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/utils/net_ads.c (modified) (23 diffs)

trunk/server/source3/utils/net_ads.c

@@ -23 +23 @@
 #include "includes.h"
 #include "utils/net.h"
+
 #include "librpc/gen_ndr/ndr_krb5pac.h"
-#include "../librpc/gen_ndr/cli_spoolss.h"
+#include "../librpc/gen_ndr/_spoolss.h"
 #include "nsswitch/libwbclient/wbclient.h"
+
+
+
+
+
+
+
+
+
+
+
 
 #ifdef HAVE_ADS
@@ -104 +116 @@
         printf(_("Domain Controller:\t%s\n"), reply.pdc_dns_name);
 
-        printf(_("Pre-Win2k Domain:\t%s\n"), reply.domain);
+        printf(_("Pre-Win2k Domain:\t%s\n"), reply.domain);
         printf(_("Pre-Win2k Hostname:\t%s\n"), reply.pdc_name);
 
@@ -402 +414 @@
         }
 
-        d_printf(_("Workgroup: %s\n"), reply.domain);
+        d_printf(_("Workgroup: %s\n"), reply.domain);
 
         ads_destroy(&ads);
@@ -476 +488 @@
                 ou_str = SMB_STRDUP(c->opt_container);
         } else {
-                ou_str = ads_default_ou_string(ads, WELL_KNOWN_GUID_USERS);
+                ou_str = ads_default_ou_string(ads, );
         }
 
@@ -540 +552 @@
         char *primary_group;
         char *escaped_user;
-        DOM_SID primary_group_sid;
+         primary_group_sid;
         uint32_t group_rid;
         enum wbcSidType type;
@@ -770 +782 @@
                 ou_str = SMB_STRDUP(c->opt_container);
         } else {
-                ou_str = ads_default_ou_string(ads, WELL_KNOWN_GUID_USERS);
+                ou_str = ads_default_ou_string(ads, );
         }
 
@@ -959 +971 @@
         }
 
+
+
+
+
+
+
         werr = libnet_init_UnjoinCtx(ctx, &r);
         if (!W_ERROR_IS_OK(werr)) {
@@ -978 +996 @@
                                   WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE;
         r->in.delete_machine_account = true;
+
 
         werr = libnet_Unjoin(ctx, r);
@@ -1104 +1123 @@
 
 #if defined(WITH_DNS_UPDATES)
-#include "dns.h"
+#include "dns.h"
 DNS_ERROR DoDNSUpdate(char *pszServerName,
                       const char *pszDomainName, const char *pszHostName,
@@ -1116 +1135 @@
 {
         struct dns_rr_ns *nameservers = NULL;
-        int ns_count = 0;
+        int ns_count = 0;
         NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
         DNS_ERROR dns_err;
@@ -1181 +1200 @@
         }
 
-        /* Now perform the dns update - we'll try non-secure and if we fail,
-           we'll follow it up with a secure update */
-
-        fstrcpy( dns_server, nameservers[0].hostname );
-
-        dns_err = DoDNSUpdate(dns_server, dnsdomain, machine_name, addrs, num_addrs);
-        if (!ERR_DNS_IS_OK(dns_err)) {
+        for (i=0; i < ns_count; i++) {
+
+                /* Now perform the dns update - we'll try non-secure and if we fail,
+                   we'll follow it up with a secure update */
+
+                fstrcpy( dns_server, nameservers[i].hostname );
+
+                dns_err = DoDNSUpdate(dns_server, dnsdomain, machine_name, addrs, num_addrs);
+                if (ERR_DNS_IS_OK(dns_err)) {
+                        status = NT_STATUS_OK;
+                        goto done;
+                }
+
+                if (ERR_DNS_EQUAL(dns_err, ERROR_DNS_INVALID_NAME_SERVER) ||
+                    ERR_DNS_EQUAL(dns_err, ERROR_DNS_CONNECTION_FAILED) ||
+                    ERR_DNS_EQUAL(dns_err, ERROR_DNS_SOCKET_ERROR)) {
+                        DEBUG(1,("retrying DNS update with next nameserver after receiving %s\n",
+                                dns_errstr(dns_err)));
+                        continue;
+                }
+
+                d_printf(_("DNS Update for %s failed: %s\n"),
+                        machine_name, dns_errstr(dns_err));
                 status = NT_STATUS_UNSUCCESSFUL;
+
         }
 
@@ -1348 +1384 @@
                 d_fprintf(stderr, _("Please supply a valid domain name\n"));
                 werr = WERR_INVALID_PARAM;
+
+
+
+
+
+
+
                 goto fail;
         }
@@ -1368 +1411 @@
                                   WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE |
                                   WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED;
+
 
         werr = libnet_Join(ctx, r);
+
+
+
+
+
         if (!W_ERROR_IS_OK(werr)) {
                 goto fail;
@@ -1438 +1487 @@
                 ads_destroy(&ads_dns);
         }
+
+
 #endif
 
-done:
         TALLOC_FREE(r);
         TALLOC_FREE( ctx );
@@ -1583 +1633 @@
         err = do_gethostbyname(argv[0], argv[1]);
 
-        d_printf(_("do_gethostbyname returned %d\n"), ERROR_DNS_V(err));
+        d_printf(_("do_gethostbyname returned %s (%d)\n"),
+                dns_errstr(err), ERROR_DNS_V(err));
 #endif
         return 0;
@@ -1783 +1834 @@
                                         c->opt_password ? c->opt_password : "",
                                         CLI_FULL_CONNECTION_USE_KERBEROS,
-                                        Undefined, NULL);
+                                        Undefined);
 
         if (NT_STATUS_IS_ERR(nt_status)) {
-                d_fprintf(stderr, _("Unable to open a connnection to %s to "
+                d_fprintf(stderr, _("Unable to open a connection to %s to "
                                     "obtain data for %s\n"),
                           servername, printername);
@@ -1835 +1886 @@
         nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_spoolss.syntax_id, &pipe_hnd);
         if (!NT_STATUS_IS_OK(nt_status)) {
-                d_fprintf(stderr, _("Unable to open a connnection to the spoolss pipe on %s\n"),
+                d_fprintf(stderr, _("Unable to open a connection to the spoolss pipe on %s\n"),
                          servername);
                 SAFE_FREE(prt_dn);
@@ -2265 +2316 @@
         const char **attrs;
         LDAPMessage *res = NULL;
-        DOM_SID sid;
+         sid;
 
         if (argc < 1 || c->display_usage) {
@@ -2463 +2514 @@
 static int net_ads_kerberos_pac(struct net_context *c, int argc, const char **argv)
 {
-        struct PAC_DATA *pac = NULL;
         struct PAC_LOGON_INFO *info = NULL;
         TALLOC_CTX *mem_ctx = NULL;
@@ -2493 +2543 @@
                                      c->opt_user_name,
                                      c->opt_password,
-                                     0,
+                                     0,
                                      NULL,
                                      NULL,
@@ -2501 +2551 @@
                                      2592000, /* one month */
                                      impersonate_princ_s,
-                                     &pac);
+                                     &);
         if (!NT_STATUS_IS_OK(status)) {
                 d_printf(_("failed to query kerberos PAC: %s\n"),
@@ -2508 +2558 @@
         }
 
-        info = get_logon_info_from_pac(pac);
         if (info) {
                 const char *s;
@@ -2794 +2843 @@
 }
 
+
+
+
+
+
 /* this one shouldn't display a message */
 int net_ads_check(struct net_context *c)