Fix nonempty blank lines in vfs_gpfs.c

[abartlet/samba.git/.git] / source3 / auth / auth_ntlmssp.c

diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index 742be2156f97346e44ffb24a87cf8f9227427f6b..0d46b14f97e54f1e560c7f2216d45c13905fc5e6 100644 (file)
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -39,7 +39,7 @@ static const uint8 *auth_ntlmssp_get_challenge(const struct ntlmssp_state *ntlms
  *
  * @return If the effective challenge used by the auth subsystem may be modified
  */
-static BOOL auth_ntlmssp_may_set_challenge(const struct ntlmssp_state *ntlmssp_state)
+static bool auth_ntlmssp_may_set_challenge(const struct ntlmssp_state *ntlmssp_state)
 {
        AUTH_NTLMSSP_STATE *auth_ntlmssp_state =
                (AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context;
@@ -83,7 +83,7 @@ static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state,
                (AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context;
        auth_usersupplied_info *user_info = NULL;
        NTSTATUS nt_status;
-       BOOL username_was_mapped;
+       bool username_was_mapped;
 
        /* the client has given us its machine name (which we otherwise would not get on port 445).
           we need to possibly reload smb.conf if smb.conf includes depend on the machine name */
@@ -122,12 +122,13 @@ static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state,
                return nt_status;
        }
 
-       auth_ntlmssp_state->server_info->was_mapped |= username_was_mapped;
+       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\n"));
+               DEBUG(10, ("create_local_token failed: %s\n",
+                       nt_errstr(nt_status)));
                return nt_status;
        }
 
@@ -186,8 +187,13 @@ NTSTATUS auth_ntlmssp_start(AUTH_NTLMSSP_STATE **auth_ntlmssp_state)
 
 void auth_ntlmssp_end(AUTH_NTLMSSP_STATE **auth_ntlmssp_state)
 {
-       TALLOC_CTX *mem_ctx = (*auth_ntlmssp_state)->mem_ctx;
+       TALLOC_CTX *mem_ctx;
+
+       if (*auth_ntlmssp_state == NULL) {
+               return;
+       }
 
+       mem_ctx = (*auth_ntlmssp_state)->mem_ctx;
        if ((*auth_ntlmssp_state)->ntlmssp_state) {
                ntlmssp_end(&(*auth_ntlmssp_state)->ntlmssp_state);
        }