Changeset 165 for branches/samba-3.0/source/libsmb/trusts_util.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/libsmb/trusts_util.c (modified) (3 diffs)

branches/samba-3.0/source/libsmb/trusts_util.c

@@ -33 +33 @@
 static NTSTATUS just_change_the_password(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, 
                                          const unsigned char orig_trust_passwd_hash[16],
+                                         const char *new_trust_pwd_cleartext,
                                          const unsigned char new_trust_passwd_hash[16],
                                          uint32 sec_channel_type)
 {
         NTSTATUS result;
-
-        /* Check if the netlogon pipe is open using schannel. If so we
-           already have valid creds. If not we must set them up. */
-
-        if (cli->auth.auth_type != PIPE_AUTH_TYPE_SCHANNEL) {
-                uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
-
-                result = rpccli_netlogon_setup_creds(cli, 
+        uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
+
+        result = rpccli_netlogon_setup_creds(cli,
                                         cli->cli->desthost, /* server name */
                                         lp_workgroup(), /* domain */
@@ -53 +49 @@
                                         &neg_flags);
 
-                if (!NT_STATUS_IS_OK(result)) {
-                        DEBUG(3,("just_change_the_password: unable to setup creds (%s)!\n",
-                                 nt_errstr(result)));
-                        return result;
-                }
-        }
-
-        result = rpccli_net_srv_pwset(cli, mem_ctx, global_myname(), new_trust_passwd_hash);
+        if (!NT_STATUS_IS_OK(result)) {
+                DEBUG(3,("just_change_the_password: unable to setup creds (%s)!\n",
+                         nt_errstr(result)));
+                return result;
+        }
+
+        if (neg_flags & NETLOGON_NEG_PASSWORD_SET2) {
+                result = rpccli_net_srv_pwset2(cli, mem_ctx, global_myname(),
+                                               new_trust_pwd_cleartext);
+        } else {
+                result = rpccli_net_srv_pwset(cli, mem_ctx, global_myname(),
+                                              new_trust_passwd_hash);
+        }
 
         if (!NT_STATUS_IS_OK(result)) {
@@ -96 +97 @@
 
         nt_status = just_change_the_password(cli, mem_ctx, orig_trust_passwd_hash,
+                                             new_trust_passwd,
                                              new_trust_passwd_hash, sec_channel_type);