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

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

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

trunk/server/source3/utils/net_ads.c

@@ -38 +38 @@
 #include "../libcli/security/security.h"
 #include "libsmb/libsmb.h"
+#include "utils/net_dns.h"
 
 #ifdef HAVE_ADS
@@ -1124 +1125 @@
 #if defined(WITH_DNS_UPDATES)
 #include "../lib/addns/dns.h"
-DNS_ERROR DoDNSUpdate(char *pszServerName,
-                      const char *pszDomainName, const char *pszHostName,
-                      const struct sockaddr_storage *sslist,
-                      size_t num_addrs );
-
-static NTSTATUS net_update_dns_internal(TALLOC_CTX *ctx, ADS_STRUCT *ads,
+
+static NTSTATUS net_update_dns_internal(struct net_context *c,
+                                        TALLOC_CTX *ctx, ADS_STRUCT *ads,
                                         const char *machine_name,
                                         const struct sockaddr_storage *addrs,
@@ -1191 +1189 @@
 
                 if ( !NT_STATUS_IS_OK(status) || (ns_count == 0)) {
-                        DEBUG(3,("net_ads_join: Failed to find name server for the %s "
+                        DEBUG(3,("net_update_dns_internal: Failed to find name server for the %s "
                          "realm\n", ads->config.realm));
                         goto done;
@@ -1202 +1200 @@
         for (i=0; i < ns_count; i++) {
 
+                uint32_t flags = DNS_UPDATE_SIGNED |
+                                 DNS_UPDATE_UNSIGNED |
+                                 DNS_UPDATE_UNSIGNED_SUFFICIENT |
+                                 DNS_UPDATE_PROBE |
+                                 DNS_UPDATE_PROBE_SUFFICIENT;
+
+                if (c->opt_force) {
+                        flags &= ~DNS_UPDATE_PROBE_SUFFICIENT;
+                        flags &= ~DNS_UPDATE_UNSIGNED_SUFFICIENT;
+                }
+
+                status = NT_STATUS_UNSUCCESSFUL;
+
                 /* Now perform the dns update - we'll try non-secure and if we fail,
                    we'll follow it up with a secure update */
@@ -1207 +1218 @@
                 fstrcpy( dns_server, nameservers[i].hostname );
 
-                dns_err = DoDNSUpdate(dns_server, dnsdomain, machine_name, addrs, num_addrs);
+                dns_err = DoDNSUpdate(dns_server, dnsdomain, machine_name, addrs, num_addrs, flags);
                 if (ERR_DNS_IS_OK(dns_err)) {
                         status = NT_STATUS_OK;
@@ -1234 +1245 @@
 }
 
-static NTSTATUS net_update_dns_ext(TALLOC_CTX *mem_ctx, ADS_STRUCT *ads,
+static NTSTATUS net_update_dns_ext(struct net_context *c,
+                                   TALLOC_CTX *mem_ctx, ADS_STRUCT *ads,
                                    const char *hostname,
                                    struct sockaddr_storage *iplist,
@@ -1264 +1276 @@
         }
 
-        status = net_update_dns_internal(mem_ctx, ads, machine_name,
+        status = net_update_dns_internal(c, mem_ctx, ads, machine_name,
                                          iplist, num_addrs);
 
@@ -1271 +1283 @@
 }
 
-static NTSTATUS net_update_dns(TALLOC_CTX *mem_ctx, ADS_STRUCT *ads, const char *hostname)
+static NTSTATUS net_update_dns(struct net_context *c, TALLOC_CTX *mem_ctx, ADS_STRUCT *ads, const char *hostname)
 {
         NTSTATUS status;
 
-        status = net_update_dns_ext(mem_ctx, ads, hostname, NULL, 0);
+        status = net_update_dns_ext(c, mem_ctx, ads, hostname, NULL, 0);
         return status;
 }
@@ -1437 +1449 @@
 
         if (r->out.dns_domain_name) {
-                d_printf(_("Joined '%s' to realm '%s'\n"), r->in.machine_name,
+                d_printf(_("Joined '%s' to dns domain '%s'\n"), r->in.machine_name,
                         r->out.dns_domain_name);
         } else {
@@ -1480 +1492 @@
                 }
 
-                if ( !ads_dns || !NT_STATUS_IS_OK(net_update_dns( ctx, ads_dns, NULL)) ) {
+                if ( !ads_dns || !NT_STATUS_IS_OK(net_update_dns(c, ctx, ads_dns, NULL)) ) {
                         d_fprintf( stderr, _("DNS update failed!\n") );
                 }
@@ -1585 +1597 @@
         }
 
-        ntstatus = net_update_dns_ext(ctx, ads, hostname, addrs, num_addrs);
+        ntstatus = net_update_dns_ext(c, ctx, ads, hostname, addrs, num_addrs);
         if (!NT_STATUS_IS_OK(ntstatus)) {
                 d_fprintf( stderr, _("DNS update failed!\n") );
@@ -1605 +1617 @@
 #endif
 }
-
-#if defined(WITH_DNS_UPDATES)
-DNS_ERROR do_gethostbyname(const char *server, const char *host);
-#endif
 
 static int net_ads_dns_gethostbyname(struct net_context *c, int argc, const char **argv)