[Midnightbsd-cvs] src [10655] trunk/lib/libpam/modules/pam_unix/pam_unix.c: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jun 9 15:26:00 EDT 2018
Revision: 10655
http://svnweb.midnightbsd.org/src/?rev=10655
Author: laffer1
Date: 2018-06-09 15:25:59 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/lib/libpam/Makefile.inc
trunk/lib/libpam/libpam/Makefile
trunk/lib/libpam/libpam/pam_debug_log.c
trunk/lib/libpam/libpam/pam_std_option.c
trunk/lib/libpam/libpam/security/pam_mod_misc.h
trunk/lib/libpam/modules/Makefile
trunk/lib/libpam/modules/Makefile.inc
trunk/lib/libpam/modules/modules.inc
trunk/lib/libpam/modules/pam_chroot/Makefile
trunk/lib/libpam/modules/pam_chroot/pam_chroot.8
trunk/lib/libpam/modules/pam_chroot/pam_chroot.c
trunk/lib/libpam/modules/pam_deny/Makefile
trunk/lib/libpam/modules/pam_deny/pam_deny.8
trunk/lib/libpam/modules/pam_deny/pam_deny.c
trunk/lib/libpam/modules/pam_echo/Makefile
trunk/lib/libpam/modules/pam_echo/pam_echo.8
trunk/lib/libpam/modules/pam_echo/pam_echo.c
trunk/lib/libpam/modules/pam_exec/Makefile
trunk/lib/libpam/modules/pam_exec/pam_exec.8
trunk/lib/libpam/modules/pam_exec/pam_exec.c
trunk/lib/libpam/modules/pam_ftpusers/Makefile
trunk/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8
trunk/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
trunk/lib/libpam/modules/pam_group/Makefile
trunk/lib/libpam/modules/pam_group/pam_group.8
trunk/lib/libpam/modules/pam_group/pam_group.c
trunk/lib/libpam/modules/pam_guest/Makefile
trunk/lib/libpam/modules/pam_guest/pam_guest.8
trunk/lib/libpam/modules/pam_guest/pam_guest.c
trunk/lib/libpam/modules/pam_krb5/Makefile
trunk/lib/libpam/modules/pam_krb5/pam_krb5.8
trunk/lib/libpam/modules/pam_krb5/pam_krb5.c
trunk/lib/libpam/modules/pam_ksu/Makefile
trunk/lib/libpam/modules/pam_ksu/pam_ksu.8
trunk/lib/libpam/modules/pam_ksu/pam_ksu.c
trunk/lib/libpam/modules/pam_lastlog/Makefile
trunk/lib/libpam/modules/pam_lastlog/pam_lastlog.8
trunk/lib/libpam/modules/pam_lastlog/pam_lastlog.c
trunk/lib/libpam/modules/pam_login_access/Makefile
trunk/lib/libpam/modules/pam_login_access/login.access.5
trunk/lib/libpam/modules/pam_login_access/login_access.c
trunk/lib/libpam/modules/pam_login_access/pam_login_access.8
trunk/lib/libpam/modules/pam_login_access/pam_login_access.c
trunk/lib/libpam/modules/pam_login_access/pam_login_access.h
trunk/lib/libpam/modules/pam_nologin/Makefile
trunk/lib/libpam/modules/pam_nologin/pam_nologin.8
trunk/lib/libpam/modules/pam_nologin/pam_nologin.c
trunk/lib/libpam/modules/pam_opie/Makefile
trunk/lib/libpam/modules/pam_opie/pam_opie.8
trunk/lib/libpam/modules/pam_opie/pam_opie.c
trunk/lib/libpam/modules/pam_opieaccess/Makefile
trunk/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8
trunk/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c
trunk/lib/libpam/modules/pam_passwdqc/Makefile
trunk/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
trunk/lib/libpam/modules/pam_permit/Makefile
trunk/lib/libpam/modules/pam_permit/pam_permit.8
trunk/lib/libpam/modules/pam_permit/pam_permit.c
trunk/lib/libpam/modules/pam_radius/Makefile
trunk/lib/libpam/modules/pam_radius/pam_radius.8
trunk/lib/libpam/modules/pam_radius/pam_radius.c
trunk/lib/libpam/modules/pam_rhosts/Makefile
trunk/lib/libpam/modules/pam_rhosts/pam_rhosts.8
trunk/lib/libpam/modules/pam_rhosts/pam_rhosts.c
trunk/lib/libpam/modules/pam_rootok/Makefile
trunk/lib/libpam/modules/pam_rootok/pam_rootok.8
trunk/lib/libpam/modules/pam_rootok/pam_rootok.c
trunk/lib/libpam/modules/pam_securetty/Makefile
trunk/lib/libpam/modules/pam_securetty/pam_securetty.8
trunk/lib/libpam/modules/pam_securetty/pam_securetty.c
trunk/lib/libpam/modules/pam_self/Makefile
trunk/lib/libpam/modules/pam_self/pam_self.8
trunk/lib/libpam/modules/pam_self/pam_self.c
trunk/lib/libpam/modules/pam_ssh/Makefile
trunk/lib/libpam/modules/pam_ssh/pam_ssh.8
trunk/lib/libpam/modules/pam_ssh/pam_ssh.c
trunk/lib/libpam/modules/pam_tacplus/Makefile
trunk/lib/libpam/modules/pam_tacplus/pam_tacplus.8
trunk/lib/libpam/modules/pam_tacplus/pam_tacplus.c
trunk/lib/libpam/modules/pam_unix/Makefile
trunk/lib/libpam/modules/pam_unix/pam_unix.8
trunk/lib/libpam/modules/pam_unix/pam_unix.c
Property Changed:
----------------
trunk/lib/libpam/modules/Makefile.inc
trunk/lib/libpam/modules/modules.inc
trunk/lib/libpam/modules/pam_chroot/pam_chroot.8
trunk/lib/libpam/modules/pam_deny/pam_deny.8
trunk/lib/libpam/modules/pam_echo/pam_echo.8
trunk/lib/libpam/modules/pam_exec/pam_exec.8
trunk/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8
trunk/lib/libpam/modules/pam_group/pam_group.8
trunk/lib/libpam/modules/pam_guest/pam_guest.8
trunk/lib/libpam/modules/pam_krb5/pam_krb5.8
trunk/lib/libpam/modules/pam_ksu/pam_ksu.8
trunk/lib/libpam/modules/pam_lastlog/pam_lastlog.8
trunk/lib/libpam/modules/pam_login_access/login.access.5
trunk/lib/libpam/modules/pam_login_access/pam_login_access.8
trunk/lib/libpam/modules/pam_nologin/pam_nologin.8
trunk/lib/libpam/modules/pam_opie/pam_opie.8
trunk/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8
trunk/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
trunk/lib/libpam/modules/pam_permit/pam_permit.8
trunk/lib/libpam/modules/pam_radius/pam_radius.8
trunk/lib/libpam/modules/pam_rhosts/pam_rhosts.8
trunk/lib/libpam/modules/pam_rootok/pam_rootok.8
trunk/lib/libpam/modules/pam_securetty/pam_securetty.8
trunk/lib/libpam/modules/pam_self/pam_self.8
trunk/lib/libpam/modules/pam_ssh/pam_ssh.8
trunk/lib/libpam/modules/pam_tacplus/pam_tacplus.8
trunk/lib/libpam/modules/pam_unix/pam_unix.8
Modified: trunk/lib/libpam/Makefile.inc
===================================================================
--- trunk/lib/libpam/Makefile.inc 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/Makefile.inc 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 1998 Juniper Networks, Inc.
# All rights reserved.
#
@@ -22,12 +23,11 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libpam/Makefile.inc 294192 2016-01-16 19:48:03Z des $
CFLAGS+= -DOPENPAM_DEBUG
SHLIB_MAJOR= 5
-PAM_MOD_DIR= ${LIBDIR}
STATIC_CFLAGS+= -DOPENPAM_STATIC_MODULES
Modified: trunk/lib/libpam/libpam/Makefile
===================================================================
--- trunk/lib/libpam/libpam/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/libpam/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
#-
# Copyright (c) 1998 Juniper Networks, Inc.
# All rights reserved.
@@ -33,15 +34,16 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libpam/libpam/Makefile 313580 2017-02-11 05:43:34Z ngie $
-OPENPAM= ${.CURDIR}/../../../contrib/openpam
-.PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man
+OPENPAM= ${SRCTOP}/contrib/openpam
+.PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man
LIB= pam
NO_PROFILE=
-SRCS= openpam_borrow_cred.c \
+SRCS= openpam_asprintf.c \
+ openpam_borrow_cred.c \
openpam_check_owner_perms.c \
openpam_configure.c \
openpam_constants.c \
@@ -63,8 +65,12 @@
openpam_set_feature.c \
openpam_set_option.c \
openpam_straddch.c \
+ openpam_strlcat.c \
+ openpam_strlcpy.c \
+ openpam_strlset.c \
openpam_subst.c \
openpam_ttyconv.c \
+ openpam_vasprintf.c \
pam_acct_mgmt.c \
pam_authenticate.c \
pam_chauthtok.c \
@@ -150,7 +156,7 @@
CSTD?= c99
CFLAGS+= -I${.CURDIR} -I${OPENPAM}/include
CFLAGS+= -DLIB_MAJ=${SHLIB_MAJOR}
-CFLAGS+= -DOPENPAM_MODULES_DIR='"${PAM_MOD_DIR:C/\/*$//}/"'
+CFLAGS+= -DHAVE_DLFUNC=1
CFLAGS+= -DHAVE_FDLOPEN=1
CFLAGS+= -DHAVE_FPURGE=1
CFLAGS+= -DHAVE_STRLCAT=1
@@ -193,4 +199,8 @@
INCS= ${HEADERS} ${ADD_HEADERS}
INCSDIR= ${INCLUDEDIR}/security
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.lib.mk>
Modified: trunk/lib/libpam/libpam/pam_debug_log.c
===================================================================
--- trunk/lib/libpam/libpam/pam_debug_log.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/libpam/pam_debug_log.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2001 Mark R V Murray
* All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpam/libpam/pam_debug_log.c,v 1.8 2002/04/14 16:44:04 des Exp $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/libpam/pam_debug_log.c 94662 2002-04-14 16:44:04Z des $");
#include <libgen.h>
#include <stdarg.h>
Modified: trunk/lib/libpam/libpam/pam_std_option.c
===================================================================
--- trunk/lib/libpam/libpam/pam_std_option.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/libpam/pam_std_option.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
Modified: trunk/lib/libpam/libpam/security/pam_mod_misc.h
===================================================================
--- trunk/lib/libpam/libpam/security/pam_mod_misc.h 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/libpam/security/pam_mod_misc.h 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libpam/libpam/security/pam_mod_misc.h,v 1.13 2006/07/17 11:48:52 stefanf Exp $
+ * $FreeBSD: stable/10/lib/libpam/libpam/security/pam_mod_misc.h 160434 2006-07-17 11:48:52Z stefanf $
*/
#ifndef PAM_MOD_MISC_H
Modified: trunk/lib/libpam/modules/Makefile
===================================================================
--- trunk/lib/libpam/modules/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 1998 Juniper Networks, Inc.
# All rights reserved.
#
@@ -22,10 +23,11 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: release/9.2.0/lib/libpam/modules/Makefile 112044 2003-03-09 20:06:38Z obrien $
+# $FreeBSD: stable/10/lib/libpam/modules/Makefile 300166 2016-05-18 20:55:04Z bdrewery $
.include "modules.inc"
SUBDIR= ${MODULES}
+SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
Modified: trunk/lib/libpam/modules/Makefile.inc
===================================================================
--- trunk/lib/libpam/modules/Makefile.inc 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/Makefile.inc 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,11 +1,12 @@
-# $FreeBSD: release/9.2.0/lib/libpam/modules/Makefile.inc 236115 2012-05-26 17:56:54Z des $
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libpam/modules/Makefile.inc 313579 2017-02-11 05:41:53Z ngie $
-PAMDIR= ${.CURDIR}/../../../../contrib/openpam
+PAMDIR= ${SRCTOP}/contrib/openpam
NO_INSTALLLIB=
NO_PROFILE=
-CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
+CFLAGS+= -I${PAMDIR}/include -I${SRCTOP}/lib/libpam
# This is nasty.
# For the static case, libpam.a depends on the modules.
Property changes on: trunk/lib/libpam/modules/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/modules.inc
===================================================================
--- trunk/lib/libpam/modules/modules.inc 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/modules.inc 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,4 +1,5 @@
-# $FreeBSD: release/9.2.0/lib/libpam/modules/modules.inc 156813 2006-03-17 18:54:44Z ru $
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libpam/modules/modules.inc 278569 2015-02-11 08:52:29Z ngie $
.include <bsd.own.mk>
@@ -21,7 +22,9 @@
MODULES += pam_opieaccess
MODULES += pam_passwdqc
MODULES += pam_permit
+.if ${MK_RADIUS_SUPPORT} != "no"
MODULES += pam_radius
+.endif
MODULES += pam_rhosts
MODULES += pam_rootok
MODULES += pam_securetty
Property changes on: trunk/lib/libpam/modules/modules.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_chroot/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_chroot/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_chroot/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,4 +1,5 @@
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_chroot/Makefile 112857 2003-03-30 22:58:23Z des $
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libpam/modules/pam_chroot/Makefile 112857 2003-03-30 22:58:23Z des $
LIB= pam_chroot
SRCS= pam_chroot.c
Modified: trunk/lib/libpam/modules/pam_chroot/pam_chroot.8
===================================================================
--- trunk/lib/libpam/modules/pam_chroot/pam_chroot.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_chroot/pam_chroot.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2003 Networks Associates Technology, Inc.
.\" All rights reserved.
.\"
@@ -30,7 +31,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_chroot/pam_chroot.8 131504 2004-07-02 23:52:20Z ru $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_chroot/pam_chroot.8 131504 2004-07-02 23:52:20Z ru $
.\"
.Dd February 10, 2003
.Dt PAM_CHROOT 8
Property changes on: trunk/lib/libpam/modules/pam_chroot/pam_chroot.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_chroot/pam_chroot.c
===================================================================
--- trunk/lib/libpam/modules/pam_chroot/pam_chroot.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_chroot/pam_chroot.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
@@ -33,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_chroot/pam_chroot.c 114262 2003-04-30 00:40:24Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_chroot/pam_chroot.c 114262 2003-04-30 00:40:24Z des $");
#include <sys/param.h>
Modified: trunk/lib/libpam/modules/pam_deny/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_deny/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_deny/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 1999 Max Khon.
# All rights reserved.
#
@@ -22,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_deny/Makefile 112044 2003-03-09 20:06:38Z obrien $
+# $FreeBSD: stable/10/lib/libpam/modules/pam_deny/Makefile 112044 2003-03-09 20:06:38Z obrien $
LIB= pam_deny
SRCS= pam_deny.c
Modified: trunk/lib/libpam/modules/pam_deny/pam_deny.8
===================================================================
--- trunk/lib/libpam/modules/pam_deny/pam_deny.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_deny/pam_deny.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\"
@@ -22,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_deny/pam_deny.8 81729 2001-08-15 20:05:33Z markm $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_deny/pam_deny.8 81729 2001-08-15 20:05:33Z markm $
.\"
.Dd July 7, 2001
.Dt PAM_DENY 8
Property changes on: trunk/lib/libpam/modules/pam_deny/pam_deny.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_deny/pam_deny.c
===================================================================
--- trunk/lib/libpam/modules/pam_deny/pam_deny.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_deny/pam_deny.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2001 Mark R V Murray
* All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_deny/pam_deny.c 147226 2005-06-10 06:16:13Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_deny/pam_deny.c 147226 2005-06-10 06:16:13Z des $");
#include <stddef.h>
Modified: trunk/lib/libpam/modules/pam_echo/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_echo/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_echo/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,4 +1,5 @@
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_echo/Makefile 112044 2003-03-09 20:06:38Z obrien $
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libpam/modules/pam_echo/Makefile 112044 2003-03-09 20:06:38Z obrien $
LIB= pam_echo
SRCS= pam_echo.c
Modified: trunk/lib/libpam/modules/pam_echo/pam_echo.8
===================================================================
--- trunk/lib/libpam/modules/pam_echo/pam_echo.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_echo/pam_echo.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001,2003 Networks Associates Technology, Inc.
.\" All rights reserved.
.\"
@@ -30,7 +31,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_echo/pam_echo.8 203958 2010-02-16 12:29:02Z ru $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_echo/pam_echo.8 203958 2010-02-16 12:29:02Z ru $
.\"
.Dd February 6, 2003
.Dt PAM_ECHO 8
Property changes on: trunk/lib/libpam/modules/pam_echo/pam_echo.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_echo/pam_echo.c
===================================================================
--- trunk/lib/libpam/modules/pam_echo/pam_echo.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_echo/pam_echo.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001,2003 Networks Associates Technology, Inc.
* All rights reserved.
@@ -33,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_echo/pam_echo.c 123448 2003-12-11 13:55:16Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_echo/pam_echo.c 123448 2003-12-11 13:55:16Z des $");
#include <stdio.h>
#include <stdlib.h>
Modified: trunk/lib/libpam/modules/pam_exec/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_exec/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_exec/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,4 +1,5 @@
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_exec/Makefile 201381 2010-01-02 09:58:07Z ed $
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libpam/modules/pam_exec/Makefile 201381 2010-01-02 09:58:07Z ed $
LIB= pam_exec
SRCS= pam_exec.c
Modified: trunk/lib/libpam/modules/pam_exec/pam_exec.8
===================================================================
--- trunk/lib/libpam/modules/pam_exec/pam_exec.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_exec/pam_exec.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001,2003 Networks Associates Technology, Inc.
.\" All rights reserved.
.\"
@@ -30,7 +31,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_exec/pam_exec.8 237247 2012-06-19 02:54:54Z wblock $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_exec/pam_exec.8 235873 2012-05-24 02:24:03Z wblock $
.\"
.Dd February 8, 2012
.Dt PAM_EXEC 8
Property changes on: trunk/lib/libpam/modules/pam_exec/pam_exec.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_exec/pam_exec.c
===================================================================
--- trunk/lib/libpam/modules/pam_exec/pam_exec.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_exec/pam_exec.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001,2003 Networks Associates Technology, Inc.
* All rights reserved.
@@ -33,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_exec/pam_exec.c 234842 2012-04-30 13:34:15Z dumbbell $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_exec/pam_exec.c 234184 2012-04-12 14:02:59Z dumbbell $");
#include <sys/types.h>
#include <sys/wait.h>
Modified: trunk/lib/libpam/modules/pam_ftpusers/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_ftpusers/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_ftpusers/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,4 +1,5 @@
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_ftpusers/Makefile 112044 2003-03-09 20:06:38Z obrien $
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libpam/modules/pam_ftpusers/Makefile 112044 2003-03-09 20:06:38Z obrien $
LIB= pam_ftpusers
SRCS= pam_ftpusers.c
Modified: trunk/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8
===================================================================
--- trunk/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\" Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -32,7 +33,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8 131504 2004-07-02 23:52:20Z ru $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8 131504 2004-07-02 23:52:20Z ru $
.\"
.Dd April 17, 2002
.Dt PAM_FTPUSERS 8
Property changes on: trunk/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
===================================================================
--- trunk/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Networks Associates Technology, Inc.
* All rights reserved.
@@ -33,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c 96191 2002-05-08 00:30:10Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c 96191 2002-05-08 00:30:10Z des $");
#include <ctype.h>
#include <grp.h>
Modified: trunk/lib/libpam/modules/pam_group/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_group/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_group/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,4 +1,5 @@
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_group/Makefile 110455 2003-02-06 14:27:48Z des $
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libpam/modules/pam_group/Makefile 110455 2003-02-06 14:27:48Z des $
LIB= pam_group
SRCS= pam_group.c
Modified: trunk/lib/libpam/modules/pam_group/pam_group.8
===================================================================
--- trunk/lib/libpam/modules/pam_group/pam_group.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_group/pam_group.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2003 Networks Associates Technology, Inc.
.\" Copyright (c) 2004-2011 Dag-Erling Smørgrav
.\" All rights reserved.
@@ -31,9 +32,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_group/pam_group.8 219563 2011-03-12 11:12:30Z des $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_group/pam_group.8 270401 2014-08-23 11:40:40Z des $
.\"
-.Dd March 9, 2011
+.Dd July 19, 2014
.Dt PAM_GROUP 8
.Os
.Sh NAME
@@ -48,6 +49,11 @@
.Sh DESCRIPTION
The group service module for PAM accepts or rejects users based on
their membership in a particular file group.
+.Nm pam_group
+provides functionality for two PAM categories: authentication and
+account management.
+In terms of the module-type parameter, they are the ``auth'' and
+``account'' features.
.Pp
The following options may be passed to the
.Nm
Property changes on: trunk/lib/libpam/modules/pam_group/pam_group.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_group/pam_group.c
===================================================================
--- trunk/lib/libpam/modules/pam_group/pam_group.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_group/pam_group.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
* Copyright (c) 2004-2011 Dag-Erling Smørgrav
@@ -34,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_group/pam_group.c 219564 2011-03-12 11:26:37Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_group/pam_group.c 270401 2014-08-23 11:40:40Z des $");
#include <sys/types.h>
@@ -47,15 +48,14 @@
#include <unistd.h>
#define PAM_SM_AUTH
+#define PAM_SM_ACCOUNT
#include <security/pam_appl.h>
#include <security/pam_modules.h>
#include <security/openpam.h>
-
-PAM_EXTERN int
-pam_sm_authenticate(pam_handle_t *pamh, int flags __unused,
- int argc __unused, const char *argv[] __unused)
+static int
+pam_group(pam_handle_t *pamh)
{
int local, remote;
const char *group, *user;
@@ -96,14 +96,12 @@
if ((grp = getgrnam(group)) == NULL || grp->gr_mem == NULL)
goto failed;
- /* check if the group is empty */
- if (*grp->gr_mem == NULL)
- goto failed;
-
- /* check membership */
+ /* check if user's own primary group */
if (pwd->pw_gid == grp->gr_gid)
goto found;
- for (list = grp->gr_mem; *list != NULL; ++list)
+
+ /* iterate over members */
+ for (list = grp->gr_mem; list != NULL && *list != NULL; ++list)
if (strcmp(*list, pwd->pw_name) == 0)
goto found;
@@ -123,6 +121,14 @@
}
PAM_EXTERN int
+pam_sm_authenticate(pam_handle_t *pamh, int flags __unused,
+ int argc __unused, const char *argv[] __unused)
+{
+
+ return (pam_group(pamh));
+}
+
+PAM_EXTERN int
pam_sm_setcred(pam_handle_t * pamh __unused, int flags __unused,
int argc __unused, const char *argv[] __unused)
{
@@ -130,4 +136,12 @@
return (PAM_SUCCESS);
}
+PAM_EXTERN int
+pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused,
+ int argc __unused, const char *argv[] __unused)
+{
+
+ return (pam_group(pamh));
+}
+
PAM_MODULE_ENTRY("pam_group");
Modified: trunk/lib/libpam/modules/pam_guest/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_guest/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_guest/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,4 +1,5 @@
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_guest/Makefile 115462 2003-05-31 16:52:58Z des $
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libpam/modules/pam_guest/Makefile 115462 2003-05-31 16:52:58Z des $
LIB= pam_guest
SRCS= pam_guest.c
Modified: trunk/lib/libpam/modules/pam_guest/pam_guest.8
===================================================================
--- trunk/lib/libpam/modules/pam_guest/pam_guest.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_guest/pam_guest.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2003 Networks Associates Technology, Inc.
.\" All rights reserved.
.\"
@@ -30,7 +31,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_guest/pam_guest.8 131608 2004-07-05 06:39:03Z ru $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_guest/pam_guest.8 131608 2004-07-05 06:39:03Z ru $
.\"
.Dd May 26, 2003
.Dt PAM_GUEST 8
Property changes on: trunk/lib/libpam/modules/pam_guest/pam_guest.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_guest/pam_guest.c
===================================================================
--- trunk/lib/libpam/modules/pam_guest/pam_guest.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_guest/pam_guest.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
* All rights reserved.
@@ -33,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_guest/pam_guest.c 115462 2003-05-31 16:52:58Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_guest/pam_guest.c 115462 2003-05-31 16:52:58Z des $");
#include <string.h>
Modified: trunk/lib/libpam/modules/pam_krb5/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_krb5/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_krb5/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 2001 FreeBSD, Inc.
# All rights reserved.
#
@@ -22,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libpam/modules/pam_krb5/Makefile 233406 2012-03-24 01:02:03Z stas $
LIB= pam_krb5
SRCS= pam_krb5.c
Modified: trunk/lib/libpam/modules/pam_krb5/pam_krb5.8
===================================================================
--- trunk/lib/libpam/modules/pam_krb5/pam_krb5.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_krb5/pam_krb5.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,6 +1,7 @@
+.\" $MidnightBSD$
.\"
-.\" $Id: pam_krb5.8,v 1.2 2012-11-27 01:40:56 laffer1 Exp $
-.\" $MidnightBSD$
+.\" $Id: pam_krb5.5,v 1.5 2000/01/05 00:59:56 fcusack Exp $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_krb5/pam_krb5.8 207561 2010-05-03 09:49:42Z delphij $
.Dd May 3, 2010
.Dt PAM_KRB5 8
.Os
Property changes on: trunk/lib/libpam/modules/pam_krb5/pam_krb5.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_krb5/pam_krb5.c
===================================================================
--- trunk/lib/libpam/modules/pam_krb5/pam_krb5.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_krb5/pam_krb5.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* This pam_krb5 module contains code that is:
* Copyright (c) Derrick J. Brashear, 1996. All rights reserved.
@@ -48,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_krb5/pam_krb5.c 315152 2017-03-12 13:23:23Z des $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -239,6 +240,8 @@
retval = PAM_SERVICE_ERR;
goto cleanup2;
}
+ krb5_get_init_creds_opt_set_default_flags(pam_context,
+ service, NULL, opts);
if (openpam_get_option(pamh, PAM_OPT_FORWARDABLE))
krb5_get_init_creds_opt_set_forwardable(opts, 1);
Modified: trunk/lib/libpam/modules/pam_ksu/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_ksu/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_ksu/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 2002 FreeBSD, Inc.
# All rights reserved.
#
@@ -22,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/lib/libpam/modules/pam_ksu/Makefile,v 1.6 2004/08/06 07:27:04 cperciva Exp $
+# $FreeBSD: stable/10/lib/libpam/modules/pam_ksu/Makefile 233302 2012-03-22 11:18:14Z stas $
LIB= pam_ksu
SRCS= pam_ksu.c
Modified: trunk/lib/libpam/modules/pam_ksu/pam_ksu.8
===================================================================
--- trunk/lib/libpam/modules/pam_ksu/pam_ksu.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_ksu/pam_ksu.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\" Copyright (c) 2001 Networks Associates Technology, Inc.
@@ -32,7 +33,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libpam/modules/pam_ksu/pam_ksu.8,v 1.3 2002/12/12 08:19:47 ru Exp $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_ksu/pam_ksu.8 107771 2002-12-12 08:19:47Z ru $
.\"
.Dd May 15, 2002
.Dt PAM_KSU 8
Property changes on: trunk/lib/libpam/modules/pam_ksu/pam_ksu.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_ksu/pam_ksu.c
===================================================================
--- trunk/lib/libpam/modules/pam_ksu/pam_ksu.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_ksu/pam_ksu.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002 Jacques A. Vidrine <nectar at FreeBSD.org>
* All rights reserved.
Modified: trunk/lib/libpam/modules/pam_lastlog/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_lastlog/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_lastlog/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 2001 Mark R V Murray
# All rights reserved.
#
@@ -22,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_lastlog/Makefile 202566 2010-01-18 11:29:51Z ed $
+# $FreeBSD: stable/10/lib/libpam/modules/pam_lastlog/Makefile 202566 2010-01-18 11:29:51Z ed $
LIB= pam_lastlog
SRCS= pam_lastlog.c
Modified: trunk/lib/libpam/modules/pam_lastlog/pam_lastlog.8
===================================================================
--- trunk/lib/libpam/modules/pam_lastlog/pam_lastlog.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_lastlog/pam_lastlog.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\" Copyright (c) 2001 Networks Associates Technology, Inc.
@@ -32,7 +33,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_lastlog/pam_lastlog.8 240582 2012-09-17 00:56:10Z eadler $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_lastlog/pam_lastlog.8 240506 2012-09-14 17:50:42Z eadler $
.\"
.Dd January 21, 2010
.Dt PAM_LASTLOG 8
Property changes on: trunk/lib/libpam/modules/pam_lastlog/pam_lastlog.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_lastlog/pam_lastlog.c
===================================================================
--- trunk/lib/libpam/modules/pam_lastlog/pam_lastlog.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_lastlog/pam_lastlog.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -42,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_lastlog/pam_lastlog.c 230952 2012-02-03 17:50:39Z ed $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_lastlog/pam_lastlog.c 270398 2014-08-23 11:34:56Z des $");
#define _BSD_SOURCE
@@ -49,7 +50,6 @@
#include <sys/time.h>
#include <paths.h>
-#include <pwd.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
@@ -68,7 +68,6 @@
pam_sm_open_session(pam_handle_t *pamh, int flags,
int argc __unused, const char *argv[] __unused)
{
- struct passwd *pwd;
struct utmpx *utx, utl;
time_t t;
const char *user;
@@ -79,7 +78,7 @@
pam_err = pam_get_user(pamh, &user, NULL);
if (pam_err != PAM_SUCCESS)
return (pam_err);
- if (user == NULL || (pwd = getpwnam(user)) == NULL)
+ if (user == NULL)
return (PAM_SERVICE_ERR);
PAM_LOG("Got user: %s", user);
Modified: trunk/lib/libpam/modules/pam_login_access/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_login_access/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_login_access/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 2001 Mark R V Murray
# All rights reserved.
#
@@ -22,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_login_access/Makefile 156344 2006-03-06 12:31:25Z yar $
+# $FreeBSD: stable/10/lib/libpam/modules/pam_login_access/Makefile 156344 2006-03-06 12:31:25Z yar $
LIB= pam_login_access
SRCS= pam_login_access.c login_access.c
Modified: trunk/lib/libpam/modules/pam_login_access/login.access.5
===================================================================
--- trunk/lib/libpam/modules/pam_login_access/login.access.5 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_login_access/login.access.5 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,5 +1,6 @@
+.\" $MidnightBSD$
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_login_access/login.access.5 162287 2006-09-13 18:34:32Z joel $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_login_access/login.access.5 162287 2006-09-13 18:34:32Z joel $
.\"
.Dd September 13, 2006
.Dt LOGIN.ACCESS 5
Property changes on: trunk/lib/libpam/modules/pam_login_access/login.access.5
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_login_access/login_access.c
===================================================================
--- trunk/lib/libpam/modules/pam_login_access/login_access.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_login_access/login_access.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* This module implements a simple but effective form of login access
* control based on login names and on host (or domain) names, internet
@@ -14,7 +15,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_login_access/login_access.c 169976 2007-05-25 07:50:18Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_login_access/login_access.c 169976 2007-05-25 07:50:18Z des $");
#include <sys/types.h>
#include <ctype.h>
Modified: trunk/lib/libpam/modules/pam_login_access/pam_login_access.8
===================================================================
--- trunk/lib/libpam/modules/pam_login_access/pam_login_access.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_login_access/pam_login_access.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\" Copyright (c) 2001 Networks Associates Technology, Inc.
@@ -32,7 +33,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_login_access/pam_login_access.8 156350 2006-03-06 13:15:12Z yar $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_login_access/pam_login_access.8 156350 2006-03-06 13:15:12Z yar $
.\"
.Dd January 24, 2002
.Dt PAM_LOGIN_ACCESS 8
Property changes on: trunk/lib/libpam/modules/pam_login_access/pam_login_access.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_login_access/pam_login_access.c
===================================================================
--- trunk/lib/libpam/modules/pam_login_access/pam_login_access.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_login_access/pam_login_access.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Mark R V Murray
* All rights reserved.
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_login_access/pam_login_access.c 125650 2004-02-10 10:13:21Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_login_access/pam_login_access.c 272351 2014-10-01 10:26:43Z des $");
#define _BSD_SOURCE
@@ -79,20 +80,27 @@
gethostname(hostname, sizeof hostname);
- if (rhost == NULL || *(const char *)rhost == '\0') {
+ if (rhost != NULL && *(const char *)rhost != '\0') {
+ PAM_LOG("Checking login.access for user %s from host %s",
+ (const char *)user, (const char *)rhost);
+ if (login_access(user, rhost) != 0)
+ return (PAM_SUCCESS);
+ PAM_VERBOSE_ERROR("%s is not allowed to log in from %s",
+ (const char *)user, (const char *)rhost);
+ } else if (tty != NULL && *(const char *)tty != '\0') {
PAM_LOG("Checking login.access for user %s on tty %s",
(const char *)user, (const char *)tty);
if (login_access(user, tty) != 0)
return (PAM_SUCCESS);
PAM_VERBOSE_ERROR("%s is not allowed to log in on %s",
- user, tty);
+ (const char *)user, (const char *)tty);
} else {
- PAM_LOG("Checking login.access for user %s from host %s",
- (const char *)user, (const char *)rhost);
- if (login_access(user, rhost) != 0)
+ PAM_LOG("Checking login.access for user %s",
+ (const char *)user);
+ if (login_access(user, "***unknown***") != 0)
return (PAM_SUCCESS);
- PAM_VERBOSE_ERROR("%s is not allowed to log in from %s",
- user, rhost);
+ PAM_VERBOSE_ERROR("%s is not allowed to log in",
+ (const char *)user);
}
return (PAM_AUTH_ERR);
Modified: trunk/lib/libpam/modules/pam_login_access/pam_login_access.h
===================================================================
--- trunk/lib/libpam/modules/pam_login_access/pam_login_access.h 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_login_access/pam_login_access.h 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Mark R V Murray
* All rights reserved.
@@ -33,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: release/9.2.0/lib/libpam/modules/pam_login_access/pam_login_access.h 92297 2002-03-14 23:27:59Z des $
+ * $FreeBSD: stable/10/lib/libpam/modules/pam_login_access/pam_login_access.h 92297 2002-03-14 23:27:59Z des $
*/
extern int login_access(const char *, const char *);
Modified: trunk/lib/libpam/modules/pam_nologin/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_nologin/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_nologin/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 2001 Mark R V Murray
# All rights reserved.
#
@@ -22,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_nologin/Makefile 112044 2003-03-09 20:06:38Z obrien $
+# $FreeBSD: stable/10/lib/libpam/modules/pam_nologin/Makefile 112044 2003-03-09 20:06:38Z obrien $
LIB= pam_nologin
SRCS= pam_nologin.c
Modified: trunk/lib/libpam/modules/pam_nologin/pam_nologin.8
===================================================================
--- trunk/lib/libpam/modules/pam_nologin/pam_nologin.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_nologin/pam_nologin.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\"
@@ -22,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_nologin/pam_nologin.8 237216 2012-06-18 04:55:07Z eadler $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_nologin/pam_nologin.8 233648 2012-03-29 05:02:12Z eadler $
.\"
.Dd June 10, 2007
.Dt PAM_NOLOGIN 8
Property changes on: trunk/lib/libpam/modules/pam_nologin/pam_nologin.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_nologin/pam_nologin.c
===================================================================
--- trunk/lib/libpam/modules/pam_nologin/pam_nologin.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_nologin/pam_nologin.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2001 Mark R V Murray
* All rights reserved.
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_nologin/pam_nologin.c 170725 2007-06-14 13:07:06Z yar $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_nologin/pam_nologin.c 170725 2007-06-14 13:07:06Z yar $");
#include <sys/types.h>
#include <sys/stat.h>
Modified: trunk/lib/libpam/modules/pam_opie/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_opie/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_opie/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 2000 James Bloom
# All rights reserved.
# Based upon code Copyright 1998 Juniper Networks, Inc.
@@ -23,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_opie/Makefile 112044 2003-03-09 20:06:38Z obrien $
+# $FreeBSD: stable/10/lib/libpam/modules/pam_opie/Makefile 112044 2003-03-09 20:06:38Z obrien $
LIB= pam_opie
SRCS= pam_opie.c
Modified: trunk/lib/libpam/modules/pam_opie/pam_opie.8
===================================================================
--- trunk/lib/libpam/modules/pam_opie/pam_opie.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_opie/pam_opie.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\" Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -32,7 +33,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_opie/pam_opie.8 108317 2002-12-27 12:15:40Z schweikh $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_opie/pam_opie.8 108317 2002-12-27 12:15:40Z schweikh $
.\"
.Dd July 7, 2001
.Dt PAM_OPIE 8
Property changes on: trunk/lib/libpam/modules/pam_opie/pam_opie.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_opie/pam_opie.c
===================================================================
--- trunk/lib/libpam/modules/pam_opie/pam_opie.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_opie/pam_opie.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2000 James Bloom
* All rights reserved.
@@ -36,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_opie/pam_opie.c 162320 2006-09-15 13:42:38Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_opie/pam_opie.c 270125 2014-08-18 03:06:49Z ache $");
#include <sys/types.h>
#include <opie.h>
@@ -62,7 +63,7 @@
struct passwd *pwd;
int retval, i;
const char *(promptstr[]) = { "%s\nPassword: ", "%s\nPassword [echo on]: "};
- char challenge[OPIE_CHALLENGE_MAX];
+ char challenge[OPIE_CHALLENGE_MAX + 1];
char principal[OPIE_PRINCIPAL_MAX];
const char *user;
char *response;
Modified: trunk/lib/libpam/modules/pam_opieaccess/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_opieaccess/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_opieaccess/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,4 +1,5 @@
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_opieaccess/Makefile 112044 2003-03-09 20:06:38Z obrien $
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libpam/modules/pam_opieaccess/Makefile 112044 2003-03-09 20:06:38Z obrien $
LIB= pam_opieaccess
SRCS= ${LIB}.c
Modified: trunk/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8
===================================================================
--- trunk/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\" Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -32,7 +33,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8 173003 2007-10-26 07:50:11Z des $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8 173003 2007-10-26 07:50:11Z des $
.\"
.Dd October 26, 2007
.Dt PAM_OPIEACCESS 8
Property changes on: trunk/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c
===================================================================
--- trunk/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
@@ -33,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c 125668 2004-02-10 20:42:33Z cperciva $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c 125668 2004-02-10 20:42:33Z cperciva $");
#define _BSD_SOURCE
Modified: trunk/lib/libpam/modules/pam_passwdqc/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_passwdqc/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_passwdqc/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,6 +1,7 @@
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_passwdqc/Makefile 112044 2003-03-09 20:06:38Z obrien $
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libpam/modules/pam_passwdqc/Makefile 313579 2017-02-11 05:41:53Z ngie $
-SRCDIR= ${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc
+SRCDIR= ${SRCTOP}/contrib/pam_modules/pam_passwdqc
.PATH: ${SRCDIR}
LIB= pam_passwdqc
@@ -7,7 +8,7 @@
SRCS= pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c
MAN= pam_passwdqc.8
-WARNS?= 0
+WARNS?= 2
CFLAGS+= -I${SRCDIR}
DPADD= ${LIBCRYPT}
Modified: trunk/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
===================================================================
--- trunk/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2000-2002 Solar Designer.
.\" All rights reserved.
.\" Copyright (c) 2001 Networks Associates Technology, Inc.
@@ -32,7 +33,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 131504 2004-07-02 23:52:20Z ru $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 131504 2004-07-02 23:52:20Z ru $
.\"
.Dd April 15, 2002
.Dt PAM_PASSWDQC 8
Property changes on: trunk/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_permit/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_permit/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_permit/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 1999 Max Khon.
# All rights reserved.
#
@@ -22,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_permit/Makefile 112044 2003-03-09 20:06:38Z obrien $
+# $FreeBSD: stable/10/lib/libpam/modules/pam_permit/Makefile 112044 2003-03-09 20:06:38Z obrien $
LIB= pam_permit
SRCS= pam_permit.c
Modified: trunk/lib/libpam/modules/pam_permit/pam_permit.8
===================================================================
--- trunk/lib/libpam/modules/pam_permit/pam_permit.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_permit/pam_permit.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\"
@@ -22,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_permit/pam_permit.8 79658 2001-07-13 09:09:52Z ru $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_permit/pam_permit.8 79658 2001-07-13 09:09:52Z ru $
.\"
.Dd July 7, 2001
.Dt PAM_PERMIT 8
Property changes on: trunk/lib/libpam/modules/pam_permit/pam_permit.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_permit/pam_permit.c
===================================================================
--- trunk/lib/libpam/modules/pam_permit/pam_permit.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_permit/pam_permit.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 2001 Mark R V Murray
* All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_permit/pam_permit.c 94564 2002-04-12 22:27:25Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_permit/pam_permit.c 94564 2002-04-12 22:27:25Z des $");
#include <stddef.h>
Modified: trunk/lib/libpam/modules/pam_radius/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_radius/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_radius/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 1998 Juniper Networks, Inc.
# All rights reserved.
#
@@ -22,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_radius/Makefile 201381 2010-01-02 09:58:07Z ed $
+# $FreeBSD: stable/10/lib/libpam/modules/pam_radius/Makefile 201381 2010-01-02 09:58:07Z ed $
LIB= pam_radius
SRCS= pam_radius.c
Modified: trunk/lib/libpam/modules/pam_radius/pam_radius.8
===================================================================
--- trunk/lib/libpam/modules/pam_radius/pam_radius.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_radius/pam_radius.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1999
.\" Andrzej Bialecki <abial at FreeBSD.org>. All rights reserved.
.\"
@@ -36,7 +37,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_radius/pam_radius.8 141846 2005-02-13 22:25:33Z ru $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_radius/pam_radius.8 141846 2005-02-13 22:25:33Z ru $
.\"
.Dd October 28, 2002
.Dt PAM_RADIUS 8
Property changes on: trunk/lib/libpam/modules/pam_radius/pam_radius.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_radius/pam_radius.c
===================================================================
--- trunk/lib/libpam/modules/pam_radius/pam_radius.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_radius/pam_radius.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_radius/pam_radius.c 247568 2013-03-01 19:42:50Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_radius/pam_radius.c 277873 2015-01-29 09:03:57Z des $");
#include <sys/param.h>
#include <sys/socket.h>
@@ -62,11 +63,11 @@
#define PASSWORD_PROMPT "RADIUS Password:"
static int build_access_request(struct rad_handle *, const char *,
- const char *, const char *, const char *, const void *,
- size_t);
+ const char *, const char *, const char *, const char *,
+ const void *, size_t);
static int do_accept(pam_handle_t *, struct rad_handle *);
static int do_challenge(pam_handle_t *, struct rad_handle *,
- const char *, const char *, const char *);
+ const char *, const char *, const char *, const char *);
/*
* Construct an access request, but don't send it. Returns 0 on success,
@@ -75,7 +76,7 @@
static int
build_access_request(struct rad_handle *radh, const char *user,
const char *pass, const char *nas_id, const char *nas_ipaddr,
- const void *state, size_t state_len)
+ const char *rhost, const void *state, size_t state_len)
{
int error;
char host[MAXHOSTNAMELEN];
@@ -121,8 +122,13 @@
}
}
}
- if (state != NULL && rad_put_attr(radh, RAD_STATE, state,
- state_len) == -1) {
+ if (rhost != NULL &&
+ rad_put_string(radh, RAD_CALLING_STATION_ID, rhost) == -1) {
+ syslog(LOG_CRIT, "rad_put_string: %s", rad_strerror(radh));
+ return (-1);
+ }
+ if (state != NULL &&
+ rad_put_attr(radh, RAD_STATE, state, state_len) == -1) {
syslog(LOG_CRIT, "rad_put_attr: %s", rad_strerror(radh));
return (-1);
}
@@ -162,7 +168,7 @@
static int
do_challenge(pam_handle_t *pamh, struct rad_handle *radh, const char *user,
- const char *nas_id, const char *nas_ipaddr)
+ const char *nas_id, const char *nas_ipaddr, const char *rhost)
{
int retval;
int attrtype;
@@ -230,7 +236,7 @@
conv->appdata_ptr)) != PAM_SUCCESS)
return (retval);
if (build_access_request(radh, user, resp[num_msgs-1].resp, nas_id,
- nas_ipaddr, state, statelen) == -1)
+ nas_ipaddr, rhost, state, statelen) == -1)
return (PAM_SERVICE_ERR);
memset(resp[num_msgs-1].resp, 0, strlen(resp[num_msgs-1].resp));
free(resp[num_msgs-1].resp);
@@ -246,7 +252,7 @@
{
struct rad_handle *radh;
const char *user, *pass;
- const void *tmpuser;
+ const void *rhost, *tmpuser;
const char *conf_file, *template_user, *nas_id, *nas_ipaddr;
int retval;
int e;
@@ -255,6 +261,7 @@
template_user = openpam_get_option(pamh, PAM_OPT_TEMPLATE_USER);
nas_id = openpam_get_option(pamh, PAM_OPT_NAS_ID);
nas_ipaddr = openpam_get_option(pamh, PAM_OPT_NAS_IPADDR);
+ pam_get_item(pamh, PAM_RHOST, &rhost);
retval = pam_get_user(pamh, &user, NULL);
if (retval != PAM_SUCCESS)
@@ -284,8 +291,8 @@
PAM_LOG("Radius config file read");
- if (build_access_request(radh, user, pass, nas_id, nas_ipaddr, NULL,
- 0) == -1) {
+ if (build_access_request(radh, user, pass, nas_id, nas_ipaddr, rhost,
+ NULL, 0) == -1) {
rad_close(radh);
return (PAM_SERVICE_ERR);
}
@@ -330,7 +337,7 @@
case RAD_ACCESS_CHALLENGE:
retval = do_challenge(pamh, radh, user, nas_id,
- nas_ipaddr);
+ nas_ipaddr, rhost);
if (retval != PAM_SUCCESS) {
rad_close(radh);
return (retval);
Modified: trunk/lib/libpam/modules/pam_rhosts/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_rhosts/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_rhosts/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,4 +1,5 @@
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_rhosts/Makefile 112044 2003-03-09 20:06:38Z obrien $
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libpam/modules/pam_rhosts/Makefile 112044 2003-03-09 20:06:38Z obrien $
LIB= pam_rhosts
SRCS= pam_rhosts.c
Modified: trunk/lib/libpam/modules/pam_rhosts/pam_rhosts.8
===================================================================
--- trunk/lib/libpam/modules/pam_rhosts/pam_rhosts.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_rhosts/pam_rhosts.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\" Copyright (c) 2001 Networks Associates Technology, Inc.
@@ -32,7 +33,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_rhosts/pam_rhosts.8 131504 2004-07-02 23:52:20Z ru $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_rhosts/pam_rhosts.8 131504 2004-07-02 23:52:20Z ru $
.\"
.Dd December 5, 2001
.Dt PAM_RHOSTS 8
Property changes on: trunk/lib/libpam/modules/pam_rhosts/pam_rhosts.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_rhosts/pam_rhosts.c
===================================================================
--- trunk/lib/libpam/modules/pam_rhosts/pam_rhosts.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_rhosts/pam_rhosts.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002 Danny Braniss
* All rights reserved.
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_rhosts/pam_rhosts.c 123448 2003-12-11 13:55:16Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_rhosts/pam_rhosts.c 123448 2003-12-11 13:55:16Z des $");
#include <pwd.h>
#include <stddef.h>
Modified: trunk/lib/libpam/modules/pam_rootok/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_rootok/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_rootok/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 2001 Mark R V Murray
# All rights reserved.
#
@@ -22,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_rootok/Makefile 112044 2003-03-09 20:06:38Z obrien $
+# $FreeBSD: stable/10/lib/libpam/modules/pam_rootok/Makefile 112044 2003-03-09 20:06:38Z obrien $
LIB= pam_rootok
SRCS= pam_rootok.c
Modified: trunk/lib/libpam/modules/pam_rootok/pam_rootok.8
===================================================================
--- trunk/lib/libpam/modules/pam_rootok/pam_rootok.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_rootok/pam_rootok.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\"
@@ -22,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_rootok/pam_rootok.8 81729 2001-08-15 20:05:33Z markm $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_rootok/pam_rootok.8 81729 2001-08-15 20:05:33Z markm $
.\"
.Dd July 8, 2001
.Dt PAM_ROOTOK 8
Property changes on: trunk/lib/libpam/modules/pam_rootok/pam_rootok.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_rootok/pam_rootok.c
===================================================================
--- trunk/lib/libpam/modules/pam_rootok/pam_rootok.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_rootok/pam_rootok.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Mark R V Murray
* All rights reserved.
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_rootok/pam_rootok.c 94564 2002-04-12 22:27:25Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_rootok/pam_rootok.c 94564 2002-04-12 22:27:25Z des $");
#define _BSD_SOURCE
Modified: trunk/lib/libpam/modules/pam_securetty/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_securetty/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_securetty/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 2001 Mark R V Murray
# All rights reserved.
#
@@ -22,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_securetty/Makefile 112044 2003-03-09 20:06:38Z obrien $
+# $FreeBSD: stable/10/lib/libpam/modules/pam_securetty/Makefile 112044 2003-03-09 20:06:38Z obrien $
LIB= pam_securetty
SRCS= pam_securetty.c
Modified: trunk/lib/libpam/modules/pam_securetty/pam_securetty.8
===================================================================
--- trunk/lib/libpam/modules/pam_securetty/pam_securetty.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_securetty/pam_securetty.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\" Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -32,7 +33,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_securetty/pam_securetty.8 92297 2002-03-14 23:27:59Z des $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_securetty/pam_securetty.8 92297 2002-03-14 23:27:59Z des $
.\"
.Dd July 8, 2001
.Dt PAM_SECURETTY 8
Property changes on: trunk/lib/libpam/modules/pam_securetty/pam_securetty.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_securetty/pam_securetty.c
===================================================================
--- trunk/lib/libpam/modules/pam_securetty/pam_securetty.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_securetty/pam_securetty.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Mark R V Murray
* All rights reserved.
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_securetty/pam_securetty.c 125650 2004-02-10 10:13:21Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_securetty/pam_securetty.c 125650 2004-02-10 10:13:21Z des $");
#include <sys/types.h>
#include <sys/stat.h>
Modified: trunk/lib/libpam/modules/pam_self/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_self/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_self/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 2001 Mark R V Murray
# All rights reserved.
#
@@ -22,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_self/Makefile 112044 2003-03-09 20:06:38Z obrien $
+# $FreeBSD: stable/10/lib/libpam/modules/pam_self/Makefile 112044 2003-03-09 20:06:38Z obrien $
LIB= pam_self
SRCS= pam_self.c
Modified: trunk/lib/libpam/modules/pam_self/pam_self.8
===================================================================
--- trunk/lib/libpam/modules/pam_self/pam_self.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_self/pam_self.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\" Copyright (c) 2001 Networks Associates Technology, Inc.
@@ -32,7 +33,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_self/pam_self.8 131504 2004-07-02 23:52:20Z ru $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_self/pam_self.8 131504 2004-07-02 23:52:20Z ru $
.\"
.Dd December 5, 2001
.Dt PAM_SELF 8
Property changes on: trunk/lib/libpam/modules/pam_self/pam_self.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_self/pam_self.c
===================================================================
--- trunk/lib/libpam/modules/pam_self/pam_self.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_self/pam_self.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Mark R V Murray
* All rights reserved.
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_self/pam_self.c 94564 2002-04-12 22:27:25Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_self/pam_self.c 94564 2002-04-12 22:27:25Z des $");
#define _BSD_SOURCE
Modified: trunk/lib/libpam/modules/pam_ssh/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_ssh/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_ssh/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,23 +1,21 @@
+# $MidnightBSD$
# PAM module for SSH
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_ssh/Makefile 201381 2010-01-02 09:58:07Z ed $
+# $FreeBSD: stable/10/lib/libpam/modules/pam_ssh/Makefile 313579 2017-02-11 05:41:53Z ngie $
-SSHDIR= ${.CURDIR}/../../../../crypto/openssh
+SSHDIR= ${SRCTOP}/crypto/openssh
LIB= pam_ssh
MAN= pam_ssh.8
SRCS= pam_ssh.c
-# required when linking with a dynamic libssh
-SRCS+= roaming_dummy.c
-
-WARNS?= 3
+WARNS?= 5
CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
+SRCS+= ssh_namespace.h
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
LDADD= -lssh -lcrypto -lcrypt
+USEPRIVATELIB= ssh
.include <bsd.lib.mk>
.PATH: ${SSHDIR}
-
-${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
Modified: trunk/lib/libpam/modules/pam_ssh/pam_ssh.8
===================================================================
--- trunk/lib/libpam/modules/pam_ssh/pam_ssh.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_ssh/pam_ssh.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001 Mark R V Murray
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
.\" Copyright (c) 2004-2011 Dag-Erling Smørgrav
@@ -32,7 +33,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_ssh/pam_ssh.8 247568 2013-03-01 19:42:50Z des $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_ssh/pam_ssh.8 226101 2011-10-07 12:58:33Z des $
.\"
.Dd October 7, 2011
.Dt PAM_SSH 8
Property changes on: trunk/lib/libpam/modules/pam_ssh/pam_ssh.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_ssh/pam_ssh.c
===================================================================
--- trunk/lib/libpam/modules/pam_ssh/pam_ssh.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_ssh/pam_ssh.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
* Copyright (c) 2004-2011 Dag-Erling Smørgrav
Modified: trunk/lib/libpam/modules/pam_tacplus/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_tacplus/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_tacplus/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 1998 Juniper Networks, Inc.
# All rights reserved.
#
@@ -22,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_tacplus/Makefile 112044 2003-03-09 20:06:38Z obrien $
+# $FreeBSD: stable/10/lib/libpam/modules/pam_tacplus/Makefile 112044 2003-03-09 20:06:38Z obrien $
LIB= pam_tacplus
SRCS= pam_tacplus.c
Modified: trunk/lib/libpam/modules/pam_tacplus/pam_tacplus.8
===================================================================
--- trunk/lib/libpam/modules/pam_tacplus/pam_tacplus.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_tacplus/pam_tacplus.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1999
.\" Andrzej Bialecki <abial at FreeBSD.org>. All rights reserved.
.\"
@@ -36,7 +37,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_tacplus/pam_tacplus.8 131504 2004-07-02 23:52:20Z ru $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_tacplus/pam_tacplus.8 131504 2004-07-02 23:52:20Z ru $
.\"
.Dd August 2, 1999
.Dt PAM_TACPLUS 8
Property changes on: trunk/lib/libpam/modules/pam_tacplus/pam_tacplus.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_tacplus/pam_tacplus.c
===================================================================
--- trunk/lib/libpam/modules/pam_tacplus/pam_tacplus.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_tacplus/pam_tacplus.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_tacplus/pam_tacplus.c 115470 2003-05-31 17:19:03Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_tacplus/pam_tacplus.c 115470 2003-05-31 17:19:03Z des $");
#include <sys/param.h>
Modified: trunk/lib/libpam/modules/pam_unix/Makefile
===================================================================
--- trunk/lib/libpam/modules/pam_unix/Makefile 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_unix/Makefile 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright 1998 Juniper Networks, Inc.
# All rights reserved.
# Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -32,7 +33,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: release/9.2.0/lib/libpam/modules/pam_unix/Makefile 247568 2013-03-01 19:42:50Z des $
+# $FreeBSD: stable/10/lib/libpam/modules/pam_unix/Makefile 230311 2012-01-18 18:26:56Z peter $
.include <bsd.init.mk>
Modified: trunk/lib/libpam/modules/pam_unix/pam_unix.8
===================================================================
--- trunk/lib/libpam/modules/pam_unix/pam_unix.8 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_unix/pam_unix.8 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001 Mark R V Murray
.\" All rights reserved.
.\" Copyright (c) 2001 Networks Associates Technology, Inc.
@@ -32,7 +33,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: release/9.2.0/lib/libpam/modules/pam_unix/pam_unix.8 247568 2013-03-01 19:42:50Z des $
+.\" $FreeBSD: stable/10/lib/libpam/modules/pam_unix/pam_unix.8 227044 2011-11-02 23:40:21Z des $
.\"
.Dd June 20, 2009
.Dt PAM_UNIX 8
Property changes on: trunk/lib/libpam/modules/pam_unix/pam_unix.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libpam/modules/pam_unix/pam_unix.c
===================================================================
--- trunk/lib/libpam/modules/pam_unix/pam_unix.c 2018-06-09 19:23:33 UTC (rev 10654)
+++ trunk/lib/libpam/modules/pam_unix/pam_unix.c 2018-06-09 19:25:59 UTC (rev 10655)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1998 Juniper Networks, Inc.
* All rights reserved.
@@ -35,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/lib/libpam/modules/pam_unix/pam_unix.c 247568 2013-03-01 19:42:50Z des $");
+__FBSDID("$FreeBSD: stable/10/lib/libpam/modules/pam_unix/pam_unix.c 325802 2017-11-14 10:49:07Z des $");
#include <sys/param.h>
#include <sys/socket.h>
@@ -91,7 +92,7 @@
login_cap_t *lc;
struct passwd *pwd;
int retval;
- const char *pass, *user = NULL, *realpw, *prompt;
+ const char *pass, *user, *realpw, *prompt;
if (openpam_get_option(pamh, PAM_OPT_AUTH_AS_SELF)) {
user = getlogin();
@@ -111,6 +112,7 @@
if (!(flags & PAM_DISALLOW_NULL_AUTHTOK) &&
openpam_get_option(pamh, PAM_OPT_NULLOK))
return (PAM_SUCCESS);
+ PAM_LOG("Password is empty, using fake password");
realpw = "*";
}
lc = login_getpwclass(pwd);
@@ -125,6 +127,10 @@
if (retval != PAM_SUCCESS)
return (retval);
PAM_LOG("Got password");
+ if (strnlen(pass, _PASSWORD_LEN + 1) > _PASSWORD_LEN) {
+ PAM_LOG("Password is too long, using fake password");
+ realpw = "*";
+ }
if (strcmp(crypt(pass, realpw), realpw) == 0)
return (PAM_SUCCESS);
@@ -278,13 +284,13 @@
int pfd, tfd, retval;
if (openpam_get_option(pamh, PAM_OPT_AUTH_AS_SELF))
- pwd = getpwnam(getlogin());
+ user = getlogin();
else {
retval = pam_get_user(pamh, &user, NULL);
if (retval != PAM_SUCCESS)
return (retval);
- pwd = getpwnam(user);
}
+ pwd = getpwnam(user);
if (pwd == NULL)
return (PAM_AUTHTOK_RECOVERY_ERR);
@@ -332,6 +338,7 @@
* XXX check PAM_DISALLOW_NULL_AUTHTOK
*/
old_pass = "";
+ retval = PAM_SUCCESS;
} else {
retval = pam_get_authtok(pamh,
PAM_OLDAUTHTOK, &old_pass, NULL);
@@ -460,14 +467,14 @@
}
/* Salt suitable for traditional DES and MD5 */
-void
-makesalt(char salt[SALTSIZE])
+static void
+makesalt(char salt[SALTSIZE + 1])
{
int i;
/* These are not really random numbers, they are just
* numbers that change to thwart construction of a
- * dictionary. This is exposed to the public.
+ * dictionary.
*/
for (i = 0; i < SALTSIZE; i += 4)
to64(&salt[i], arc4random(), 4);
More information about the Midnightbsd-cvs
mailing list