[SCM] pam wrapper repository - branch master updated
Andreas Schneider
asn at samba.org
Thu Apr 6 06:36:15 UTC 2017
The branch, master has been updated
via b6708f7 cmake: Add Python 3.6 if we look for the python library
via 8efb64e pwrap: Do not discard const value
via 308f344 cmake: Remove unused define
via cccdca5 cmake: Do not check for pam_(v)syslog twice
from 247260d Bump version to 1.0.2
https://git.samba.org/?p=pam_wrapper.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b6708f72588784b5b4c8784df0e1a27817e331d3
Author: Andreas Schneider <asn at samba.org>
Date: Thu Mar 30 08:46:44 2017 +0200
cmake: Add Python 3.6 if we look for the python library
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Jakub Hrozek <jakub.hrozek at posteo.se>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 8efb64e1b307d4ff294042e95ecd33db1f568c7c
Author: Andreas Schneider <asn at samba.org>
Date: Wed Mar 29 16:16:18 2017 +0200
pwrap: Do not discard const value
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Jakub Hrozek <jakub.hrozek at posteo.se>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 308f3442499b57f77435f928d56fdd6b085802cd
Author: Andreas Schneider <asn at samba.org>
Date: Wed Mar 29 15:53:20 2017 +0200
cmake: Remove unused define
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Jakub Hrozek <jakub.hrozek at posteo.se>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit cccdca57f275799ee86e189196f0b2642243c763
Author: Andreas Schneider <asn at samba.org>
Date: Wed Mar 29 15:51:06 2017 +0200
cmake: Do not check for pam_(v)syslog twice
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Jakub Hrozek <jakub.hrozek at posteo.se>
Reviewed-by: Ralph Boehme <slow at samba.org>
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 2 +-
ConfigureChecks.cmake | 5 -----
config.h.cmake | 5 -----
src/pam_wrapper.c | 37 +++++++++++++++++++------------------
4 files changed, 20 insertions(+), 29 deletions(-)
Changeset truncated at 500 lines:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f52edf..f0c950f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,7 @@ set(CMAKE_THREAD_PREFER_PTHREADS ON)
find_package(Threads)
find_package(PythonInterp)
-set(Python_ADDITIONAL_VERSIONS 2.6 2.7 3.3 3.4)
+set(Python_ADDITIONAL_VERSIONS 2.6 2.7 3.3 3.4 3.6)
find_package(PythonLibs)
find_package(PythonSiteLibs)
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index f3383f9..2fdd296 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -46,11 +46,6 @@ check_function_exists(strncpy HAVE_STRNCPY)
check_function_exists(vsnprintf HAVE_VSNPRINTF)
check_function_exists(snprintf HAVE_SNPRINTF)
-set(CMAKE_REQUIRED_LIBRARIES pam)
-check_function_exists(pam_vsyslog HAVE_PAM_VSYSLOG)
-check_function_exists(pam_syslog HAVE_PAM_SYSLOG)
-set(CMAKE_REQUIRED_LIBRARIES)
-
check_prototype_definition(pam_vprompt
"int pam_vprompt(const pam_handle_t *_pamh, int _style, char **_resp, const char *_fmt, va_list _ap)"
"-1"
diff --git a/config.h.cmake b/config.h.cmake
index 9888219..d587f84 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -20,14 +20,9 @@
#cmakedefine HAVE_SECURITY_PAM_MODULES_H 1
#cmakedefine HAVE_SECURITY_PAM_EXT_H 1
#cmakedefine HAVE_OPENPAM ${HAVE_OPENPAM}
-#cmakedefine HAVE_PAM_SYSLOG 1
-#cmakedefine HAVE_PAM_VSYSLOG 1
/*************************** FUNCTIONS ***************************/
-/* Define to 1 if you have the `seteuid' function. */
-#cmakedefine HAVE_SETEUID 1
-
#cmakedefine HAVE_PAM_VSYSLOG 1
#cmakedefine HAVE_PAM_SYSLOG 1
diff --git a/src/pam_wrapper.c b/src/pam_wrapper.c
index bc73f41..168020b 100644
--- a/src/pam_wrapper.c
+++ b/src/pam_wrapper.c
@@ -1203,55 +1203,56 @@ static int pwrap_pam_get_item(const pam_handle_t *pamh,
case PAM_USER:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_get_item PAM_USER=%s",
- (char *) *item);
+ (const char *)*item);
break;
case PAM_SERVICE:
svc = pwrap_get_service((const char *) *item);
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_get_item PAM_SERVICE=%s",
- (char *) svc);
+ svc);
*item = svc;
break;
case PAM_USER_PROMPT:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_get_item PAM_USER_PROMPT=%s",
- (char *) *item);
+ (const char *)*item);
break;
case PAM_TTY:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_get_item PAM_TTY=%s",
- (char *) *item);
+ (const char *)*item);
break;
case PAM_RUSER:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_get_item PAM_RUSER=%s",
- (char *) *item);
+ (const char *)*item);
break;
case PAM_RHOST:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_get_item PAM_RHOST=%s",
- (char *) *item);
+ (const char *)*item);
break;
case PAM_AUTHTOK:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_get_item PAM_AUTHTOK=%s",
- (char *) *item);
+ (const char *)*item);
break;
case PAM_OLDAUTHTOK:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_get_item PAM_OLDAUTHTOK=%s",
- (char *) *item);
+ (const char *)*item);
break;
case PAM_CONV:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_get_item PAM_CONV=%p",
- (void *) *item);
+ (const void *)*item);
break;
default:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_get_item item_type=%d item=%p",
- item_type, (void *) *item);
+ item_type, (const void *)*item);
+ break;
break;
}
} else {
@@ -1280,42 +1281,42 @@ static int pwrap_pam_set_item(pam_handle_t *pamh,
case PAM_USER:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_set_item PAM_USER=%s",
- (char *)item);
+ (const char *)item);
break;
case PAM_SERVICE:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_set_item PAM_SERVICE=%s",
- (char *)item);
+ (const char *)item);
break;
case PAM_USER_PROMPT:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_set_item PAM_USER_PROMPT=%s",
- (char *)item);
+ (const char *)item);
break;
case PAM_TTY:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_set_item PAM_TTY=%s",
- (char *)item);
+ (const char *)item);
break;
case PAM_RUSER:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_set_item PAM_RUSER=%s",
- (char *)item);
+ (const char *)item);
break;
case PAM_RHOST:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_set_item PAM_RHOST=%s",
- (char *)item);
+ (const char *)item);
break;
case PAM_AUTHTOK:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_set_item PAM_AUTHTOK=%s",
- (char *)item);
+ (const char *)item);
break;
case PAM_OLDAUTHTOK:
PWRAP_LOG(PWRAP_LOG_TRACE,
"pwrap_set_item PAM_OLDAUTHTOK=%s",
- (char *)item);
+ (const char *)item);
break;
case PAM_CONV:
PWRAP_LOG(PWRAP_LOG_TRACE,
--
pam wrapper repository
More information about the samba-cvs
mailing list