[Midnightbsd-cvs] src: modules/pam_ssh: merge changes
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Oct 30 17:38:00 EDT 2008
Log Message:
-----------
merge changes
Modified Files:
--------------
src/lib/libpam/modules/pam_login_access:
Makefile (r1.2 -> r1.3)
login.access.5 (r1.2 -> r1.3)
pam_login_access.8 (r1.2 -> r1.3)
src/lib/libpam/modules/pam_nologin:
Makefile (r1.2 -> r1.3)
pam_nologin.8 (r1.2 -> r1.3)
pam_nologin.c (r1.2 -> r1.3)
src/lib/libpam/modules/pam_ssh:
pam_ssh.c (r1.2 -> r1.3)
-------------- next part --------------
Index: pam_login_access.8
===================================================================
RCS file: /home/cvs/src/lib/libpam/modules/pam_login_access/pam_login_access.8,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libpam/modules/pam_login_access/pam_login_access.8 -L lib/libpam/modules/pam_login_access/pam_login_access.8 -u -r1.2 -r1.3
--- lib/libpam/modules/pam_login_access/pam_login_access.8
+++ lib/libpam/modules/pam_login_access/pam_login_access.8
@@ -32,7 +32,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libpam/modules/pam_login_access/pam_login_access.8,v 1.5.8.1 2006/03/09 22:18:07 yar Exp $
+.\" $FreeBSD: src/lib/libpam/modules/pam_login_access/pam_login_access.8,v 1.6 2006/03/06 13:15:12 yar Exp $
.\"
.Dd January 24, 2002
.Dt PAM_LOGIN_ACCESS 8
Index: login.access.5
===================================================================
RCS file: /home/cvs/src/lib/libpam/modules/pam_login_access/login.access.5,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libpam/modules/pam_login_access/login.access.5 -L lib/libpam/modules/pam_login_access/login.access.5 -u -r1.2 -r1.3
--- lib/libpam/modules/pam_login_access/login.access.5
+++ lib/libpam/modules/pam_login_access/login.access.5
@@ -1,7 +1,7 @@
.\"
-.\" $FreeBSD: src/lib/libpam/modules/pam_login_access/login.access.5,v 1.13.8.1 2006/03/09 22:18:07 yar Exp $
+.\" $FreeBSD: src/lib/libpam/modules/pam_login_access/login.access.5,v 1.17 2006/09/13 18:34:32 joel Exp $
.\"
-.Dd April 30, 1994
+.Dd September 13, 2006
.Dt LOGIN.ACCESS 5
.Os
.Sh NAME
@@ -52,7 +52,6 @@
.El
.Sh SEE ALSO
.Xr login 1 ,
-.Xr pam 8 ,
.Xr pam_login_access 8
.Sh AUTHORS
.An Guido van Rooij
Index: Makefile
===================================================================
RCS file: /home/cvs/src/lib/libpam/modules/pam_login_access/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libpam/modules/pam_login_access/Makefile -L lib/libpam/modules/pam_login_access/Makefile -u -r1.2 -r1.3
--- lib/libpam/modules/pam_login_access/Makefile
+++ lib/libpam/modules/pam_login_access/Makefile
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/lib/libpam/modules/pam_login_access/Makefile,v 1.5.12.1 2006/03/09 22:18:07 yar Exp $
+# $FreeBSD: src/lib/libpam/modules/pam_login_access/Makefile,v 1.6 2006/03/06 12:31:25 yar Exp $
LIB= pam_login_access
SRCS= pam_login_access.c login_access.c
Index: pam_nologin.c
===================================================================
RCS file: /home/cvs/src/lib/libpam/modules/pam_nologin/pam_nologin.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libpam/modules/pam_nologin/pam_nologin.c -L lib/libpam/modules/pam_nologin/pam_nologin.c -u -r1.2 -r1.3
--- lib/libpam/modules/pam_nologin/pam_nologin.c
+++ lib/libpam/modules/pam_nologin/pam_nologin.c
@@ -1,4 +1,3 @@
-/* $MidnightBSD$ */
/*-
* Copyright 2001 Mark R V Murray
* All rights reserved.
@@ -36,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_nologin/pam_nologin.c,v 1.10 2002/04/12 22:27:21 des Exp $");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_nologin/pam_nologin.c,v 1.13 2007/06/14 13:07:06 yar Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -47,7 +46,6 @@
#include <stdlib.h>
#include <unistd.h>
-#define PAM_SM_AUTH
#define PAM_SM_ACCOUNT
#include <security/pam_appl.h>
@@ -58,8 +56,9 @@
static char nologin_def[] = _PATH_NOLOGIN;
-static int
-pam_nologin_check(pam_handle_t *pamh, int flags)
+PAM_EXTERN int
+pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
+ int argc __unused, const char *argv[] __unused)
{
login_cap_t *lc;
struct passwd *pwd;
@@ -80,12 +79,6 @@
return (PAM_USER_UNKNOWN);
/*
- * Old bug compatibility in RELENG_6: always let root in.
- */
- if (pwd->pw_uid == 0)
- return (PAM_SUCCESS);
-
- /*
* login_getpwclass(3) will select the "root" class by default
* if pwd->pw_uid is 0. That class should have "ignorenologin"
* capability so that super-user can bypass nologin.
@@ -131,28 +124,4 @@
return (PAM_AUTH_ERR);
}
-PAM_EXTERN int
-pam_sm_authenticate(pam_handle_t *pamh, int flags,
- int argc __unused, const char *argv[] __unused)
-{
-
- return (pam_nologin_check(pamh, flags));
-}
-
-PAM_EXTERN int
-pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
- int argc __unused, const char *argv[] __unused)
-{
-
- return (pam_nologin_check(pamh, flags));
-}
-
-PAM_EXTERN int
-pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused,
- int argc __unused, const char *argv[] __unused)
-{
-
- return (PAM_SUCCESS);
-}
-
PAM_MODULE_ENTRY("pam_nologin");
Index: pam_nologin.8
===================================================================
RCS file: /home/cvs/src/lib/libpam/modules/pam_nologin/pam_nologin.8,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libpam/modules/pam_nologin/pam_nologin.8 -L lib/libpam/modules/pam_nologin/pam_nologin.8 -u -r1.2 -r1.3
--- lib/libpam/modules/pam_nologin/pam_nologin.8
+++ lib/libpam/modules/pam_nologin/pam_nologin.8
@@ -22,10 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
-.\" $FreeBSD: src/lib/libpam/modules/pam_nologin/pam_nologin.8,v 1.5 2001/08/26 18:05:35 markm Exp $
+.\" $FreeBSD: src/lib/libpam/modules/pam_nologin/pam_nologin.8,v 1.7 2007/06/14 13:07:06 yar Exp $
.\"
-.Dd August 18, 2007
+.Dd June 10, 2007
.Dt PAM_NOLOGIN 8
.Os
.Sh NAME
@@ -40,19 +39,16 @@
.Sh DESCRIPTION
The NoLogin service module for PAM,
.Nm
-provides the same functionality for two PAM categories:
-authentication and account management.
+provides functionality for only one PAM category:
+account management.
In terms of the
.Ar module-type
-parameter, those are the
-.Dq Li auth
-and
+parameter, this is the
.Dq Li account
-features.
-It also provides a null function for session management.
-.Ss NoLogin Authentication Module
-The NoLogin authentication component,
-.Fn pam_sm_authenticate ,
+feature.
+.Ss NoLogin Account Management Module
+The NoLogin account management component,
+.Fn pam_sm_acct_mgmt ,
verifies whether logins are administratively disabled via
.Xr nologin 5 .
It returns success if the user's login class has an "ignorenologin"
@@ -86,13 +82,6 @@
reasons why the user's
login attempt was declined.
.El
-.Ss NoLogin Account Management Module
-The NoLogin account management component,
-.Fn pam_sm_acct_mgmt ,
-returns the same value as the NoLogin authentication component
-would return.
-This component can be used to provide the NoLogin functionality
-to services that skip PAM authentication.
.Sh SEE ALSO
.Xr syslog 3 ,
.Xr login.conf 5 ,
Index: Makefile
===================================================================
RCS file: /home/cvs/src/lib/libpam/modules/pam_nologin/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libpam/modules/pam_nologin/Makefile -L lib/libpam/modules/pam_nologin/Makefile -u -r1.2 -r1.3
--- lib/libpam/modules/pam_nologin/Makefile
+++ lib/libpam/modules/pam_nologin/Makefile
@@ -22,7 +22,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $MidnightBSD$
# $FreeBSD: src/lib/libpam/modules/pam_nologin/Makefile,v 1.7 2003/03/09 20:06:36 obrien Exp $
LIB= pam_nologin
Index: pam_ssh.c
===================================================================
RCS file: /home/cvs/src/lib/libpam/modules/pam_ssh/pam_ssh.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libpam/modules/pam_ssh/pam_ssh.c -L lib/libpam/modules/pam_ssh/pam_ssh.c -u -r1.2 -r1.3
--- lib/libpam/modules/pam_ssh/pam_ssh.c
+++ lib/libpam/modules/pam_ssh/pam_ssh.c
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.40.8.1 2005/09/30 14:02:29 des Exp $");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.44 2006/09/30 20:33:42 ru Exp $");
#include <sys/param.h>
#include <sys/wait.h>
More information about the Midnightbsd-cvs
mailing list