Changeset 232 for branches/samba-3.2.x/source/libnet

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/libnet/libnet_join.c (modified) (5 diffs)

branches/samba-3.2.x/source/libnet/libnet_join.c

@@ -762 +762 @@
         status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
                                       pipe_hnd->cli->desthost,
-                                      SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                      SAMR_ACCESS_ENUM_DOMAINS
+                                      | SAMR_ACCESS_OPEN_DOMAIN,
                                       &sam_pol);
         if (!NT_STATUS_IS_OK(status)) {
@@ -770 +771 @@
         status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
                                         &sam_pol,
-                                        SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                        SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1
+                                        | SAMR_DOMAIN_ACCESS_CREATE_USER
+                                        | SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
                                         r->out.domain_sid,
                                         &domain_pol);
@@ -1464 +1467 @@
         }
 
-        if (r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) {
-                saf_store(r->in.domain_name, r->in.dc_name);
-        }
+        if (!(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE)) {
+                return WERR_OK;
+        }
+
+        saf_join_store(r->out.netbios_domain_name, r->in.dc_name);
+        if (r->out.dns_domain_name) {
+                saf_join_store(r->out.dns_domain_name, r->in.dc_name);
+        }
+
+#ifdef WITH_ADS
+        if (r->out.domain_is_ad) {
+                ADS_STATUS ads_status;
+
+                ads_status  = libnet_join_post_processing_ads(mem_ctx, r);
+                if (!ADS_ERR_OK(ads_status)) {
+                        return WERR_GENERAL_FAILURE;
+                }
+        }
+#endif /* WITH_ADS */
 
         return WERR_OK;
@@ -1645 +1664 @@
                                      NULL,
                                      NULL,
+                                     DS_FORCE_REDISCOVERY |
                                      DS_DIRECTORY_SERVICE_REQUIRED |
                                      DS_WRITABLE_REQUIRED |
@@ -1712 +1732 @@
                 goto done;
         }
-
-#ifdef WITH_ADS
-        if (r->out.domain_is_ad) {
-                ads_status  = libnet_join_post_processing_ads(mem_ctx, r);
-                if (!ADS_ERR_OK(ads_status)) {
-                        werr = WERR_GENERAL_FAILURE;
-                        goto done;
-                }
-        }
-#endif /* WITH_ADS */
 
         werr = WERR_OK;