Date: Thu, 3 May 2001 03:48:56 -0700 (PDT) From: Mark Murray <markm@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/libpam/doc/man pam.8 pam_authenticate.3 pam_chauthtok.3 pam_fail_delay.3 pam_open_session.3 pam_setcred.3 pam_start.3 pam_strerror.3 template-man src/contrib/libpam/libpam pam_log.c pam_static.c src/contrib/libpam/libpam/include/security ... Message-ID: <200105031048.f43Amuo92230@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
markm 2001/05/03 03:48:56 PDT
Modified files:
contrib/libpam/doc/man pam.8 pam_authenticate.3
pam_chauthtok.3 pam_fail_delay.3
pam_open_session.3 pam_setcred.3
pam_start.3 pam_strerror.3 template-man
contrib/libpam/libpam pam_log.c pam_static.c
contrib/libpam/libpam/include/security pam_modules.h
contrib/libpam/libpam_misc misc_conv.c xstrdup.c
contrib/libpam/modules/pam_deny Makefile pam_deny.c
contrib/libpam/modules/pam_permit Makefile pam_permit.c
Log:
Resolve conflicts.
Revision Changes Path
1.3 +108 -11 src/contrib/libpam/doc/man/pam.8
1.3 +2 -1 src/contrib/libpam/doc/man/pam_authenticate.3
1.3 +2 -1 src/contrib/libpam/doc/man/pam_chauthtok.3
1.3 +3 -2 src/contrib/libpam/doc/man/pam_fail_delay.3
1.3 +3 -2 src/contrib/libpam/doc/man/pam_open_session.3
1.3 +3 -2 src/contrib/libpam/doc/man/pam_setcred.3
1.3 +3 -2 src/contrib/libpam/doc/man/pam_start.3
1.3 +10 -7 src/contrib/libpam/doc/man/pam_strerror.3
1.2 +4 -3 src/contrib/libpam/doc/man/template-man
1.3 +22 -79 src/contrib/libpam/libpam/pam_log.c
1.3 +9 -20 src/contrib/libpam/libpam/pam_static.c
1.3 +3 -22 src/contrib/libpam/libpam/include/security/pam_modules.h
1.2 +34 -68 src/contrib/libpam/libpam_misc/misc_conv.c
1.3 +2 -8 src/contrib/libpam/libpam_misc/xstrdup.c
1.4 +5 -114 src/contrib/libpam/modules/pam_deny/Makefile
1.4 +2 -14 src/contrib/libpam/modules/pam_deny/pam_deny.c
1.4 +5 -115 src/contrib/libpam/modules/pam_permit/Makefile
1.4 +2 -11 src/contrib/libpam/modules/pam_permit/pam_permit.c
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200105031048.f43Amuo92230>