Changeset 228 for branches/samba-3.2.x/source/utils/net_rpc.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/utils/net_rpc.c (modified) (8 diffs)

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

@@ -805 +805 @@
         NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
         POLICY_HND connect_pol, domain_pol, user_pol;
-        uchar pwbuf[516];
         const char *user;
         const char *new_password;
         char *prompt = NULL;
         union samr_UserInfo info;
+        struct samr_CryptPassword crypt_pwd;
 
         if (argc < 1) {
@@ -879 +879 @@
         /* Set password on account */
 
-        encode_pw_buffer(pwbuf, new_password, STR_UNICODE);
-
-        init_samr_user_info24(&info.info24, pwbuf, 24);
-
-        SamOEMhashBlob(info.info24.password.data, 516,
-                       &cli->user_session_key);
+        init_samr_CryptPassword(new_password,
+                                &cli->user_session_key,
+                                &crypt_pwd);
+
+        init_samr_user_info24(&info.info24, &crypt_pwd,
+                              PASS_DONT_CHANGE_AT_NEXT_LOGON);
 
         result = rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx,
@@ -4188 +4188 @@
 }
 
-static bool is_sid_in_token(NT_USER_TOKEN *token, DOM_SID *sid)
-{
-        int i;
-
-        for (i=0; i<token->num_sids; i++) {
-                if (sid_compare(sid, &token->user_sids[i]) == 0)
-                        return True;
-        }
-        return False;
-}
-
 static void add_sid_to_token(NT_USER_TOKEN *token, DOM_SID *sid)
 {
@@ -5213 +5202 @@
         struct initshutdown_String_sub s;
 
-        if (opt_comment) {
+        if (opt_comment && strlen(opt_comment)) {
                 msg = opt_comment;
         }
@@ -5267 +5256 @@
         WERROR werr;
 
-        if (opt_comment) {
+        if (opt_comment && strlen(opt_comment)) {
                 msg = opt_comment;
         }
@@ -5430 +5419 @@
                 struct lsa_BinaryString parameters;
                 const int units_per_week = 168;
-                uchar pwbuf[516];
-
-                encode_pw_buffer(pwbuf, argv[1], STR_UNICODE);
+                struct samr_CryptPassword crypt_pwd;
 
                 ZERO_STRUCT(notime);
@@ -5446 +5433 @@
                 memset(hours.bits, 0xFF, units_per_week);
 
+                init_samr_CryptPassword(argv[1],
+                                        &cli->user_session_key,
+                                        &crypt_pwd);
+
                 init_samr_user_info23(&info.info23,
                                       notime, notime, notime,
@@ -5451 +5442 @@
                                       NULL, NULL, NULL, NULL, NULL,
                                       NULL, NULL, NULL, NULL, &parameters,
-                                      0, 0, ACB_DOMTRUST, SAMR_FIELD_ACCT_FLAGS,
+                                      0, 0, ACB_DOMTRUST,
+                                      SAMR_FIELD_ACCT_FLAGS | SAMR_FIELD_PASSWORD,
                                       hours,
                                       0, 0, 0, 0, 0, 0, 0,
-                                      pwbuf, 24);
-
-                SamOEMhashBlob(info.info23.password.data, 516,
-                               &cli->user_session_key);
+                                      &crypt_pwd);
 
                 result = rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx,