Changeset 596 for trunk/server/source3/auth

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

Location:

trunk/server/source3/auth

Files:

• auth_domain.c (modified) (1 diff)
• auth_netlogond.c (modified) (1 diff)
• auth_ntlmssp.c (modified) (1 diff)
• auth_util.c (modified) (6 diffs)

trunk/server/source3/auth/auth_domain.c

@@ -311 +311 @@
                                                       user_info->wksta_name,      /* workstation name */
                                                       chal,                       /* 8 byte challenge. */
+                                                      3,                          /* validation level */
                                                       user_info->lm_resp,         /* lanman 24 byte response */
                                                       user_info->nt_resp,         /* nt 24 byte response */

trunk/server/source3/auth/auth_netlogond.c

@@ -86 +86 @@
                 user_info->wksta_name,      /* workstation name */
                 (uchar *)auth_context->challenge.data, /* 8 byte challenge. */
+                3,                          /* validation level */
                 user_info->lm_resp,         /* lanman 24 byte response */
                 user_info->nt_resp,         /* nt 24 byte response */

trunk/server/source3/auth/auth_ntlmssp.c

@@ -127 +127 @@
         auth_ntlmssp_state->server_info->nss_token |= username_was_mapped;
 
-        nt_status = create_local_token(auth_ntlmssp_state->server_info);
-
-        if (!NT_STATUS_IS_OK(nt_status)) {
-                DEBUG(10, ("create_local_token failed: %s\n",
-                        nt_errstr(nt_status)));
-                return nt_status;
+        if (auth_ntlmssp_state->server_info->ptok == NULL) {
+                nt_status = create_local_token(auth_ntlmssp_state->server_info);
+                if (!NT_STATUS_IS_OK(nt_status)) {
+                        DEBUG(10, ("create_local_token failed: %s\n",
+                                   nt_errstr(nt_status)));
+                        return nt_status;
+                }
         }
 

trunk/server/source3/auth/auth_util.c

@@ -576 +576 @@
         }
 
-        if ( !(pwd = getpwnam_alloc(result, username)) ) {
+        if ( !(pwd = Get_Pwnam_alloc(result, username)) ) {
                 DEBUG(1, ("User %s in passdb, but getpwnam() fails!\n",
                           pdb_get_username(sampass)));
@@ -904 +904 @@
                  * username and will return the unix_pw info for a guest
                  * user. Use it if it's there, else lookup the *uid details
-                 * using getpwnam_alloc(). See bug #6291 for details. JRA.
+                 * using Get_Pwnam_alloc(). See bug #6291 for details. JRA.
                  */
 
                 /* We must always assign the *uid. */
                 if (sam_acct->unix_pw == NULL) {
-                        struct passwd *pwd = getpwnam_alloc(sam_acct, *found_username );
+                        struct passwd *pwd = Get_Pwnam_alloc(sam_acct, *found_username );
                         if (!pwd) {
-                                DEBUG(10, ("getpwnam_alloc failed for %s\n",
+                                DEBUG(10, ("Get_Pwnam_alloc failed for %s\n",
                                         *found_username));
                                 result = NT_STATUS_NO_SUCH_USER;
@@ -1327 +1327 @@
         NTSTATUS status;
 
-        pwd = getpwnam_alloc(talloc_tos(), username);
+        pwd = Get_Pwnam_alloc(talloc_tos(), username);
         if (pwd == NULL) {
                 return NT_STATUS_NO_SUCH_USER;
@@ -2024 +2024 @@
         if (!pdb_set_pass_last_set_time(
                     sam_account,
-                    nt_time_to_unix(info->pass_last_set_time),
+                    info->pass_last_set_time,
                     PDB_CHANGED)) {
                 TALLOC_FREE(result);
@@ -2032 +2032 @@
         if (!pdb_set_pass_can_change_time(
                     sam_account,
-                    nt_time_to_unix(info->pass_can_change_time),
+                    info->pass_can_change_time,
                     PDB_CHANGED)) {
                 TALLOC_FREE(result);
@@ -2040 +2040 @@
         if (!pdb_set_pass_must_change_time(
                     sam_account,
-                    nt_time_to_unix(info->pass_must_change_time),
+                    info->pass_must_change_time,
                     PDB_CHANGED)) {
                 TALLOC_FREE(result);