diff options
| author | William Jon McCann <mccann@jhu.edu> | 2007-03-15 14:04:05 -0400 |
|---|---|---|
| committer | William Jon McCann <mccann@jhu.edu> | 2007-03-15 14:04:05 -0400 |
| commit | c40a87c622ac1543dc2d9cdccc651e33affadcfa (patch) | |
| tree | 18aedb180c7456553fa2bb829fc2c120a183d185 | |
| parent | 4a947eddfad4f384bb02c8e4771a59a7ad01cd8b (diff) | |
fix missed pam_syslog change
Also make the configure checks simpler.
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | pam-ck-connector/pam-ck-connector.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 49efb75..5e85b36 100644 --- a/configure.ac +++ b/configure.ac @@ -176,9 +176,8 @@ fi AC_SUBST(HAVE_PAM) AC_SUBST(PAM_LIBS) -AC_CHECK_HEADER(security/pam_modutil.h, [AC_DEFINE(HAVE_PAM_MODUTIL_H, [], "Have pam_modutil.h")]) -AC_CHECK_HEADER(security/pam_ext.h, [AC_DEFINE(HAVE_PAM_EXT_H, [], "Have pam_ext.h")]) -AC_CHECK_LIB(pam, pam_syslog, [AC_DEFINE(HAVE_PAM_SYSLOG, [], "Have pam_syslog")]) +AC_CHECK_HEADERS(security/pam_modutil.h security/pam_ext.h) +AC_CHECK_LIB(pam, pam_syslog, [AC_DEFINE(HAVE_PAM_SYSLOG, [], [Define to 1 if you have the pam_syslog function])]) # Check if we should build the PAM module msg_pam_module=no diff --git a/pam-ck-connector/pam-ck-connector.c b/pam-ck-connector/pam-ck-connector.c index 407e23b..5164c77 100644 --- a/pam-ck-connector/pam-ck-connector.c +++ b/pam-ck-connector/pam-ck-connector.c @@ -53,10 +53,10 @@ #include <security/pam_modules.h> #include <security/_pam_macros.h> -#ifdef HAVE_PAM_MODUTIL_H +#ifdef HAVE_SECURITY_PAM_MODUTIL_H #include <security/pam_modutil.h> #endif -#ifdef HAVE_PAM_EXT_H +#ifdef HAVE_SECURITY_PAM_EXT_H #include <security/pam_ext.h> #endif @@ -146,7 +146,7 @@ _parse_pam_args (const pam_handle_t *pamh, if (strcmp (argv[i] , "debug") == 0) { opt_debug = TRUE; } else { - pam_syslog (pamh, LOG_ERR, "unknown option: %s", argv[i]); + ck_pam_syslog (pamh, LOG_ERR, "unknown option: %s", argv[i]); } } } |