summaryrefslogtreecommitdiff
path: root/libpam
diff options
context:
space:
mode:
Diffstat (limited to 'libpam')
-rw-r--r--libpam/Makefile.am5
-rw-r--r--libpam/pam_item.c6
2 files changed, 6 insertions, 5 deletions
diff --git a/libpam/Makefile.am b/libpam/Makefile.am
index 3c7ae1d6..417ca779 100644
--- a/libpam/Makefile.am
+++ b/libpam/Makefile.am
@@ -20,12 +20,13 @@ include_HEADERS = include/security/_pam_compat.h \
noinst_HEADERS = pam_prelude.h pam_private.h pam_tokens.h \
pam_modutil_private.h pam_static_modules.h
-libpam_la_LDFLAGS = -no-undefined -version-info 83:0:83
+libpam_la_LDFLAGS = -no-undefined -version-info 83:1:83
libpam_la_LIBADD = @LIBAUDIT@ $(LIBPRELUDE_LIBS) @LIBDL@
if STATIC_MODULES
libpam_la_LIBADD += $(shell ls ../modules/pam_*/*.lo) \
- @LIBDB@ @LIBCRYPT@ @LIBNSL@ @LIBCRACK@ -lutil
+ @LIBDB@ @LIBCRYPT@ $(NIS_LIBS) @LIBCRACK@ -lutil
+ AM_CFLAGS += $(NIS_CFLAGS)
endif
if HAVE_VERSIONING
libpam_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpam.map
diff --git a/libpam/pam_item.c b/libpam/pam_item.c
index 29a81ed5..ccd69103 100644
--- a/libpam/pam_item.c
+++ b/libpam/pam_item.c
@@ -274,7 +274,8 @@ int pam_get_user(pam_handle_t *pamh, const char **user, const char *prompt)
{
const char *use_prompt;
int retval;
- struct pam_message msg,*pmsg;
+ struct pam_message msg;
+ const struct pam_message *pmsg;
struct pam_response *resp;
D(("called."));
@@ -340,8 +341,7 @@ int pam_get_user(pam_handle_t *pamh, const char **user, const char *prompt)
resp = NULL;
retval = pamh->pam_conversation->
- conv(1, (const struct pam_message **) &pmsg, &resp,
- pamh->pam_conversation->appdata_ptr);
+ conv(1, &pmsg, &resp, pamh->pam_conversation->appdata_ptr);
if (retval == PAM_CONV_AGAIN) {
/* conversation function is waiting for an event - save state */