Changeset 137 for trunk/samba/source/libnet/libnet_join.c

Timestamp:

Jun 22, 2008, 3:30:02 AM (17 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.0rc2

File:

• trunk/samba/source/libnet/libnet_join.c (modified) (9 diffs)

trunk/samba/source/libnet/libnet_join.c

@@ -690 +690 @@
                 r->out.netbios_domain_name = info->dns.name.string;
                 r->out.dns_domain_name = info->dns.dns_domain.string;
-                r->out.domain_sid = info->dns.sid;
+                r->out.domain_sid = sid_dup_talloc(mem_ctx, info->dns.sid);
+                NT_STATUS_HAVE_NO_MEMORY(r->out.domain_sid);
         }
 
@@ -703 +704 @@
 
                 r->out.netbios_domain_name = info->account_domain.name.string;
-                r->out.domain_sid = info->account_domain.sid;
+                r->out.domain_sid = sid_dup_talloc(mem_ctx, info->account_domain.sid);
+                NT_STATUS_HAVE_NO_MEMORY(r->out.domain_sid);
         }
 
@@ -1115 +1117 @@
         union samr_UserInfo *info = NULL;
 
+        ZERO_STRUCT(sam_pol);
+        ZERO_STRUCT(domain_pol);
+        ZERO_STRUCT(user_pol);
+
         status = cli_full_connection(&cli, NULL,
                                      r->in.dc_name,
@@ -1216 +1222 @@
 done:
         if (pipe_hnd) {
-                rpccli_samr_Close(pipe_hnd, mem_ctx, &domain_pol);
-                rpccli_samr_Close(pipe_hnd, mem_ctx, &sam_pol);
+                if (is_valid_policy_hnd(&domain_pol)) {
+                        rpccli_samr_Close(pipe_hnd, mem_ctx, &domain_pol);
+                }
+                if (is_valid_policy_hnd(&sam_pol)) {
+                        rpccli_samr_Close(pipe_hnd, mem_ctx, &sam_pol);
+                }
                 cli_rpc_pipe_close(pipe_hnd);
         }
@@ -1248 +1258 @@
                 werr = smbconf_set_global_parameter(ctx, "workgroup",
                                                     r->in.domain_name);
+
+                smbconf_delete_global_parameter(ctx, "realm");
                 goto done;
         }
@@ -1321 +1333 @@
         }
 
+        lp_load(get_dyn_CONFIGFILE(),true,false,false,true);
+
         r->out.modified_config = true;
         r->out.result = werr;
@@ -1346 +1360 @@
                 return werr;
         }
+
+        lp_load(get_dyn_CONFIGFILE(),true,false,false,true);
 
         r->out.modified_config = true;
@@ -1717 +1733 @@
 ****************************************************************/
 
+WERROR libnet_join_rollback(TALLOC_CTX *mem_ctx,
+                            struct libnet_JoinCtx *r)
+{
+        WERROR werr;
+        struct libnet_UnjoinCtx *u = NULL;
+
+        werr = libnet_init_UnjoinCtx(mem_ctx, &u);
+        if (!W_ERROR_IS_OK(werr)) {
+                return werr;
+        }
+
+        u->in.debug             = r->in.debug;
+        u->in.dc_name           = r->in.dc_name;
+        u->in.domain_name       = r->in.domain_name;
+        u->in.admin_account     = r->in.admin_account;
+        u->in.admin_password    = r->in.admin_password;
+        u->in.modify_config     = r->in.modify_config;
+        u->in.unjoin_flags      = WKSSVC_JOIN_FLAGS_JOIN_TYPE |
+                                  WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE;
+
+        werr = libnet_Unjoin(mem_ctx, u);
+        TALLOC_FREE(u);
+
+        return werr;
+}
+
+/****************************************************************
+****************************************************************/
+
 WERROR libnet_Join(TALLOC_CTX *mem_ctx,
                    struct libnet_JoinCtx *r)
@@ -1736 +1781 @@
                         goto done;
                 }
-
+        }
+
+        werr = libnet_join_post_processing(mem_ctx, r);
+        if (!W_ERROR_IS_OK(werr)) {
+                goto done;
+        }
+
+        if (r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) {
                 werr = libnet_join_post_verify(mem_ctx, r);
                 if (!W_ERROR_IS_OK(werr)) {
-                        goto done;
-                }
-        }
-
-        werr = libnet_join_post_processing(mem_ctx, r);
-        if (!W_ERROR_IS_OK(werr)) {
-                goto done;
-        }
+                        libnet_join_rollback(mem_ctx, r);
+                }
+        }
+
  done:
         r->out.result = werr;