Changeset 733 for branches/samba-3.5.x/source3/rpc_server

Timestamp:

Nov 12, 2012, 5:09:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.13

Location:

branches/samba-3.5.x/source3/rpc_server

Files:

• srv_netlog_nt.c (modified) (4 diffs)
• srv_samr_nt.c (modified) (1 diff)

branches/samba-3.5.x/source3/rpc_server/srv_netlog_nt.c

@@ -978 +978 @@
 {
         NTSTATUS status;
-        struct netlogon_creds_CredentialState *creds;
+        struct netlogon_creds_CredentialState *creds = NULL;
         struct samu *sampass;
         DATA_BLOB plaintext;
@@ -993 +993 @@
 
         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;
@@ -1005 +1011 @@
 
         if (!extract_pw_from_buffer(p->mem_ctx, password_buf.data, &plaintext)) {
+                TALLOC_FREE(creds);
                 return NT_STATUS_WRONG_PASSWORD;
         }
@@ -1013 +1020 @@
                                            creds->account_name,
                                            &sampass);
+        TALLOC_FREE(creds);
         if (!NT_STATUS_IS_OK(status)) {
                 return status;

branches/samba-3.5.x/source3/rpc_server/srv_samr_nt.c

@@ -2878 +2878 @@
 
         must_change_time = pdb_get_pass_must_change_time(pw);
-        if (must_change_time == get_time_t_max()) {
+        if (pdb_is_password_change_time_max(must_change_time)) {
                 unix_to_nt_time_abs(&force_password_change, must_change_time);
         } else {