Changeset 745 for trunk/server/source3/libsmb/trusts_util.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/libsmb/trusts_util.c (modified) (6 diffs)

trunk/server/source3/libsmb/trusts_util.c

@@ -21 +21 @@
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
-#include "../librpc/gen_ndr/cli_lsa.h"
+#include "../librpc/gen_ndr/ndr_lsa_c.h"
+#include "rpc_client/cli_lsarpc.h"
+#include "rpc_client/cli_netlogon.h"
+#include "rpc_client/cli_pipe.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "secrets.h"
+#include "passdb.h"
+#include "libsmb/libsmb.h"
 
 /*********************************************************
@@ -136 +143 @@
 bool enumerate_domain_trusts( TALLOC_CTX *mem_ctx, const char *domain,
                                      char ***domain_names, uint32 *num_domains,
-                                     DOM_SID **sids )
+                                     struct dom_sid **sids )
 {
         struct policy_handle    pol;
-        NTSTATUS        result = NT_STATUS_UNSUCCESSFUL;
+        NTSTATUS status, result;
         fstring         dc_name;
         struct sockaddr_storage dc_ss;
@@ -145 +152 @@
         struct cli_state *cli = NULL;
         struct rpc_pipe_client *lsa_pipe = NULL;
-        bool            retry;
         struct lsa_DomainList dom_list;
         int i;
+        struct dcerpc_binding_handle *b = NULL;
 
         *domain_names = NULL;
@@ -163 +170 @@
         /* setup the anonymous connection */
 
-        result = cli_full_connection( &cli, global_myname(), dc_name, &dc_ss, 0, "IPC$", "IPC",
-                "", "", "", 0, Undefined, &retry);
-        if ( !NT_STATUS_IS_OK(result) )
+        status = cli_full_connection( &cli, global_myname(), dc_name, &dc_ss, 0, "IPC$", "IPC",
+                "", "", "", 0, Undefined);
+        if ( !NT_STATUS_IS_OK(status) )
                 goto done;
 
         /* open the LSARPC_PIPE */
 
-        result = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id,
+        status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id,
                                           &lsa_pipe);
-        if (!NT_STATUS_IS_OK(result)) {
-                goto done;
-        }
+        if (!NT_STATUS_IS_OK(status)) {
+                goto done;
+        }
+
+        b = lsa_pipe->binding_handle;
 
         /* get a handle */
 
-        result = rpccli_lsa_open_policy(lsa_pipe, mem_ctx, True,
+        status = rpccli_lsa_open_policy(lsa_pipe, mem_ctx, True,
                 LSA_POLICY_VIEW_LOCAL_INFORMATION, &pol);
-        if ( !NT_STATUS_IS_OK(result) )
+        if ( !NT_STATUS_IS_OK(status) )
                 goto done;
 
         /* Lookup list of trusted domains */
 
-        result = rpccli_lsa_EnumTrustDom(lsa_pipe, mem_ctx,
+        status = dcerpc_lsa_EnumTrustDom(b, mem_ctx,
                                          &pol,
                                          &enum_ctx,
                                          &dom_list,
-                                         (uint32_t)-1);
-        if ( !NT_STATUS_IS_OK(result) )
-                goto done;
+                                         (uint32_t)-1,
+                                         &result);
+        if ( !NT_STATUS_IS_OK(status) )
+                goto done;
+        if (!NT_STATUS_IS_OK(result)) {
+                status = result;
+                goto done;
+        }
 
         *num_domains = dom_list.count;
@@ -197 +211 @@
         *domain_names = TALLOC_ZERO_ARRAY(mem_ctx, char *, *num_domains);
         if (!*domain_names) {
-                result = NT_STATUS_NO_MEMORY;
-                goto done;
-        }
-
-        *sids = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, *num_domains);
+                status = NT_STATUS_NO_MEMORY;
+                goto done;
+        }
+
+        *sids = TALLOC_ZERO_ARRAY(mem_ctx, struct dom_sid, *num_domains);
         if (!*sids) {
-                result = NT_STATUS_NO_MEMORY;
+                status = NT_STATUS_NO_MEMORY;
                 goto done;
         }
@@ -219 +233 @@
         }
 
-        return NT_STATUS_IS_OK(result);
+        return NT_STATUS_IS_OK(status);
 }
+
+NTSTATUS change_trust_account_password( const char *domain, const char *remote_machine)
+{
+        NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
+        struct sockaddr_storage pdc_ss;
+        fstring dc_name;
+        struct cli_state *cli = NULL;
+        struct rpc_pipe_client *netlogon_pipe = NULL;
+
+        DEBUG(5,("change_trust_account_password: Attempting to change trust account password in domain %s....\n",
+                domain));
+
+        if (remote_machine == NULL || !strcmp(remote_machine, "*")) {
+                /* Use the PDC *only* for this */
+
+                if ( !get_pdc_ip(domain, &pdc_ss) ) {
+                        DEBUG(0,("Can't get IP for PDC for domain %s\n", domain));
+                        goto failed;
+                }
+
+                if ( !name_status_find( domain, 0x1b, 0x20, &pdc_ss, dc_name) )
+                        goto failed;
+        } else {
+                /* supoport old deprecated "smbpasswd -j DOMAIN -r MACHINE" behavior */
+                fstrcpy( dc_name, remote_machine );
+        }
+
+        /* if this next call fails, then give up.  We can't do
+           password changes on BDC's  --jerry */
+
+        if (!NT_STATUS_IS_OK(cli_full_connection(&cli, global_myname(), dc_name,
+                                           NULL, 0,
+                                           "IPC$", "IPC",
+                                           "", "",
+                                           "", 0, Undefined))) {
+                DEBUG(0,("modify_trust_password: Connection to %s failed!\n", dc_name));
+                nt_status = NT_STATUS_UNSUCCESSFUL;
+                goto failed;
+        }
+
+        /*
+         * Ok - we have an anonymous connection to the IPC$ share.
+         * Now start the NT Domain stuff :-).
+         */
+
+        /* Shouldn't we open this with schannel ? JRA. */
+
+        nt_status = cli_rpc_pipe_open_noauth(
+                cli, &ndr_table_netlogon.syntax_id, &netlogon_pipe);
+        if (!NT_STATUS_IS_OK(nt_status)) {
+                DEBUG(0,("modify_trust_password: unable to open the domain client session to machine %s. Error was : %s.\n",
+                        dc_name, nt_errstr(nt_status)));
+                cli_shutdown(cli);
+                cli = NULL;
+                goto failed;
+        }
+
+        nt_status = trust_pw_find_change_and_store_it(
+                netlogon_pipe, netlogon_pipe, domain);
+
+        cli_shutdown(cli);
+        cli = NULL;
+
+failed:
+        if (!NT_STATUS_IS_OK(nt_status)) {
+                DEBUG(0,("%s : change_trust_account_password: Failed to change password for domain %s.\n",
+                        current_timestring(talloc_tos(), False), domain));
+        }
+        else
+                DEBUG(5,("change_trust_account_password: sucess!\n"));
+
+        return nt_status;
+}