Date: Mon, 2 Jun 2003 15:05:46 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 32422 for review Message-ID: <200306022205.h52M5kUB097676@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=32422 Change 32422 by peter@peter_daintree on 2003/06/02 15:05:37 IFC @32421 Affected files ... .. //depot/projects/hammer/bin/ed/Makefile#3 integrate .. //depot/projects/hammer/bin/ed/cbc.c#2 integrate .. //depot/projects/hammer/bin/ed/ed.h#2 integrate .. //depot/projects/hammer/contrib/openpam/CREDITS#4 integrate .. //depot/projects/hammer/contrib/openpam/HISTORY#5 integrate .. //depot/projects/hammer/contrib/openpam/LICENSE#3 integrate .. //depot/projects/hammer/contrib/openpam/MANIFEST#4 integrate .. //depot/projects/hammer/contrib/openpam/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/Makefile.inc#1 branch .. //depot/projects/hammer/contrib/openpam/RELNOTES#5 integrate .. //depot/projects/hammer/contrib/openpam/bin/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/bin/Makefile.inc#1 branch .. //depot/projects/hammer/contrib/openpam/bin/su/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/bin/su/su.c#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_borrow_cred.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_free_data.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_get_option.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_log.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_nullconv.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_readline.3#1 branch .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_restore_cred.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_set_option.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_ttyconv.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_acct_mgmt.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_authenticate.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_chauthtok.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_close_session.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_conv.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_end.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_error.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_authtok.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_data.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_item.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_user.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_getenv.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_getenvlist.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_info.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_open_session.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_prompt.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_putenv.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_set_data.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_set_item.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_setcred.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_setenv.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_authenticate.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_chauthtok.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_close_session.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_open_session.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_setcred.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_start.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_strerror.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_verror.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_vinfo.3#5 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_vprompt.3#5 integrate .. //depot/projects/hammer/contrib/openpam/include/security/openpam.h#3 integrate .. //depot/projects/hammer/contrib/openpam/include/security/openpam_version.h#4 integrate .. //depot/projects/hammer/contrib/openpam/include/security/pam_appl.h#4 integrate .. //depot/projects/hammer/contrib/openpam/include/security/pam_constants.h#5 integrate .. //depot/projects/hammer/contrib/openpam/include/security/pam_modules.h#3 integrate .. //depot/projects/hammer/contrib/openpam/include/security/pam_types.h#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_borrow_cred.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_configure.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_dispatch.c#5 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_dynamic.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_findenv.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_free_data.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_get_option.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_impl.h#5 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_load.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_log.c#5 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_nullconv.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_readline.c#1 branch .. //depot/projects/hammer/contrib/openpam/lib/openpam_restore_cred.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_set_option.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_static.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_ttyconv.c#6 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_acct_mgmt.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_authenticate.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_authenticate_secondary.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_chauthtok.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_close_session.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_end.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_error.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_get_authtok.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_get_data.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_get_item.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_get_mapped_authtok.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_get_mapped_username.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_get_user.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_getenv.c#5 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_getenvlist.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_info.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_open_session.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_prompt.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_putenv.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_set_data.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_set_item.c#5 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_set_mapped_authtok.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_set_mapped_username.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_setcred.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_setenv.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_acct_mgmt.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_authenticate.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_authenticate_secondary.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_chauthtok.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_close_session.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_get_mapped_username.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_open_session.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_set_mapped_username.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_sm_setcred.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_start.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_strerror.c#4 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_verror.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_vinfo.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_vprompt.c#4 integrate .. //depot/projects/hammer/contrib/openpam/misc/gendoc.pl#4 integrate .. //depot/projects/hammer/contrib/openpam/modules/Makefile#4 integrate .. //depot/projects/hammer/contrib/openpam/modules/pam_deny/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/modules/pam_deny/pam_deny.c#3 integrate .. //depot/projects/hammer/contrib/openpam/modules/pam_permit/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/modules/pam_permit/pam_permit.c#3 integrate .. //depot/projects/hammer/contrib/openpam/modules/pam_unix/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/modules/pam_unix/pam_unix.c#4 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#11 integrate .. //depot/projects/hammer/etc/mtree/BSD.local.dist#6 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#6 integrate .. //depot/projects/hammer/etc/rc.d/mountcritlocal#4 integrate .. //depot/projects/hammer/etc/rc.d/mountcritremote#5 integrate .. //depot/projects/hammer/gnu/lib/csu/Makefile#3 integrate .. //depot/projects/hammer/gnu/lib/libobjc/Makefile#4 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#10 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#6 integrate .. //depot/projects/hammer/lib/libalias/alias.h#2 integrate .. //depot/projects/hammer/lib/libalias/alias_db.c#2 integrate .. //depot/projects/hammer/lib/libalias/libalias.3#2 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#8 integrate .. //depot/projects/hammer/lib/libc/gen/dlinfo.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/fpclassify.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/fts.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/isgreater.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/wordexp.3#3 integrate .. //depot/projects/hammer/lib/libc/gmon/gmon.c#5 integrate .. //depot/projects/hammer/lib/libc/i386/gen/ldexp.c#2 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/makecontext.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#9 integrate .. //depot/projects/hammer/lib/libc/locale/gbk.c#1 branch .. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/grantpt.3#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/hammer/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/hammer/lib/libc_r/test/Makefile#2 integrate .. //depot/projects/hammer/lib/libc_r/test/guard_b.c#2 integrate .. //depot/projects/hammer/lib/libcrypt/Makefile#3 integrate .. //depot/projects/hammer/lib/libcrypt/crypt-md5.c#2 integrate .. //depot/projects/hammer/lib/libcrypt/crypt-nthash.c#1 branch .. //depot/projects/hammer/lib/libcrypt/crypt.3#3 integrate .. //depot/projects/hammer/lib/libcrypt/crypt.c#2 integrate .. //depot/projects/hammer/lib/libcrypt/crypt.h#2 integrate .. //depot/projects/hammer/lib/libgeom/geom_ctl.c#3 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.h#4 integrate .. //depot/projects/hammer/lib/libpam/libpam/Makefile#8 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_ftp/Makefile#3 delete .. //depot/projects/hammer/lib/libpam/modules/pam_ftp/pam_ftp.8#3 delete .. //depot/projects/hammer/lib/libpam/modules/pam_ftp/pam_ftp.c#2 delete .. //depot/projects/hammer/lib/libpam/modules/pam_wheel/Makefile#3 delete .. //depot/projects/hammer/lib/libpam/modules/pam_wheel/pam_wheel.8#4 delete .. //depot/projects/hammer/lib/libpam/modules/pam_wheel/pam_wheel.c#4 delete .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_curthread.S#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_detach.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#8 integrate .. //depot/projects/hammer/lib/libugidfw/bsde_get_rule.3#2 integrate .. //depot/projects/hammer/lib/libugidfw/bsde_get_rule_count.3#2 integrate .. //depot/projects/hammer/lib/libugidfw/bsde_parse_rule.3#2 integrate .. //depot/projects/hammer/lib/libugidfw/bsde_rule_to_string.3#2 integrate .. //depot/projects/hammer/lib/libugidfw/libugidfw.3#2 integrate .. //depot/projects/hammer/libexec/ftpd/ftpchroot.5#2 integrate .. //depot/projects/hammer/libexec/rpc.rstatd/rstat_proc.c#6 integrate .. //depot/projects/hammer/libexec/rpc.rusersd/rusers_proc.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.1#6 integrate .. //depot/projects/hammer/libexec/tcpd/Makefile#2 integrate .. //depot/projects/hammer/release/Makefile#26 integrate .. //depot/projects/hammer/release/alpha/drivers.conf#11 integrate .. //depot/projects/hammer/release/i386/drivers.conf#11 integrate .. //depot/projects/hammer/release/pc98/drivers.conf#8 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#8 integrate .. //depot/projects/hammer/sbin/bsdlabel/runtest.sh#3 integrate .. //depot/projects/hammer/sbin/ccdconfig/Makefile#3 integrate .. //depot/projects/hammer/sbin/ccdconfig/ccdconfig.c#4 integrate .. //depot/projects/hammer/sbin/gbde/gbde.c#6 integrate .. //depot/projects/hammer/sbin/gpt/gpt.8#2 integrate .. //depot/projects/hammer/sbin/ping/ping.c#11 integrate .. //depot/projects/hammer/sbin/sunlabel/sunlabel.c#4 integrate .. //depot/projects/hammer/secure/lib/Makefile#6 integrate .. //depot/projects/hammer/secure/lib/libcrypt/blowfish.c#2 integrate .. //depot/projects/hammer/secure/lib/libcrypt/blowfish.h#2 integrate .. //depot/projects/hammer/secure/lib/libcrypt/crypt-blowfish.c#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile#6 integrate .. //depot/projects/hammer/secure/usr.bin/bdes/Makefile#2 integrate .. //depot/projects/hammer/secure/usr.bin/bdes/bdes.1#3 integrate .. //depot/projects/hammer/secure/usr.bin/bdes/bdes.c#3 integrate .. //depot/projects/hammer/share/colldef/Makefile#4 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#9 integrate .. //depot/projects/hammer/share/man/man4/en.4#1 branch .. //depot/projects/hammer/share/man/man4/mac.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_biba.4#3 integrate .. //depot/projects/hammer/share/man/man4/mac_bsdextended.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_ifoff.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_lomac.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_mls.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_none.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_partition.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_seeotheruids.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac_test.4#4 integrate .. //depot/projects/hammer/share/man/man4/raid.4#4 integrate .. //depot/projects/hammer/share/man/man4/sem.4#2 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#12 integrate .. //depot/projects/hammer/share/man/man7/maclabel.7#4 integrate .. //depot/projects/hammer/share/man/man9/VFS_SET.9#4 integrate .. //depot/projects/hammer/share/man/man9/VFS_VGET.9#4 integrate .. //depot/projects/hammer/share/man/man9/devclass.9#3 integrate .. //depot/projects/hammer/share/man/man9/devclass_find.9#3 integrate .. //depot/projects/hammer/share/man/man9/ktr.9#4 integrate .. //depot/projects/hammer/share/man/man9/namei.9#4 integrate .. //depot/projects/hammer/share/man/man9/rtalloc.9#3 integrate .. //depot/projects/hammer/share/mk/bsd.sys.mk#8 integrate .. //depot/projects/hammer/share/mk/sys.mk#5 integrate .. //depot/projects/hammer/share/mklocale/Makefile#4 integrate .. //depot/projects/hammer/share/mklocale/zh_CN.GBK.src#1 branch .. //depot/projects/hammer/sys/amd64/amd64/trap.c#23 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#17 integrate .. //depot/projects/hammer/sys/amd64/include/asm.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/setjmp.h#8 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/boot0.s#2 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#9 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#8 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#9 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#4 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#5 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#8 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#8 integrate .. //depot/projects/hammer/sys/dev/ccd/ccd.c#8 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#17 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#7 integrate .. //depot/projects/hammer/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#1 branch .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.h#1 branch .. //depot/projects/hammer/sys/dev/syscons/scmouse.c#5 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde.c#9 integrate .. //depot/projects/hammer/sys/geom/geom.h#17 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#19 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.c#10 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.h#4 integrate .. //depot/projects/hammer/sys/geom/geom_ext.h#2 delete .. //depot/projects/hammer/sys/geom/geom_subr.c#14 integrate .. //depot/projects/hammer/sys/geom/geom_sunlabel.c#14 integrate .. //depot/projects/hammer/sys/i386/acpica/OsdEnvironment.c#5 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#8 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#8 integrate .. //depot/projects/hammer/sys/i386/bios/apm.c#2 integrate .. //depot/projects/hammer/sys/i386/bios/mca_machdep.c#2 integrate .. //depot/projects/hammer/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/hammer/sys/i386/bios/smapi_bios.S#2 integrate .. //depot/projects/hammer/sys/i386/bios/smbios.c#2 integrate .. //depot/projects/hammer/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#12 integrate .. //depot/projects/hammer/sys/i386/i386/atomic.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/autoconf.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/bios.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/critical.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/db_disasm.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/db_interface.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/db_trace.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/dump_machdep.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/elf_machdep.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/genassym.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/i386-gdbstub.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/i686_mem.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/initcpu.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#16 integrate .. //depot/projects/hammer/sys/i386/i386/math_emulate.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/mem.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/mp_clock.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/mpapic.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/nexus.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/perfmon.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/sys_machdep.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#14 integrate .. //depot/projects/hammer/sys/i386/i386/tsc.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/vm86.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_errno.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_fcntl.c#4 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_ioctl.c#4 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_ipc.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#4 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_msg.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_other.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_signal.c#7 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_stat.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysi86.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_util.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix.c#4 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/hammer/sys/i386/ibcs2/imgact_coff.c#5 integrate .. //depot/projects/hammer/sys/i386/include/asm.h#4 integrate .. //depot/projects/hammer/sys/i386/include/profile.h#4 integrate .. //depot/projects/hammer/sys/i386/isa/asc.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#9 integrate .. //depot/projects/hammer/sys/i386/isa/cronyx.c#2 integrate .. //depot/projects/hammer/sys/i386/isa/ctx.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/cx.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/cy.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/elink.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/gpib.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/gsc.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/if_cx.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/if_el.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/if_le.c#7 integrate .. //depot/projects/hammer/sys/i386/isa/if_rdp.c#6 integrate .. //depot/projects/hammer/sys/i386/isa/intr_machdep.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/isa.c#2 integrate .. //depot/projects/hammer/sys/i386/isa/isa_compat.c#2 integrate .. //depot/projects/hammer/sys/i386/isa/isa_dma.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/istallion.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/ithread.c#2 integrate .. //depot/projects/hammer/sys/i386/isa/loran.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/mse.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#10 integrate .. //depot/projects/hammer/sys/i386/isa/pcaudio.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/pcf.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/pmtimer.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/hammer/sys/i386/isa/spic.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/spigot.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/spkr.c#7 integrate .. //depot/projects/hammer/sys/i386/isa/stallion.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/vesa.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/wt.c#4 integrate .. //depot/projects/hammer/sys/i386/linux/imgact_linux.c#6 integrate .. //depot/projects/hammer/sys/i386/linux/linux_dummy.c#3 integrate .. //depot/projects/hammer/sys/i386/linux/linux_genassym.c#3 integrate .. //depot/projects/hammer/sys/i386/linux/linux_machdep.c#10 integrate .. //depot/projects/hammer/sys/i386/linux/linux_ptrace.c#6 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#5 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#10 integrate .. //depot/projects/hammer/sys/i386/pci/pci_bus.c#10 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#10 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#18 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#8 integrate .. //depot/projects/hammer/sys/kern/init_main.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#27 integrate .. //depot/projects/hammer/sys/modules/sound/driver/au88x0/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_media.h#4 integrate .. //depot/projects/hammer/sys/netinet/ip_encap.c#4 integrate .. //depot/projects/hammer/sys/pc98/pc98/clock.c#7 integrate .. //depot/projects/hammer/sys/pc98/pc98/fd.c#8 integrate .. //depot/projects/hammer/sys/pc98/pc98/ppc.c#3 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#8 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#12 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/ofw_machdep.c#4 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#14 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#15 integrate .. //depot/projects/hammer/sys/sys/ccdvar.h#3 integrate .. //depot/projects/hammer/sys/sys/filedesc.h#4 integrate .. //depot/projects/hammer/sys/sys/param.h#13 integrate .. //depot/projects/hammer/sys/sys/proc.h#24 integrate .. //depot/projects/hammer/sys/sys/sem.h#3 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#13 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#22 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#10 integrate .. //depot/projects/hammer/tools/regression/ccd/layout/ccd.sh#2 integrate .. //depot/projects/hammer/usr.bin/checknr/checknr.c#2 integrate .. //depot/projects/hammer/usr.bin/env/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/env/env.1#1 branch .. //depot/projects/hammer/usr.bin/lorder/lorder.sh#3 integrate .. //depot/projects/hammer/usr.bin/mklocale/yacc.y#4 integrate .. //depot/projects/hammer/usr.bin/printenv/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/printenv/printenv.1#3 integrate .. //depot/projects/hammer/usr.bin/stat/stat.1#5 integrate .. //depot/projects/hammer/usr.sbin/chroot/chroot.c#3 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#4 integrate .. //depot/projects/hammer/usr.sbin/sendmail/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#8 integrate Differences ... ==== //depot/projects/hammer/bin/ed/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.22 2003/05/19 15:51:58 des Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.23 2003/06/02 19:06:28 markm Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c @@ -8,8 +8,8 @@ .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) DISTRIBUTION=crypto CFLAGS+=-DDES -DPADD= ${LIBCIPHER} -LDADD= -lcipher +DPADD= ${LIBCRYPTO} +LDADD= -lcrypto .endif .include <bsd.prog.mk> ==== //depot/projects/hammer/bin/ed/cbc.c#2 (text+ko) ==== @@ -36,13 +36,15 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.17 2002/07/31 16:49:01 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.18 2003/06/02 19:06:28 markm Exp $"); #include <sys/types.h> #include <errno.h> #include <pwd.h> #ifdef DES #include <time.h> +#include <openssl/des.h> +#define ED_DES_INCLUDES #endif #include "ed.h" @@ -56,12 +58,9 @@ #define MEMZERO(dest,len) memset((dest), 0, (len)) /* Hide the calls to the primitive encryption routines. */ -#define DES_KEY(buf) \ - if (des_setkey(buf)) \ - des_error("des_setkey"); #define DES_XFORM(buf) \ - if (des_cipher((char *)buf, (char *)buf, 0L, inverse ? -1 : 1)) \ - des_error("des_cipher"); + DES_ecb_encrypt(buf, buf, &schedule, \ + inverse ? DES_DECRYPT : DES_ENCRYPT); /* * read/write - no error checking @@ -70,15 +69,6 @@ #define WRITE(buf, n, fp) fwrite(buf, sizeof(char), n, fp) /* - * some things to make references easier - */ -typedef char Desbuf[8]; -#define CHAR(x,i) (x[i]) -#define UCHAR(x,i) (x[i]) -#define BUFFER(x) (x) -#define UBUFFER(x) (x) - -/* * global variables and related macros */ @@ -86,18 +76,21 @@ MODE_ENCRYPT, MODE_DECRYPT, MODE_AUTHENTICATE } mode = MODE_ENCRYPT; -Desbuf ivec; /* initialization vector */ -Desbuf pvec; /* padding vector */ +DES_cblock ivec; /* initialization vector */ +DES_cblock pvec; /* padding vector */ + char bits[] = { /* used to extract bits from a char */ '\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001' }; + int pflag; /* 1 to preserve parity bits */ +DES_key_schedule schedule; /* expanded DES key */ + unsigned char des_buf[8]; /* shared buffer for get_des_char/put_des_char */ int des_ct = 0; /* count for get_des_char/put_des_char */ int des_n = 0; /* index for put_des_char/get_des_char */ - /* init_des_cipher: initialize DES */ void init_des_cipher(void) @@ -112,7 +105,7 @@ /* initialize the padding vector */ for (i = 0; i < 8; i++) - CHAR(pvec, i) = (char) (arc4random() % 256); + pvec[i] = (char) (arc4random() % 256); #endif } @@ -172,7 +165,7 @@ get_keyword(void) { char *p; /* used to obtain the key */ - Desbuf msgbuf; /* I/O buffer */ + DES_cblock msgbuf; /* I/O buffer */ /* * get the key @@ -182,9 +175,9 @@ /* * copy it, nul-padded, into the key area */ - expand_des_key(BUFFER(msgbuf), p); + expand_des_key(msgbuf, p); MEMZERO(p, _PASSWORD_LEN); - set_des_key(msgbuf); + set_des_key(&msgbuf); MEMZERO(msgbuf, sizeof msgbuf); return 1; } @@ -303,7 +296,7 @@ * DES ignores the low order bit of each character. */ void -set_des_key(Desbuf buf) /* key block */ +set_des_key(DES_cblock *buf) /* key block */ { int i, j; /* counter in a for loop */ int par; /* parity counter */ @@ -315,16 +308,17 @@ for (i = 0; i < 8; i++) { par = 0; for (j = 1; j < 8; j++) - if ((bits[j]&UCHAR(buf, i)) != 0) + if ((bits[j] & (*buf)[i]) != 0) par++; - if ((par&01) == 01) - UCHAR(buf, i) = UCHAR(buf, i)&0177; + if ((par & 0x01) == 0x01) + (*buf)[i] &= 0x7f; else - UCHAR(buf, i) = (UCHAR(buf, i)&0177)|0200; + (*buf)[i] = ((*buf)[i] & 0x7f) | 0x80; } } - DES_KEY(UBUFFER(buf)); + DES_set_odd_parity(buf); + DES_set_key(buf, &schedule); } @@ -341,10 +335,10 @@ */ if (n == 8) { for (n = 0; n < 8; n++) - CHAR(msgbuf, n) ^= CHAR(ivec, n); - DES_XFORM(UBUFFER(msgbuf)); - MEMCPY(BUFFER(ivec), BUFFER(msgbuf), 8); - return WRITE(BUFFER(msgbuf), 8, fp); + msgbuf[n] ^= ivec[n]; + DES_XFORM((DES_cblock *)msgbuf); + MEMCPY(ivec, msgbuf, 8); + return WRITE(msgbuf, 8, fp); } /* * at EOF or last block -- in either case, the last byte contains @@ -356,12 +350,12 @@ /* * Pad the last block randomly */ - (void)MEMCPY(BUFFER(msgbuf + n), BUFFER(pvec), 8 - n); - CHAR(msgbuf, 7) = n; + (void)MEMCPY(msgbuf + n, pvec, 8 - n); + msgbuf[7] = n; for (n = 0; n < 8; n++) - CHAR(msgbuf, n) ^= CHAR(ivec, n); - DES_XFORM(UBUFFER(msgbuf)); - return WRITE(BUFFER(msgbuf), 8, fp); + msgbuf[n] ^= ivec[n]; + DES_XFORM((DES_cblock *)msgbuf); + return WRITE(msgbuf, 8, fp); } /* @@ -372,25 +366,25 @@ int cbc_decode(unsigned char *msgbuf, FILE *fp) { - Desbuf tbuf; /* temp buffer for initialization vector */ + DES_cblock tbuf; /* temp buffer for initialization vector */ int n; /* number of bytes actually read */ int c; /* used to test for EOF */ int inverse = 1; /* 0 to encrypt, 1 to decrypt */ - if ((n = READ(BUFFER(msgbuf), 8, fp)) == 8) { + if ((n = READ(msgbuf, 8, fp)) == 8) { /* * do the transformation */ - MEMCPY(BUFFER(tbuf), BUFFER(msgbuf), 8); - DES_XFORM(UBUFFER(msgbuf)); + MEMCPY(tbuf, msgbuf, 8); + DES_XFORM((DES_cblock *)msgbuf); for (c = 0; c < 8; c++) - UCHAR(msgbuf, c) ^= UCHAR(ivec, c); - MEMCPY(BUFFER(ivec), BUFFER(tbuf), 8); + msgbuf[c] ^= ivec[c]; + MEMCPY(ivec, tbuf, 8); /* * if the last one, handle it specially */ if ((c = fgetc(fp)) == EOF) { - n = CHAR(msgbuf, 7); + n = msgbuf[7]; if (n < 0 || n > 7) { des_error("decryption failed (block corrupted)"); return EOF; ==== //depot/projects/hammer/bin/ed/ed.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * @(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp - * $FreeBSD: src/bin/ed/ed.h,v 1.18 2002/07/31 16:49:01 markm Exp $ + * $FreeBSD: src/bin/ed/ed.h,v 1.19 2003/06/02 19:06:28 markm Exp $ */ #include <sys/param.h> @@ -175,6 +175,18 @@ /* NEWLINE_TO_NUL: overwrite newlines with ASCII NULs */ #define NEWLINE_TO_NUL(s, l) translit_text(s, l, '\n', '\0') +#ifdef ED_DES_INCLUDES +void des_error(const char *); +void expand_des_key(char *, char *); +void set_des_key(DES_cblock *); +#endif + +/* Other DES support stuff */ +void init_des_cipher(void); +int flush_des_file(FILE *); +int get_des_char(FILE *); +int put_des_char(int, FILE *); + /* Local Function Declarations */ void add_line_node(line_t *); int append_lines(long); @@ -188,21 +200,17 @@ int close_sbuf(void); int copy_lines(long); int delete_lines(long, long); -void des_error(const char *); int display_lines(long, long, int); line_t *dup_line_node(line_t *); int exec_command(void); long exec_global(int, int); -void expand_des_key(char *, char *); int extract_addr_range(void); char *extract_pattern(int); int extract_subst_tail(int *, long *); char *extract_subst_template(void); int filter_lines(long, long, char *); -int flush_des_file(FILE *); line_t *get_addressed_line_node(long); pattern_t *get_compiled_pattern(void); -int get_des_char(FILE *); char *get_extended_line(int *, int); char *get_filename(void); int get_keyword(void); @@ -219,7 +227,6 @@ int has_trailing_escape(char *, char *); int hex_to_binary(int, int); void init_buffers(void); -void init_des_cipher(void); int is_legal_filename(char *); int join_lines(long, long); int mark_line_node(line_t *, int); @@ -230,7 +237,6 @@ char *parse_char_class(char *); int pop_undo_stack(void); undo_t *push_undo_stack(int, long, long); -int put_des_char(int, FILE *); const char *put_sbuf_line(const char *); int put_stream_line(FILE *, const char *, int); int put_tty_line(const char *, int, long, int); @@ -239,7 +245,6 @@ long read_stream(FILE *, long); int search_and_replace(pattern_t *, int, int); int set_active_node(line_t *); -void set_des_key(char *); void signal_hup(int); void signal_int(int); char *strip_escapes(char *); ==== //depot/projects/hammer/contrib/openpam/CREDITS#4 (text) ==== @@ -14,15 +14,17 @@ Andrew Morgan <morgan@transmeta.com> Brian Fundakowski Feldman <green@freebsd.org> Darren J. Moffat <Darren.Moffat@sun.com> + Dmitry V. Levin <ldv@altlinux.org> Eric Melville <eric@freebsd.org> Gary Winiger <Gary.Winiger@sun.com> Joe Marcus Clarke <marcus@marcuscom.com> Juli Mallett <jmallett@freebsd.org> Mark Murray <markm@freebsd.org> + Mike Petullo <mike@flyn.org> Mikko Työläjärvi <mbsd@pacbell.net> Robert Watson <rwatson@freebsd.org> Ruslan Ermilov <ru@freebsd.org> Solar Designer <solar@openwall.com> Takanori Saneto <sanewo@ba2.so-net.ne.jp> -$P4: //depot/projects/openpam/CREDITS#6 $ +$P4: //depot/projects/openpam/CREDITS#8 $ ==== //depot/projects/hammer/contrib/openpam/HISTORY#5 (text) ==== @@ -1,3 +1,22 @@ +OpenPAM Digitalis 2003-06-01 + + - ENHANCE: Completely rewrite the configuration parser and add + support for the "include" control flag. + + - ENHANCE: Improve portability to NetBSD, OpenBSD and Linux. + + - ENHANCE: Lots of additional paranoia. + + - BUGFIX: The sample su(1) application dropped privileges before + forking instead of after. + + - ENHANCE: Document openpam_log(3). + + - ENHANCE: Other minor documentation fixes. + +Thanks to Dmitry V. Levin <ldv@altlinux.org> for considerable +assistance with this release. +============================================================================ OpenPAM Dianthus 2003-05-02 - BUGFIX: Initialize some potentially uninitialized variables. @@ -223,4 +242,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#18 $ +$P4: //depot/projects/openpam/HISTORY#19 $ ==== //depot/projects/hammer/contrib/openpam/LICENSE#3 (text) ==== @@ -1,5 +1,5 @@ -Copyright (c) 2002 Networks Associates Technology, Inc. +Copyright (c) 2002-2003 Networks Associates Technology, Inc. All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,4 +31,4 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$P4: //depot/projects/openpam/LICENSE#5 $ +$P4: //depot/projects/openpam/LICENSE#6 $ ==== //depot/projects/hammer/contrib/openpam/MANIFEST#4 (text) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/openpam/MANIFEST#13 $ +# $P4: //depot/projects/openpam/MANIFEST#16 $ # CREDITS HISTORY @@ -7,9 +7,11 @@ LICENSE MANIFEST Makefile +Makefile.inc README RELNOTES bin/Makefile +bin/Makefile.inc bin/su/Makefile bin/su/su.c doc/Makefile @@ -21,6 +23,7 @@ doc/man/openpam_get_option.3 doc/man/openpam_log.3 doc/man/openpam_nullconv.3 +doc/man/openpam_readline.3 doc/man/openpam_restore_cred.3 doc/man/openpam_set_option.3 doc/man/openpam_ttyconv.3 @@ -76,6 +79,7 @@ lib/openpam_load.c lib/openpam_log.c lib/openpam_nullconv.c +lib/openpam_readline.c lib/openpam_restore_cred.c lib/openpam_set_option.c lib/openpam_static.c ==== //depot/projects/hammer/contrib/openpam/Makefile#3 (text) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/Makefile#7 $ +# $P4: //depot/projects/openpam/Makefile#8 $ # SUBDIR = ==== //depot/projects/hammer/contrib/openpam/RELNOTES#5 (text) ==== @@ -1,13 +1,18 @@ - Release notes for OpenPAM Dianthus - ================================== + Release notes for OpenPAM Digitalis + =================================== -This is a maintenance release incorporating a number of minor patches -accumulated since the previous release. +This release incorporates several major changes and improvements and +should be considered BETA QUALITY. This release corresponds to the code used in FreeBSD-CURRENT as of the -release date. It may or may not build on other platforms; previous -releases have been built on NetBSD and (with partial success) MacOS X. +release date. It is also known to build cleanly on NetBSD 1.6, +OpenBSD 3.1, and a number of glibc-based Linux platforms (with BSD +make installed). It may or may not build on other platforms; you will +need a BSD-compatible make(1) (NetBSD's make(1) is easy to port to +most POSIX platforms). Previous versions were successfully built on +MacOS X 10.1, but there seem to be issues with the heavily modified +version of GCC 3.1 that ships with MacOS X 10.2. The library itself is complete. Documentation exists in the form of man pages for the library functions. These man pages are generated by @@ -26,4 +31,4 @@ Please direct bug reports and inquiries to des@freebsd.org. -$P4: //depot/projects/openpam/RELNOTES#15 $ +$P4: //depot/projects/openpam/RELNOTES#18 $ ==== //depot/projects/hammer/contrib/openpam/bin/Makefile#3 (text) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/bin/Makefile#6 $ +# $P4: //depot/projects/openpam/bin/Makefile#7 $ # SUBDIR = ==== //depot/projects/hammer/contrib/openpam/bin/su/Makefile#3 (text) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2002 Networks Associates Technology, Inc. +# Copyright (c) 2002-2003 Networks Associates Technology, Inc. # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS @@ -32,13 +32,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/bin/su/Makefile#5 $ +# $P4: //depot/projects/openpam/bin/su/Makefile#8 $ # PROG = su WARNS ?= 4 CFLAGS += -I${.CURDIR}/../../include -DPADD = ${.OBJDIR}/../../lib/libpam.so +DPADD = ${.OBJDIR}/../../lib/libpam.a LDADD = -L${.OBJDIR}/../../lib -R${.OBJDIR}/../../lib -lpam NOMAN = YES ==== //depot/projects/hammer/contrib/openpam/bin/su/su.c#3 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002-2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -31,13 +31,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/bin/su/su.c#8 $ + * $P4: //depot/projects/openpam/bin/su/su.c#12 $ */ #include <sys/param.h> #include <sys/wait.h> #include <err.h> +#include <grp.h> #include <pwd.h> #include <stdio.h> #include <stdlib.h> @@ -81,9 +82,17 @@ argc -= optind; argv += optind; + if (argc > 0) { + user = *argv; + --argc; + ++argv; + } else { + user = "root"; + } + /* initialize PAM */ pamc.conv = &openpam_ttyconv; - pam_start("su", argc ? *argv : "root", &pamc, &pamh); + pam_start("su", user, &pamc, &pamh); /* set some items */ gethostname(hostname, sizeof(hostname)); @@ -117,20 +126,6 @@ if (pam_err != PAM_SUCCESS || (pwd = getpwnam(user)) == NULL) goto pamerr; - /* set uid and groups */ - if (initgroups(pwd->pw_name, pwd->pw_gid) == -1) { - warn("initgroups()"); - goto err; - } - if (setgid(pwd->pw_gid) == -1) { - warn("setgid()"); - goto err; - } - if (setuid(pwd->pw_uid) == -1) { - warn("setuid()"); - goto err; - } - /* export PAM environment */ if ((pam_envlist = pam_getenvlist(pamh)) != NULL) { for (pam_env = pam_envlist; *pam_env != NULL; ++pam_env) { @@ -154,7 +149,21 @@ warn("fork()"); goto err; case 0: - /* child: start a shell */ + /* child: give up privs and start a shell */ + >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306022205.h52M5kUB097676>