s3:libsmb: remove unused change_trust_account_password()
[mat/samba.git] / source3 / libsmb / trusts_util.c
index 25f97bb488abc2e38f4b4f59682a7114f55c7df2..8a0e53dbe51bcc1d58d9c64ffcfceeea68f9c79c 100644 (file)
 
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
-#include "../librpc/gen_ndr/cli_lsa.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"
 
 /*********************************************************
  Change the domain password on the PDC.
@@ -51,10 +52,11 @@ NTSTATUS trust_pw_change_and_store_it(struct rpc_pipe_client *cli, TALLOC_CTX *m
        }
 
        /* Create a random machine account password */
-       new_trust_passwd = generate_random_str(mem_ctx, DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
-
+       new_trust_passwd = generate_random_password(mem_ctx,
+                               DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH,
+                               DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
        if (new_trust_passwd == NULL) {
-               DEBUG(0, ("talloc_strdup failed\n"));
+               DEBUG(0, ("generate_random_password failed\n"));
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -133,166 +135,3 @@ NTSTATUS trust_pw_find_change_and_store_it(struct rpc_pipe_client *cli,
                                            sec_channel_type);
 }
 
-/*********************************************************************
- Enumerate the list of trusted domains from a DC
-*********************************************************************/
-
-bool enumerate_domain_trusts( TALLOC_CTX *mem_ctx, const char *domain,
-                                     char ***domain_names, uint32 *num_domains,
-                                    struct dom_sid **sids )
-{
-       struct policy_handle    pol;
-       NTSTATUS        result = NT_STATUS_UNSUCCESSFUL;
-       fstring         dc_name;
-       struct sockaddr_storage dc_ss;
-       uint32          enum_ctx = 0;
-       struct cli_state *cli = NULL;
-       struct rpc_pipe_client *lsa_pipe = NULL;
-       struct lsa_DomainList dom_list;
-       int i;
-
-       *domain_names = NULL;
-       *num_domains = 0;
-       *sids = NULL;
-
-       /* lookup a DC first */
-
-       if ( !get_dc_name(domain, NULL, dc_name, &dc_ss) ) {
-               DEBUG(3,("enumerate_domain_trusts: can't locate a DC for domain %s\n",
-                       domain));
-               return False;
-       }
-
-       /* setup the anonymous connection */
-
-       result = cli_full_connection( &cli, global_myname(), dc_name, &dc_ss, 0, "IPC$", "IPC",
-               "", "", "", 0, Undefined, NULL);
-       if ( !NT_STATUS_IS_OK(result) )
-               goto done;
-
-       /* open the LSARPC_PIPE */
-
-       result = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id,
-                                         &lsa_pipe);
-       if (!NT_STATUS_IS_OK(result)) {
-               goto done;
-       }
-
-       /* get a handle */
-
-       result = rpccli_lsa_open_policy(lsa_pipe, mem_ctx, True,
-               LSA_POLICY_VIEW_LOCAL_INFORMATION, &pol);
-       if ( !NT_STATUS_IS_OK(result) )
-               goto done;
-
-       /* Lookup list of trusted domains */
-
-       result = rpccli_lsa_EnumTrustDom(lsa_pipe, mem_ctx,
-                                        &pol,
-                                        &enum_ctx,
-                                        &dom_list,
-                                        (uint32_t)-1);
-       if ( !NT_STATUS_IS_OK(result) )
-               goto done;
-
-       *num_domains = dom_list.count;
-
-       *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, struct dom_sid, *num_domains);
-       if (!*sids) {
-               result = NT_STATUS_NO_MEMORY;
-               goto done;
-       }
-
-       for (i=0; i< *num_domains; i++) {
-               (*domain_names)[i] = CONST_DISCARD(char *, dom_list.domains[i].name.string);
-               (*sids)[i] = *dom_list.domains[i].sid;
-       }
-
-done:
-       /* cleanup */
-       if (cli) {
-               DEBUG(10,("enumerate_domain_trusts: shutting down connection...\n"));
-               cli_shutdown( cli );
-       }
-
-       return NT_STATUS_IS_OK(result);
-}
-
-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, NULL))) {
-               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;
-}