hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A few PAM cleanups

Browse Source 
Print header found message only if libraries also found.
Change header guards to pragma once.
Check return value of store_client_password().
This commit is contained in:
Esa Korhonen 2017-08-15 11:16:38 +03:00
parent db8ad7efa8
commit 2784858495
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindPAM.cmake
View File

@ -7,8 +7,8 @@
find_path(PAM_INCLUDE_DIR pam_appl.h PATH_SUFFIXES security)
find_library(PAM_LIBRARIES NAMES pam)
message(STATUS "Found PAM include dirs: ${PAM_INCLUDE_DIR}")
if (PAM_INCLUDE_DIR AND PAM_LIBRARIES)
message(STATUS "Found PAM headers: ${PAM_INCLUDE_DIR}")
message(STATUS "Found PAM: ${PAM_LIBRARIES}")
set(PAM_FOUND TRUE CACHE INTERNAL "")
else()

6
server/modules/authenticator/PAM/PAMAuth/pam_client_session.cc
View File

@ -358,8 +358,10 @@ bool PamClientSession::extract(DCB *dcb, GWBUF *buffer)
break;
case PAM_AUTH_DATA_SENT:
store_client_password(dcb, buffer);
rval = true;
if (store_client_password(dcb, buffer))
{
rval = true;
}
break;
default:

7
server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh
View File

@ -1,3 +1,4 @@
#pragma once
/*
* Copyright (c) 2016 MariaDB Corporation Ab
*
@ -14,9 +15,6 @@
/**
* Common definitions and includes for PAMBackendAuth
*/
#ifndef PAM_BACKEND_AUTH_HH
#define PAM_BACKEND_AUTH_HH
#define MXS_MODULE_NAME "PAMBackendAuth"
#include <maxscale/cppdefs.hh>
@ -24,6 +22,3 @@
#include <maxscale/buffer.h>
#include <maxscale/dcb.h>
#include <maxscale/protocol/mysql.h>
#endif /* PAM_BACKEND_AUTH_HH */

8
server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_session.hh
View File

@ -1,3 +1,4 @@
#pragma once
/*
* Copyright (c) 2016 MariaDB Corporation Ab
*
@ -10,10 +11,6 @@
* of this software will be governed by version 2 or later of the General
* Public License.
*/
#ifndef PAMBACKENDSESSION_HH
#define PAMBACKENDSESSION_HH
#include "pam_backend_auth.hh"
#include <stdint.h>
@ -34,6 +31,3 @@ private:
pam_auth_state m_state; /**< Authentication state*/
uint8_t m_sequence; /**< The next packet seqence number */
};
#endif /* PAMBACKENDSESSION_HH */