summaryrefslogtreecommitdiff
path: root/libpam
diff options
context:
space:
mode:
Diffstat (limited to 'libpam')
-rw-r--r--libpam/pam_delay.c2
-rw-r--r--libpam/pam_handlers.c9
-rw-r--r--libpam/pam_second.c11
3 files changed, 14 insertions, 8 deletions
diff --git a/libpam/pam_delay.c b/libpam/pam_delay.c
index 1b8d34fb..553bf72b 100644
--- a/libpam/pam_delay.c
+++ b/libpam/pam_delay.c
@@ -133,7 +133,7 @@ void _pam_await_timer(pam_handle_t *pamh, int status)
int pam_fail_delay(pam_handle_t *pamh, unsigned int usec)
{
- int largest;
+ unsigned int largest;
IF_NO_PAMH("pam_fail_delay", pamh, PAM_SYSTEM_ERR);
diff --git a/libpam/pam_handlers.c b/libpam/pam_handlers.c
index b2065999..8e32f8e8 100644
--- a/libpam/pam_handlers.c
+++ b/libpam/pam_handlers.c
@@ -2,7 +2,7 @@
/*
* created by Marc Ewing.
- * Currently maintained by Andrew G. Morgan <morgan@linux.kernel.org>
+ * Currently maintained by Andrew G. Morgan <morgan@kernel.org>
*
* $Id$
*
@@ -25,12 +25,7 @@
#include "pam_private.h"
-/* FreeBSD doesn't define this */
-#ifndef RTLD_NOW
-# define RTLD_NOW 1
-#endif
-
-/* If not required, define as nothing - FreeBSD needs it to be "_"... */
+/* If not required, define as nothing */
#ifndef SHLIB_SYM_PREFIX
# define SHLIB_SYM_PREFIX ""
#endif
diff --git a/libpam/pam_second.c b/libpam/pam_second.c
index e764f987..31bdc6cb 100644
--- a/libpam/pam_second.c
+++ b/libpam/pam_second.c
@@ -13,6 +13,17 @@
/* p 42 */
+/* XXX - there are actually no plans to support this function. It does
+ not appear to be very well defined */
+
+int pam_authenticate_secondary(pam_handle_t *pamh,
+ char *target_username,
+ char *target_module_type,
+ char *target_authn_domain,
+ char *target_supp_data,
+ unsigned char *target_module_authtok,
+ int flags);
+
int pam_authenticate_secondary(pam_handle_t *pamh,
char *target_username,
char *target_module_type,