Changeset 989 for vendor/current/source3/libnet

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/source3/libnet/libnet_join.c (modified) (6 diffs)

vendor/current/source3/libnet/libnet_join.c

@@ -464 +464 @@
         char *spn = NULL;
         bool ok;
+        const char **netbios_aliases = NULL;
 
         /* Find our DN */
@@ -522 +523 @@
                                 return ADS_ERROR_LDAP(LDAP_NO_MEMORY);
                         }
+                }
+        }
+
+        netbios_aliases = lp_netbios_aliases();
+        if (netbios_aliases != NULL) {
+                for (; *netbios_aliases != NULL; netbios_aliases++) {
+                        /*
+                         * Add HOST/NETBIOSNAME
+                         */
+                        spn = talloc_asprintf(mem_ctx, "HOST/%s", *netbios_aliases);
+                        if (spn == NULL) {
+                                TALLOC_FREE(spn);
+                                return ADS_ERROR_LDAP(LDAP_NO_MEMORY);
+                        }
+                        if (!strupper_m(spn)) {
+                                TALLOC_FREE(spn);
+                                return ADS_ERROR_LDAP(LDAP_NO_MEMORY);
+                        }
+
+                        ok = ads_element_in_array(spn_array, num_spns, spn);
+                        if (ok) {
+                                TALLOC_FREE(spn);
+                                continue;
+                        }
+                        ok = add_string_to_array(spn_array, spn,
+                                                 &spn_array, &num_spns);
+                        if (!ok) {
+                                TALLOC_FREE(spn);
+                                return ADS_ERROR_LDAP(LDAP_NO_MEMORY);
+                        }
+                        TALLOC_FREE(spn);
+
+                        /*
+                         * Add HOST/netbiosname.domainname
+                         */
+                        if (r->out.dns_domain_name == NULL) {
+                                continue;
+                        }
+                        fstr_sprintf(my_fqdn, "%s.%s",
+                                     *netbios_aliases,
+                                     r->out.dns_domain_name);
+
+                        spn = talloc_asprintf(mem_ctx, "HOST/%s", my_fqdn);
+                        if (spn == NULL) {
+                                return ADS_ERROR_LDAP(LDAP_NO_MEMORY);
+                        }
+
+                        ok = ads_element_in_array(spn_array, num_spns, spn);
+                        if (ok) {
+                                TALLOC_FREE(spn);
+                                continue;
+                        }
+                        ok = add_string_to_array(spn_array, spn,
+                                                 &spn_array, &num_spns);
+                        if (!ok) {
+                                TALLOC_FREE(spn);
+                                return ADS_ERROR_LDAP(LDAP_NO_MEMORY);
+                        }
+                        TALLOC_FREE(spn);
                 }
         }
@@ -2244 +2304 @@
         bool valid_workgroup = false;
         bool valid_realm = false;
+        bool ignored_realm = false;
 
         /* check if configuration is already set correctly */
@@ -2263 +2324 @@
                         switch (lp_security()) {
                         case SEC_DOMAIN:
+                                if (!valid_realm && lp_winbind_rpc_only()) {
+                                        valid_realm = true;
+                                        ignored_realm = true;
+                                }
                         case SEC_ADS:
                                 valid_security = true;
@@ -2268 +2333 @@
 
                         if (valid_workgroup && valid_realm && valid_security) {
+                                if (ignored_realm && !r->in.modify_config)
+                                {
+                                        libnet_join_set_error_string(mem_ctx, r,
+                                                "Warning: ignoring realm when "
+                                                "joining AD domain with "
+                                                "'security=domain' and "
+                                                "'winbind rpc only = yes'. "
+                                                "(realm set to '%s', "
+                                                "should be '%s').", lp_realm(),
+                                                r->out.dns_domain_name);
+                                }
                                 /* nothing to be done */
                                 return WERR_OK;
@@ -2441 +2517 @@
         create_local_private_krb5_conf_for_domain(
                 r->out.dns_domain_name, r->out.netbios_domain_name,
-                NULL, smbXcli_conn_remote_sockaddr(cli->conn));
+                sitename, smbXcli_conn_remote_sockaddr(cli->conn));
 
         if (r->out.domain_is_ad &&