diff options
| author | Thorsten Kukuk <kukuk@thkukuk.de> | 2005-09-14 11:51:19 +0000 |
|---|---|---|
| committer | Thorsten Kukuk <kukuk@thkukuk.de> | 2005-09-14 11:51:19 +0000 |
| commit | b8b014230fc40c67028a707a573f382b917793dd (patch) | |
| tree | 6262774102c2c919d64eba46d7b80cb27fa4d670 | |
| parent | bb128fc03aa51b97d925f657c85101da75e9ad05 (diff) | |
| download | pam-b8b014230fc40c67028a707a573f382b917793dd.tar.gz pam-b8b014230fc40c67028a707a573f382b917793dd.tar.bz2 pam-b8b014230fc40c67028a707a573f382b917793dd.zip | |
Relevant BUGIDs: none
Purpose of commit: bugfix
Commit summary:
---------------
Link libpam_misc against libpam
Fix defines in pam_ext.h
Patches from Dmitry V. Levin.
| -rw-r--r-- | libpam/include/security/pam_ext.h | 8 | ||||
| -rw-r--r-- | libpam_misc/Makefile.am | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libpam/include/security/pam_ext.h b/libpam/include/security/pam_ext.h index 92362352..1d0c1985 100644 --- a/libpam/include/security/pam_ext.h +++ b/libpam/include/security/pam_ext.h @@ -52,13 +52,13 @@ extern int PAM_FORMAT((printf, 4, 5)) PAM_NONNULL((1,4)) pam_prompt (const pam_handle_t *pamh, int style, char **response, const char *fmt, ...); -#define pam_error(pamh, fmt, args...) \ - pam_prompt(pamh, PAM_ERROR_MSG, NULL, fmt, args) +#define pam_error(pamh, fmt...) \ + pam_prompt(pamh, PAM_ERROR_MSG, NULL, fmt) #define pam_verror(pamh, fmt, args) \ pam_vprompt(pamh, PAM_ERROR_MSG, NULL, fmt, args) -#define pam_info(pamh, fmt, args...) pam_prompt(pamh, PAM_TEXT_INFO, NULL, fmt, args) -#define pam_vinfo(pamh, fmt, ...) pam_vprompt(pamh, PAM_TEXT_INFO, NULL, fmt, args) +#define pam_info(pamh, fmt...) pam_prompt(pamh, PAM_TEXT_INFO, NULL, fmt) +#define pam_vinfo(pamh, fmt, args) pam_vprompt(pamh, PAM_TEXT_INFO, NULL, fmt, args) #endif diff --git a/libpam_misc/Makefile.am b/libpam_misc/Makefile.am index 25d83b2e..eec75759 100644 --- a/libpam_misc/Makefile.am +++ b/libpam_misc/Makefile.am @@ -15,6 +15,7 @@ libpam_misc_la_LDFLAGS = -no-undefined -version-info 81:0:81 if HAVE_VERSIONING libpam_misc_la_LDFLAGS += -Wl,--version-script=libpam_misc.map endif +libpam_misc_la_LIBADD = $(top_builddir)/libpam/libpam.la lib_LTLIBRARIES = libpam_misc.la |