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.

diff --git a/libpam/include/security/pam_ext.h b/libpam/include/security/pam_ext.h
index 9236235274a61ed32f2a90c5b6ce9638c5f297b7..1d0c1985494cc42ae1d3ea1a7f99859c44043543 100644 (file)
--- 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 25d83b2e6096ba2cc9bf90244fc62c98585c81f4..eec757597b8b78185ecacf7a4b5638ed2ed382b1 100644 (file)
--- 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