Date: Thu, 2 May 2002 23:23:25 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 10729 for review Message-ID: <200205030623.g436NPD02169@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10729 Change 10729 by peter@peter_overcee on 2002/05/02 23:23:08 IFC @10727 Affected files ... ... //depot/projects/ia64/bin/ps/fmt.c#3 integrate ... //depot/projects/ia64/contrib/openpam/HISTORY#9 integrate ... //depot/projects/ia64/contrib/openpam/MANIFEST#9 integrate ... //depot/projects/ia64/contrib/openpam/RELNOTES#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#9 integrate ... //depot/projects/ia64/contrib/openpam/include/security/openpam.h#12 integrate ... //depot/projects/ia64/contrib/openpam/lib/Makefile#9 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_configure.c#2 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_dynamic.c#8 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#9 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_load.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_nullconv.c#1 branch ... //depot/projects/ia64/contrib/openpam/lib/pam_end.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#9 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_start.c#8 integrate ... //depot/projects/ia64/contrib/openpam/misc/gendoc.pl#7 integrate ... //depot/projects/ia64/etc/pam.d/Makefile#4 integrate ... //depot/projects/ia64/etc/pam.d/gdm#3 integrate ... //depot/projects/ia64/etc/pam.d/rexecd#1 branch ... //depot/projects/ia64/etc/pam.d/xdm#3 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_cancel.c#3 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_poll.c#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_readv.c#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_select.c#3 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_wait4.c#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_writev.c#2 integrate ... //depot/projects/ia64/lib/libpam/libpam/Makefile#12 integrate ... //depot/projects/ia64/libexec/rexecd/Makefile#3 integrate ... //depot/projects/ia64/libexec/rexecd/rexecd.c#4 integrate ... //depot/projects/ia64/sbin/mount_std/mount_std.c#4 integrate ... //depot/projects/ia64/sbin/restore/tape.c#4 integrate ... //depot/projects/ia64/secure/lib/libcrypto/Makefile#5 integrate ... //depot/projects/ia64/secure/lib/libcrypto/Makefile.asm#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/Makefile.inc#4 integrate ... //depot/projects/ia64/secure/lib/libcrypto/i386/bf-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/bf-686.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/bn-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/cast-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/co-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/crypt586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/des-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/md5-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/rc4-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/rc5-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/rmd-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/sha1-586.s#1 branch ... //depot/projects/ia64/share/man/man4/wi.4#2 integrate ... //depot/projects/ia64/share/man/man4/wi.4tbl#1 branch ... //depot/projects/ia64/share/man/man4/wi.4tl#1 branch ... //depot/projects/ia64/sys/dev/aac/aac.c#6 integrate ... //depot/projects/ia64/sys/dev/aac/aac_cam.c#2 integrate ... //depot/projects/ia64/sys/dev/em/if_em.c#6 integrate ... //depot/projects/ia64/sys/dev/my/if_my.c#5 integrate ... //depot/projects/ia64/sys/dev/usb/usbdi.c#6 integrate ... //depot/projects/ia64/sys/fs/deadfs/dead_vnops.c#3 integrate ... //depot/projects/ia64/sys/fs/devfs/devfs_vfsops.c#3 integrate ... //depot/projects/ia64/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate ... //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#8 integrate ... //depot/projects/ia64/sys/fs/pseudofs/pseudofs.c#6 integrate ... //depot/projects/ia64/sys/fs/pseudofs/pseudofs.h#6 integrate ... //depot/projects/ia64/sys/fs/udf/udf_vnops.c#3 integrate ... //depot/projects/ia64/sys/i386/acpica/genwakecode.pl#2 delete ... //depot/projects/ia64/sys/i386/conf/Makefile#3 integrate ... //depot/projects/ia64/sys/i386/conf/NOTES#15 integrate ... //depot/projects/ia64/sys/i386/conf/makeLINT.pl#2 delete ... //depot/projects/ia64/sys/i386/conf/makeLINT.sed#1 branch ... //depot/projects/ia64/sys/i386/conf/makeLINT.sh#1 branch ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#35 integrate ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#18 integrate ... //depot/projects/ia64/sys/ia64/include/ansi.h#7 integrate ... //depot/projects/ia64/sys/kern/init_main.c#8 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#18 integrate ... //depot/projects/ia64/sys/kern/kern_exec.c#14 integrate ... //depot/projects/ia64/sys/kern/kern_exit.c#11 integrate ... //depot/projects/ia64/sys/kern/kern_fork.c#10 integrate ... //depot/projects/ia64/sys/kern/kern_malloc.c#10 integrate ... //depot/projects/ia64/sys/kern/kern_proc.c#13 integrate ... //depot/projects/ia64/sys/kern/kern_sig.c#12 integrate ... //depot/projects/ia64/sys/kern/makeobjops.pl#4 delete ... //depot/projects/ia64/sys/kern/sys_generic.c#9 integrate ... //depot/projects/ia64/sys/netatm/atm_cm.c#5 integrate ... //depot/projects/ia64/sys/netatm/atm_cm.h#3 integrate ... //depot/projects/ia64/sys/netatm/atm_subr.c#7 integrate ... //depot/projects/ia64/sys/sys/malloc.h#10 integrate ... //depot/projects/ia64/sys/sys/socketvar.h#13 integrate ... //depot/projects/ia64/sys/sys/user.h#6 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#8 integrate ... //depot/projects/ia64/sys/vm/uma.h#5 integrate ... //depot/projects/ia64/sys/vm/uma_core.c#13 integrate ... //depot/projects/ia64/sys/vm/uma_dbg.c#3 integrate ... //depot/projects/ia64/sys/vm/uma_dbg.h#3 integrate ... //depot/projects/ia64/sys/vm/vm_map.c#13 integrate ... //depot/projects/ia64/tools/tools/vop_table/vop_table.tcl#2 integrate ... //depot/projects/ia64/usr.bin/Makefile#21 integrate ... //depot/projects/ia64/usr.bin/csplit/Makefile#1 branch ... //depot/projects/ia64/usr.bin/csplit/csplit.1#1 branch ... //depot/projects/ia64/usr.bin/csplit/csplit.c#1 branch ... //depot/projects/ia64/usr.bin/m4/main.c#4 integrate ... //depot/projects/ia64/usr.bin/m4/pathnames.h#3 integrate ... //depot/projects/ia64/usr.bin/xargs/xargs.1#3 integrate ... //depot/projects/ia64/usr.bin/xargs/xargs.c#8 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/create/perform.c#5 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/main.c#3 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/show.c#3 integrate Differences ... ==== //depot/projects/ia64/bin/ps/fmt.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.17 2002/02/03 14:43:04 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.18 2002/05/02 05:46:37 jmallett Exp $"); #if 0 #ifndef lint @@ -72,8 +72,8 @@ if (buf == NULL) { if ((arg_max = sysconf(_SC_ARG_MAX)) == -1) errx(1, "sysconf _SC_ARG_MAX failed"); - if ((buf = malloc((u_int)(4 * arg_max) + 1)) == NULL) - errx(1, "malloc failed"); + if ((buf = malloc((size_t)(4 * arg_max) + 1)) == NULL) + err(1, "malloc"); } if (*argv == 0) { ==== //depot/projects/ia64/contrib/openpam/HISTORY#9 (text) ==== @@ -1,13 +1,37 @@ ============================================================================ +OpenPAM Cinnamon 2002-05-02 + + - ENHANCE: Add a null conversation function, openpam_nullconv(). + + - BUGFIX: Various markup bugs in the documentation. + + - BUGFIX: Document <security/openpam.h>. + + - BUGFIX: Duplicate expansion of openpam_log() macro arguments. + + - ENHANCE: Restructure the policy-loading code and align our use of + the "other" policy with Solaris and Linux-PAM. + + - ENHANCE: Log dlopen() and dlsym() failures. + + - ENHANCE: In openpam_ttyconv(), emit a newline after error and info + messages unless the message contains one already. + + - BUGFIX: In pam_vprompt(), initialize the response pointer to NULL + so we can detect whether the conversation function touched it. +============================================================================ OpenPAM Cineraria 2002-04-14 + - BUGFIX: Fix confusion between token and prompt in + pam_get_authtok(3). + - ENHANCE: Improved documentation. - ENHANCE: Adopt the same preprocessor tricks that were used in FreeBSD's version of Linux-PAM to simplify static linking without requiring dummy primitives. - - ENHANCE: move the policy-loading code out of pam_start.c. + - ENHANCE: Move the policy-loading code out of pam_start.c. - BUGFIX: Fix typo in one of the versions of the openpam_log macro. @@ -128,4 +152,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#9 $ +$P4: //depot/projects/openpam/HISTORY#11 $ ==== //depot/projects/ia64/contrib/openpam/MANIFEST#9 (text) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/openpam/MANIFEST#7 $ +# $P4: //depot/projects/openpam/MANIFEST#8 $ # CREDITS HISTORY @@ -70,6 +70,7 @@ lib/openpam_impl.h lib/openpam_load.c lib/openpam_log.c +lib/openpam_nullconv.c lib/openpam_restore_cred.c lib/openpam_set_option.c lib/openpam_static.c ==== //depot/projects/ia64/contrib/openpam/RELNOTES#9 (text) ==== @@ -1,12 +1,12 @@ - Release notes for OpenPAM Cineraria - =================================== + Release notes for OpenPAM Cinnamon + ================================== The library itself is complete. Documentation exists in the form of man pages for the library functions, though a few pages are still incomplete. -This release is incorporated into FreeBSD-CURRENT as of 2002-04-14. +This release is incorporated into FreeBSD-CURRENT as of 2002-05-02. It has also been successfully built on NetBSD, and should build with minimal or no changes on OpenBSD. It has not been tested on any other OS. @@ -15,4 +15,4 @@ - The documentation is still incomplete. -$P4: //depot/projects/openpam/RELNOTES#9 $ +$P4: //depot/projects/openpam/RELNOTES#10 $ ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#5 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_borrow_cred.3#2 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_borrow_cred.3#4 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_BORROW_CRED 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft int .Fn openpam_borrow_cred "pam_handle_t *pamh" "const struct passwd *pwd" .Sh DESCRIPTION ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#5 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_free_data.3#2 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_free_data.3#4 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_FREE_DATA 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft void .Fn openpam_free_data "pam_handle_t *pamh" "void *data" "int status" .Sh DESCRIPTION ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft const char * .Fn openpam_get_option "pam_handle_t *pamh" "const char *option" .Sh DESCRIPTION ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#9 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_LOG 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft void .Fn openpam_log "int level" "const char *fmt" "..." .Sh DESCRIPTION ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#5 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_restore_cred.3#2 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_restore_cred.3#4 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_RESTORE_CRED 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft int .Fn openpam_restore_cred "pam_handle_t *pamh" .Sh DESCRIPTION ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft int .Fn openpam_set_option "pam_handle_t *pamh" "const char *option" "const char *value" .Sh DESCRIPTION ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#9 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft int .Fn openpam_ttyconv "int n" "const struct pam_message **msg" "struct pam_response **resp" "void *data" .Sh DESCRIPTION ==== //depot/projects/ia64/contrib/openpam/doc/man/pam.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam.3#13 $ +.\" $P4: //depot/projects/openpam/doc/man/pam.3#14 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_END 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_ERROR 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#10 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#13 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#14 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GET_DATA 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GET_ITEM 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GET_USER 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GETENV 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#10 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GETENVLIST 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_INFO 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_open_session.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_open_session.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_prompt.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_prompt.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_PROMPT 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_putenv.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_putenv.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_PUTENV 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_set_data.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_data.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SET_DATA 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_set_item.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_item.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SET_ITEM 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_setcred.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setcred.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_setenv.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setenv.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SETENV 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_authenticate.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_authenticate.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_close_session.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_close_session.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_open_session.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_open_session.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_setcred.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_setcred.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#10 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_start.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_start.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_START 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_strerror.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_strerror.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_STRERROR 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_verror.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_verror.3#10 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_VERROR 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_vinfo.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vinfo.3#10 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_VINFO 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_vprompt.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vprompt.3#10 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_VPROMPT 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/include/security/openpam.h#12 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam.h#18 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#19 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED @@ -164,6 +164,14 @@ void *_data); /* + * Null conversation function + */ +int openpam_nullconv(int _n, + const struct pam_message **_msg, + struct pam_response **_resp, + void *_data); + +/* * PAM primitives */ enum { ==== //depot/projects/ia64/contrib/openpam/lib/Makefile#9 (text) ==== @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/lib/Makefile#14 $ +# $P4: //depot/projects/openpam/lib/Makefile#15 $ # LIB = pam @@ -53,6 +53,7 @@ SRCS += openpam_get_option.c SRCS += openpam_load.c SRCS += openpam_log.c +SRCS += openpam_nullconv.c SRCS += openpam_restore_cred.c SRCS += openpam_set_option.c SRCS += openpam_static.c ==== //depot/projects/ia64/contrib/openpam/lib/openpam_configure.c#2 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_configure.c#1 $ + * $P4: //depot/projects/openpam/lib/openpam_configure.c#2 $ */ #include <ctype.h> @@ -50,7 +50,7 @@ #define MAX_OPTIONS 256 static int -openpam_read_policy_file(pam_handle_t *pamh, +openpam_read_policy_file(pam_chain_t *policy[], const char *service, const char *filename, int style) @@ -186,7 +186,7 @@ * Finally, add the module at the end of the * appropriate chain and bump the counter. */ - r = openpam_add_module(pamh, chain, flag, p, optc, optv); + r = openpam_add_module(policy, chain, flag, p, optc, optv); if (r != PAM_SUCCESS) return (-r); ++n; @@ -214,14 +214,8 @@ NULL }; -/* - * OpenPAM internal - * - * Configure a service - */ - -int -openpam_configure(pam_handle_t *pamh, +static int +openpam_load_policy(pam_chain_t *policy[], const char *service) { const char **path; @@ -235,24 +229,62 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205030623.g436NPD02169>