Changeset 746 for vendor/current/source3/rpc_server/netlogon/srv_netlog_nt.c

Timestamp:

Nov 27, 2012, 4:56:06 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

File:

• vendor/current/source3/rpc_server/netlogon/srv_netlog_nt.c (modified) (8 diffs)

vendor/current/source3/rpc_server/netlogon/srv_netlog_nt.c ¶

@@ -1121 +1121 @@
         }
 
+        become_root();
         status = samr_find_machine_account(mem_ctx,
                                            h,
@@ -1128 +1129 @@
                                            NULL,
                                            &user_handle);
+        unbecome_root();
         if (!NT_STATUS_IS_OK(status)) {
                 goto out;
@@ -1171 +1173 @@
         info->info18 = info18;
 
+        become_root();
         status = dcerpc_samr_SetUserInfo2(h,
                                           mem_ctx,
@@ -1177 +1180 @@
                                           info,
                                           &result);
+        unbecome_root();
         if (!NT_STATUS_IS_OK(status)) {
                 goto out;
@@ -1248 +1252 @@
 {
         NTSTATUS status;
-        struct netlogon_creds_CredentialState *creds;
+        struct netlogon_creds_CredentialState *creds = NULL;
         DATA_BLOB plaintext;
         struct samr_CryptPassword password_buf;
@@ -1262 +1266 @@
 
         if (!NT_STATUS_IS_OK(status)) {
+                const char *computer_name = "<unknown>";
+
+                if (creds && creds->computer_name) {
+                        computer_name = creds->computer_name;
+                }
                 DEBUG(2,("_netr_ServerPasswordSet2: netlogon_creds_server_step "
                         "failed. Rejecting auth request from client %s machine account %s\n",
-                        r->in.computer_name, creds->computer_name));
+                        r->in.computer_name, computer_name));
                 TALLOC_FREE(creds);
                 return status;
@@ -1274 +1283 @@
 
         if (!extract_pw_from_buffer(p->mem_ctx, password_buf.data, &plaintext)) {
+                TALLOC_FREE(creds);
                 return NT_STATUS_WRONG_PASSWORD;
         }
@@ -1284 +1294 @@
                                                    creds->account_name,
                                                    &nt_hash);
+        TALLOC_FREE(creds);
         return status;
 }