summaryrefslogtreecommitdiffstats
path: root/usr.bin/login
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2002-03-05 21:56:25 +0000
committerdes <des@FreeBSD.org>2002-03-05 21:56:25 +0000
commitc0bbe505388a4e77857e16d5140674897ae09504 (patch)
treecc62b963d8403135819c60a86195d97e3510833c /usr.bin/login
parent981ea9e4ae7d27031274dbdfe05bc47acc768b7c (diff)
downloadFreeBSD-src-c0bbe505388a4e77857e16d5140674897ae09504.zip
FreeBSD-src-c0bbe505388a4e77857e16d5140674897ae09504.tar.gz
Switch to OpenPAM. Bump library version. Modules are now versioned, so
applications linked with Linux-PAM will still work. Remove pam_get_pass(); OpenPAM has pam_get_authtok(). Remove pam_prompt(); OpenPAM has pam_{,v}{error,info,prompt}(). Remove pam_set_item(3) man page as OpenPAM has its own. Sponsored by: DARPA, NAI Labs
Diffstat (limited to 'usr.bin/login')
-rw-r--r--usr.bin/login/login.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index b6a6c2b..c821319 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$");
#include <unistd.h>
#include <security/pam_appl.h>
-#include <security/pam_misc.h>
+#include <security/openpam.h>
#include "login.h"
#include "pathnames.h"
@@ -154,7 +154,7 @@ static char *tty;
* PAM data
*/
static pam_handle_t *pamh = NULL;
-static struct pam_conv pamc = { misc_conv, NULL };
+static struct pam_conv pamc = { openpam_ttyconv, NULL };
static int pam_err;
static int pam_silent = PAM_SILENT;
static int pam_cred_established;
@@ -513,7 +513,7 @@ main(int argc, char *argv[])
/*
* We're done with PAM now; our parent will deal with the rest.
*/
- pam_end(pamh, PAM_DATA_SILENT);
+ pam_end(pamh, 0);
pamh = NULL;
/*
OpenPOWER on IntegriCloud