Changeset 335 for branches/samba-3.2.x/source/utils

Timestamp:

Sep 24, 2009, 9:15:13 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 to 3.2.14 (final)

Location:

branches/samba-3.2.x/source/utils

Files:

• net_ads.c (modified) (3 diffs)
• net_rpc.c (modified) (1 diff)

branches/samba-3.2.x/source/utils/net_ads.c

@@ -836 +836 @@
         r->in.admin_password    = net_prompt_pass(opt_user_name);
         r->in.modify_config     = lp_config_backend_is_registry();
+
+        /* Try to delete it, but if that fails, disable it.  The
+           WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE really means "disable */
         r->in.unjoin_flags      = WKSSVC_JOIN_FLAGS_JOIN_TYPE |
                                   WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE;
+        r->in.delete_machine_account = true;
 
         werr = libnet_Unjoin(ctx, r);
@@ -847 +851 @@
         }
 
-        if (W_ERROR_IS_OK(werr)) {
+        if (r->out.deleted_machine_account) {
                 d_printf("Deleted account for '%s' in realm '%s'\n",
                         r->in.machine_name, r->out.dns_domain_name);
@@ -861 +865 @@
         }
 
-        d_fprintf(stderr, "Failed to disable machine account for '%s' in realm '%s'\n",
+        /* Based on what we requseted, we shouldn't get here, but if
+           we did, it means the secrets were removed, and therefore
+           we have left the domain */
+        d_fprintf(stderr, "Machine '%s' Left domain '%s'\n",
                   r->in.machine_name, r->out.dns_domain_name);
 

branches/samba-3.2.x/source/utils/net_rpc.c

@@ -5939 +5939 @@
         union lsa_TrustedDomainInfo *info = NULL;
         char *cleartextpwd = NULL;
-        DATA_BLOB data;
+        DATA_BLOB data = data_blob_null;
 
         nt_status = rpccli_lsa_QueryTrustedDomainInfoBySid(pipe_hnd, mem_ctx,