Date: Fri, 2 May 2003 15:35:36 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30416 for review Message-ID: <200305022235.h42MZa8v050902@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=30416 Change 30416 by peter@peter_daintree on 2003/05/02 15:34:58 IFC @30414 Affected files ... .. //depot/projects/hammer/UPDATING#9 integrate .. //depot/projects/hammer/bin/csh/Makefile#2 integrate .. //depot/projects/hammer/bin/rcp/rcp.c#4 integrate .. //depot/projects/hammer/bin/sh/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/HISTORY#3 integrate .. //depot/projects/hammer/contrib/openpam/README#3 integrate .. //depot/projects/hammer/contrib/openpam/RELNOTES#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_borrow_cred.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_free_data.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_get_option.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_log.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_nullconv.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_restore_cred.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_set_option.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_ttyconv.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_acct_mgmt.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_authenticate.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_chauthtok.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_close_session.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_end.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_error.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_authtok.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_data.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_item.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_user.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_getenv.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_getenvlist.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_info.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_open_session.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_prompt.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_putenv.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_set_data.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_set_item.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_setcred.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_setenv.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_authenticate.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_chauthtok.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_close_session.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_open_session.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_setcred.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_start.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_strerror.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_verror.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_vinfo.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_vprompt.3#3 integrate .. //depot/projects/hammer/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/hammer/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/hammer/contrib/openpam/include/security/pam_constants.h#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_dispatch.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_impl.h#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_log.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_getenv.c#3 integrate .. //depot/projects/hammer/etc/Makefile#10 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#10 integrate .. //depot/projects/hammer/etc/etc.alpha/rc.alpha#2 delete .. //depot/projects/hammer/etc/etc.amd64/rc.amd64#4 delete .. //depot/projects/hammer/etc/etc.i386/rc.i386#3 delete .. //depot/projects/hammer/etc/etc.ia64/rc.ia64#2 delete .. //depot/projects/hammer/etc/etc.sparc64/rc.sparc64#2 delete .. //depot/projects/hammer/etc/rc#10 integrate .. //depot/projects/hammer/etc/rc.atm#3 delete .. //depot/projects/hammer/etc/rc.d/apm#2 integrate .. //depot/projects/hammer/etc/rc.d/apmd#4 integrate .. //depot/projects/hammer/etc/rc.d/archdep#4 integrate .. //depot/projects/hammer/etc/rc.d/devfs#3 integrate .. //depot/projects/hammer/etc/rc.devfs#3 delete .. //depot/projects/hammer/etc/rc.diskless1#3 delete .. //depot/projects/hammer/etc/rc.diskless2#4 delete .. //depot/projects/hammer/etc/rc.isdn#2 delete .. //depot/projects/hammer/etc/rc.network#6 delete .. //depot/projects/hammer/etc/rc.network6#2 delete .. //depot/projects/hammer/etc/rc.pccard#2 delete .. //depot/projects/hammer/etc/rc.sendmail#2 integrate .. //depot/projects/hammer/etc/rc.serial#2 delete .. //depot/projects/hammer/etc/rc.syscons#2 delete .. //depot/projects/hammer/etc/rc.sysctl#2 delete .. //depot/projects/hammer/gnu/usr.bin/groff/src/include/config.h#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 integrate .. //depot/projects/hammer/release/i386/dokern.sh#10 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.8#4 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#5 integrate .. //depot/projects/hammer/sbin/atm/ilmid/ilmid.c#6 integrate .. //depot/projects/hammer/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/hammer/sbin/bsdlabel/runtest.sh#2 integrate .. //depot/projects/hammer/sbin/camcontrol/Makefile#3 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.c#4 integrate .. //depot/projects/hammer/sbin/camcontrol/modeedit.c#4 integrate .. //depot/projects/hammer/sbin/camcontrol/util.c#3 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#4 integrate .. //depot/projects/hammer/sbin/dmesg/dmesg.c#3 integrate .. //depot/projects/hammer/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#7 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.h#3 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.h#5 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#9 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#8 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.c#7 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.h#7 integrate .. //depot/projects/hammer/sys/dev/em/if_em_osdep.h#7 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#11 integrate .. //depot/projects/hammer/sys/dev/md/md.c#11 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#7 integrate .. //depot/projects/hammer/sys/dev/mii/miidevs#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumio.c#6 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_crypt.c#7 integrate .. //depot/projects/hammer/sys/geom/geom.h#14 integrate .. //depot/projects/hammer/sys/geom/geom_aes.c#8 integrate .. //depot/projects/hammer/sys/geom/geom_apple.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#13 integrate .. //depot/projects/hammer/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.c#8 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#13 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#10 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#10 integrate .. //depot/projects/hammer/sys/geom/geom_gpt.c#12 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_mbr.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_mirror.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#13 integrate .. //depot/projects/hammer/sys/geom/geom_slice.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_slice.h#7 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#12 integrate .. //depot/projects/hammer/sys/geom/geom_sunlabel.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_vol_ffs.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#11 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#6 integrate .. //depot/projects/hammer/sys/kern/subr_mbuf.c#8 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#11 integrate .. //depot/projects/hammer/sys/sys/ata.h#4 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#10 integrate .. //depot/projects/hammer/sys/sys/param.h#12 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#15 integrate .. //depot/projects/hammer/usr.sbin/boot98cfg/boot98cfg.c#3 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#4 integrate Differences ... ==== //depot/projects/hammer/UPDATING#9 (text+ko) ==== @@ -17,11 +17,14 @@ developers choose to disable these features on build machines to maximize performance. -20030427: - The old rc system will soon be going away. If you have specified - rc_ng="NO" in your /etc/rc.conf[.local] you should remove it and - test with the new rc system. Please report any problems to - freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. +20030501: + The old rc system has been removed. Please report any problems + to freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. + Your personal versions of these files will not be removed, so you can + continue to use them. However, you should take great care when updating, + especially when using mergemaster, since the compatibility code that + utilizes these old scripts has also been removed. + 20030423: A bug has been fixed in /dev/devctl which would cause devd @@ -1265,4 +1268,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.248 2003/04/27 21:28:37 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.249 2003/05/02 05:27:33 dougb Exp $ ==== //depot/projects/hammer/bin/csh/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.29 2002/07/24 22:26:44 mp Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.30 2003/05/02 06:39:13 obrien Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -12,6 +12,7 @@ PROG= csh DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} +WARNS= 1 SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ ==== //depot/projects/hammer/bin/rcp/rcp.c#4 (text+ko) ==== @@ -50,7 +50,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.40 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.41 2003/05/02 06:36:52 obrien Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -502,7 +502,8 @@ enum { YES, NO, DISPLAYED } wrerr; BUF *bp; off_t i, j, size; - int amt, count, exists, first, mask, mode, ofd, omode; + int amt, exists, first, mask, mode, ofd, omode; + size_t count; int setimes, targisdir, wrerrno = 0; char ch, *cp, *np, *targ, *why, *vect[1], buf[BUFSIZ], path[PATH_MAX]; ==== //depot/projects/hammer/bin/sh/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 -# $FreeBSD: src/bin/sh/Makefile,v 1.38 2002/10/01 12:12:45 mux Exp $ +# $FreeBSD: src/bin/sh/Makefile,v 1.40 2003/05/02 06:26:32 obrien Exp $ PROG= sh SHSRCS= alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \ @@ -21,6 +21,8 @@ CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: # CFLAGS+= -g -DDEBUG=2 +WARNS= 0 +WFORMAT=0 .PATH: ${.CURDIR}/bltin \ ${.CURDIR}/../../bin/test ==== //depot/projects/hammer/contrib/openpam/HISTORY#3 (text) ==== @@ -1,3 +1,20 @@ +OpenPAM Dianthus 2003-05-02 + + - BUGFIX: Initialize some potentially uninitialized variables. + + - BUGFIX: Silence some warnings emitted by gcc -std=iso9899:1999. + + - BUGFIX: In pam_getenv(), return a pointer to the stored variable + instead of a freshly allocated copy. + + - ENHANCE: Detect recursion in openpam_borrow_cred() + + - ENHANCE: Make borrowing one's own credentials a no-op. + + - ENHANCE: Further improve debugging support. + + - ENHANCE: Clean up some variable names. +============================================================================ OpenPAM Daffodil 2003-01-06 - ENHANCE: Document dependency on <sys/types.h> (for size_t) @@ -206,4 +223,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#17 $ +$P4: //depot/projects/openpam/HISTORY#18 $ ==== //depot/projects/hammer/contrib/openpam/README#3 (text) ==== @@ -22,6 +22,6 @@ /usr/local/etc/pam.d/ and /usr/local/etc/pam.conf, in that order; this will be made configurable in a future release. -Please direct bug reports and inquiries to openpam@thinksec.com. +Please direct bug reports and inquiries to des@freebsd.org. -$P4: //depot/projects/openpam/README#4 $ +$P4: //depot/projects/openpam/README#5 $ ==== //depot/projects/hammer/contrib/openpam/RELNOTES#3 (text) ==== @@ -1,16 +1,13 @@ - Release notes for OpenPAM Daffodil + Release notes for OpenPAM Dianthus ================================== -This is a bugfix release. The previous release, Cyclamen, was rushed -out without sufficient testing, and contained a number of small but -serious errors. +This is a maintenance release incorporating a number of minor patches +accumulated since the previous release. This release corresponds to the code used in FreeBSD-CURRENT as of the -release date. It has also been successfully built on NetBSD 1.6, and -should build with minimal or no changes on OpenBSD. Work is underway -to port OpenPAM to MacOS 10.2. It has not been tested on any other -operating system. +release date. It may or may not build on other platforms; previous +releases have been built on NetBSD and (with partial success) MacOS X. The library itself is complete. Documentation exists in the form of man pages for the library functions. These man pages are generated by @@ -27,4 +24,6 @@ lost your name and email address. Please contact me so I can give you proper credit for your contribution. -$P4: //depot/projects/openpam/RELNOTES#14 $ +Please direct bug reports and inquiries to des@freebsd.org. + +$P4: //depot/projects/openpam/RELNOTES#15 $ ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_borrow_cred.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_BORROW_CRED 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_free_data.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_FREE_DATA 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_get_option.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_log.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_LOG 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_nullconv.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_NULLCONV 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_restore_cred.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_RESTORE_CRED 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_set_option.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_ttyconv.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM 3 .Os .Sh NAME @@ -75,7 +75,7 @@ .Fn pam_get_item "pam_handle_t *pamh" "int item_type" "const void **item" .Ft int .Fn pam_get_user "pam_handle_t *pamh" "const char **user" "const char *prompt" -.Ft char * +.Ft const char * .Fn pam_getenv "pam_handle_t *pamh" "const char *name" .Ft char ** .Fn pam_getenvlist "pam_handle_t *pamh" ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_acct_mgmt.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_authenticate.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_chauthtok.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_close_session.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_end.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_END 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_error.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_ERROR 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_get_authtok.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_get_data.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GET_DATA 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_get_item.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GET_ITEM 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_get_user.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GET_USER 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_getenv.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GETENV 3 .Os .Sh NAME @@ -44,7 +44,7 @@ .Sh SYNOPSIS .In sys/types.h .In security/pam_appl.h -.Ft char * +.Ft const char * .Fn pam_getenv "pam_handle_t *pamh" "const char *name" .Sh DESCRIPTION The ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_getenvlist.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GETENVLIST 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_info.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_INFO 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_open_session.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_prompt.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_PROMPT 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_putenv.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_PUTENV 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_set_data.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SET_DATA 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_set_item.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SET_ITEM 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_setcred.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_setenv.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SETENV 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_authenticate.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_chauthtok.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_close_session.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_open_session.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_setcred.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_start.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_START 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_strerror.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_STRERROR 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_verror.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_VERROR 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_vinfo.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_VINFO 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_vprompt.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_VPROMPT 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/include/security/openpam_version.h#2 (text) ==== @@ -31,14 +31,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam_version.h#6 $ + * $P4: //depot/projects/openpam/include/security/openpam_version.h#7 $ */ #ifndef _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM -#define _OPENPAM_VERSION 20020630 -#define _OPENPAM_RELEASE "Citronella" +#define _OPENPAM_VERSION 20030502 +#define _OPENPAM_RELEASE "Dianthus" #endif ==== //depot/projects/hammer/contrib/openpam/include/security/pam_appl.h#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/include/security/pam_appl.h#10 $ + * $P4: //depot/projects/openpam/include/security/pam_appl.h#11 $ */ #ifndef _PAM_APPL_H_INCLUDED @@ -83,7 +83,7 @@ const char **_user, const char *_prompt); -char * +const char * pam_getenv(pam_handle_t *_pamh, const char *_name); ==== //depot/projects/hammer/contrib/openpam/include/security/pam_constants.h#3 (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/pam_constants.h#19 $ + * $P4: //depot/projects/openpam/include/security/pam_constants.h#20 $ */ #ifndef _PAM_CONSTANTS_H_INCLUDED @@ -97,7 +97,8 @@ * XSSO 5.4 */ enum { - PAM_SILENT = 0x80000000, + /* some compilers promote 0x8000000 to long */ + PAM_SILENT = (-0x7fffffff - 1), PAM_DISALLOW_NULL_AUTHTOK = 0x1, PAM_ESTABLISH_CRED = 0x1, PAM_DELETE_CRED = 0x2, ==== //depot/projects/hammer/contrib/openpam/lib/openpam_dispatch.c#3 (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_dispatch.c#18 $ + * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#19 $ */ #include <sys/param.h> @@ -59,6 +59,9 @@ { pam_chain_t *chain; int err, fail, r; +#ifdef DEBUG + int debug; +#endif ENTER(); if (pamh == NULL) @@ -96,8 +99,6 @@ /* execute */ for (err = fail = 0; chain != NULL; chain = chain->next) { - openpam_log(PAM_LOG_DEBUG, "calling %s() in %s", - _pam_sm_func_name[primitive], chain->module->path); if (chain->module->func[primitive] == NULL) { openpam_log(PAM_LOG_ERROR, "%s: no %s()", chain->module->path, _pam_sm_func_name[primitive]); @@ -105,12 +106,23 @@ } else { pamh->primitive = primitive; pamh->current = chain; +#ifdef DEBUG + debug = (openpam_get_option(pamh, "debug") != NULL); + if (debug) + ++_openpam_debug; + openpam_log(PAM_LOG_DEBUG, "calling %s() in %s", + _pam_sm_func_name[primitive], chain->module->path); +#endif r = (chain->module->func[primitive])(pamh, flags, chain->optc, (const char **)chain->optv); pamh->current = NULL; +#ifdef DEBUG openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s", chain->module->path, _pam_sm_func_name[primitive], pam_strerror(pamh, r)); + if (debug) + --_openpam_debug; +#endif } if (r == PAM_IGNORE) ==== //depot/projects/hammer/contrib/openpam/lib/openpam_impl.h#3 (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_impl.h#20 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#21 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -44,6 +44,8 @@ extern const char *_pam_err_name[PAM_NUM_ERRORS]; extern const char *_pam_item_name[PAM_NUM_ITEMS]; +extern int _openpam_debug; + /* * Control flags */ ==== //depot/projects/hammer/contrib/openpam/lib/openpam_log.c#3 (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_log.c#17 $ + * $P4: //depot/projects/openpam/lib/openpam_log.c#18 $ */ #include <ctype.h> @@ -45,6 +45,8 @@ #include "openpam_impl.h" +int _openpam_debug = 0; + #if defined(openpam_log) /* @@ -62,12 +64,10 @@ switch (level) { case PAM_LOG_DEBUG: -#ifndef DEBUG - return; -#else + if (!_openpam_debug) + return; priority = LOG_DEBUG; break; -#endif case PAM_LOG_VERBOSE: priority = LOG_INFO; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305022235.h42MZa8v050902>