PERFORCE change 32617 for review

Robert Watson rwatson at FreeBSD.org
Thu Jun 5 06:12:13 GMT 2003


http://perforce.freebsd.org/chv.cgi?CH=32617

Change 32617 by rwatson at rwatson_tislabs on 2003/06/04 23:11:40

	Integ the TrustedBSD base branch to bring in various 5.1-RELEASE
	and post-5.1-RELEASE changes:
	
	OpenPAM Update
	More amd64 bits
	Threading bugfixes
	Extended attribute list operation changes

Affected files ...

.. //depot/projects/trustedbsd/base/MAINTAINERS#16 integrate
.. //depot/projects/trustedbsd/base/bin/df/df.1#5 integrate
.. //depot/projects/trustedbsd/base/bin/df/df.c#15 integrate
.. //depot/projects/trustedbsd/base/bin/ed/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/bin/ed/cbc.c#5 integrate
.. //depot/projects/trustedbsd/base/bin/ed/ed.h#5 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/CREDITS#8 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/LICENSE#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/MANIFEST#12 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/base/contrib/openpam/bin/su/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/bin/su/su.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.3#8 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_borrow_cred.3#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_data.3#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_nullconv.3#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_readline.3#1 branch
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_restore_cred.3#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#16 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_conv.3#5 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#15 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#15 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#15 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam.h#12 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam_version.h#8 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_appl.h#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_constants.h#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_modules.h#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_types.h#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_borrow_cred.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_configure.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dispatch.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dynamic.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_findenv.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_free_data.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_get_option.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_impl.h#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_load.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_log.c#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_nullconv.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_readline.c#1 branch
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_restore_cred.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_set_option.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_static.c#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#14 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_acct_mgmt.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate_secondary.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_chauthtok.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_close_session.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_end.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_error.c#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_authtok.c#13 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_data.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_item.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_authtok.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_username.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_user.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenv.c#13 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenvlist.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_info.c#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_open_session.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_prompt.c#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_putenv.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_data.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_item.c#12 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_authtok.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_username.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setcred.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setenv.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_acct_mgmt.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate_secondary.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_chauthtok.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_close_session.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_username.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_open_session.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_username.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_setcred.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_start.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_strerror.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_verror.c#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vinfo.c#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vprompt.c#12 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/misc/gendoc.pl#12 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/modules/Makefile#10 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/pam_deny.c#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/pam_permit.c#9 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/pam_unix.c#6 integrate
.. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#26 integrate
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#14 integrate
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#24 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/mountcritlocal#5 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/mountcritremote#6 integrate
.. //depot/projects/trustedbsd/base/gnu/lib/csu/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/gnu/lib/libobjc/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/gnu/lib/libstdc++/Makefile#12 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#13 integrate
.. //depot/projects/trustedbsd/base/lib/Makefile#19 integrate
.. //depot/projects/trustedbsd/base/lib/csu/i386-elf/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/lib/libalias/alias.h#3 integrate
.. //depot/projects/trustedbsd/base/lib/libalias/alias_db.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libalias/libalias.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/_setjmp.S#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/setjmp.S#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/sigsetjmp.S#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/dlinfo.3#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/fpclassify.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/fts.3#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/isgreater.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/wordexp.3#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gmon/gmon.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc/i386/gen/ldexp.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/makecontext.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#13 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/gbk.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/setrunelocale.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdlib/grantpt.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#12 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/extattr_get_file.2#7 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/kldload.2#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/lio_listio.2#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/arch/amd64/_atomic_lock.S#1 branch
.. //depot/projects/trustedbsd/base/lib/libc_r/test/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/test/guard_b.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/test/join_leak_d.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/test/mutex_d.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/uthread/pthread_private.h#14 integrate
.. //depot/projects/trustedbsd/base/lib/libcrypt/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/lib/libcrypt/crypt-md5.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libcrypt/crypt-nthash.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libcrypt/crypt.3#5 integrate
.. //depot/projects/trustedbsd/base/lib/libcrypt/crypt.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libcrypt/crypt.h#3 integrate
.. //depot/projects/trustedbsd/base/lib/libgeom/geom_ctl.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libgeom/libgeom.h#5 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/libpam/Makefile#20 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ftp/Makefile#5 delete
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ftp/pam_ftp.8#3 delete
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ftp/pam_ftp.c#8 delete
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_wheel/Makefile#5 delete
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_wheel/pam_wheel.8#4 delete
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_wheel/pam_wheel.c#9 delete
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_create.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_init.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigprocmask.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/i386/_curthread.S#2 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_detach.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#3 integrate
.. //depot/projects/trustedbsd/base/lib/libugidfw/bsde_get_rule.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libugidfw/bsde_get_rule_count.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libugidfw/bsde_parse_rule.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libugidfw/bsde_rule_to_string.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libugidfw/libugidfw.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libwrap/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/libexec/ftpd/ftpchroot.5#2 integrate
.. //depot/projects/trustedbsd/base/libexec/rpc.rstatd/rstat_proc.c#8 integrate
.. //depot/projects/trustedbsd/base/libexec/rpc.rusersd/rusers_proc.c#4 integrate
.. //depot/projects/trustedbsd/base/libexec/rtld-elf/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.1#9 integrate
.. //depot/projects/trustedbsd/base/libexec/tcpd/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/release/Makefile#44 integrate
.. //depot/projects/trustedbsd/base/release/alpha/drivers.conf#13 integrate
.. //depot/projects/trustedbsd/base/release/i386/drivers.conf#15 integrate
.. //depot/projects/trustedbsd/base/release/pc98/drivers.conf#11 integrate
.. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.c#5 integrate
.. //depot/projects/trustedbsd/base/sbin/bsdlabel/runtest.sh#3 integrate
.. //depot/projects/trustedbsd/base/sbin/ccdconfig/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sbin/ccdconfig/ccdconfig.c#6 integrate
.. //depot/projects/trustedbsd/base/sbin/gbde/gbde.c#8 integrate
.. //depot/projects/trustedbsd/base/sbin/gpt/gpt.8#2 integrate
.. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#15 integrate
.. //depot/projects/trustedbsd/base/sbin/ping/ping.c#18 integrate
.. //depot/projects/trustedbsd/base/sbin/sunlabel/sunlabel.c#3 integrate
.. //depot/projects/trustedbsd/base/secure/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/secure/lib/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/secure/lib/libcipher/Makefile#3 delete
.. //depot/projects/trustedbsd/base/secure/lib/libcipher/README#2 delete
.. //depot/projects/trustedbsd/base/secure/lib/libcipher/README.FreeBSD#2 delete
.. //depot/projects/trustedbsd/base/secure/lib/libcipher/cipher.3#2 delete
.. //depot/projects/trustedbsd/base/secure/lib/libcipher/crypt.c#4 delete
.. //depot/projects/trustedbsd/base/secure/lib/libcipher/test/Makefile#2 delete
.. //depot/projects/trustedbsd/base/secure/lib/libcipher/test/README#2 delete
.. //depot/projects/trustedbsd/base/secure/lib/libcipher/test/cert.c#2 delete
.. //depot/projects/trustedbsd/base/secure/lib/libcipher/test/cert.input#2 delete
.. //depot/projects/trustedbsd/base/secure/lib/libcipher/test/speedcrypt.c#2 delete
.. //depot/projects/trustedbsd/base/secure/lib/libcipher/test/speeddes.c#2 delete
.. //depot/projects/trustedbsd/base/secure/lib/libcrypt/blowfish.c#3 integrate
.. //depot/projects/trustedbsd/base/secure/lib/libcrypt/blowfish.h#3 integrate
.. //depot/projects/trustedbsd/base/secure/lib/libcrypt/crypt-blowfish.c#3 integrate
.. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile#16 integrate
.. //depot/projects/trustedbsd/base/secure/usr.bin/bdes/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/secure/usr.bin/bdes/bdes.1#3 integrate
.. //depot/projects/trustedbsd/base/secure/usr.bin/bdes/bdes.c#3 integrate
.. //depot/projects/trustedbsd/base/share/colldef/Makefile#11 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/Makefile#32 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#7 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/cd.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/en.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/mac.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/mac_biba.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/mac_bsdextended.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/mac_ifoff.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/mac_lomac.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/mac_mls.4#7 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/mac_none.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/mac_partition.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/mac_seeotheruids.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/mac_test.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/en.4#3 delete
.. //depot/projects/trustedbsd/base/share/man/man4/raid.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/sem.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#28 integrate
.. //depot/projects/trustedbsd/base/share/man/man7/maclabel.7#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/VFS_SET.9#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/VFS_VGET.9#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/VOP_GETEXTATTR.9#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/devclass.9#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/devclass_find.9#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/extattr.9#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/ktr.9#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/namei.9#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/rtalloc.9#3 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#15 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.sys.mk#11 integrate
.. //depot/projects/trustedbsd/base/share/mk/sys.mk#8 integrate
.. //depot/projects/trustedbsd/base/share/mklocale/Makefile#10 integrate
.. //depot/projects/trustedbsd/base/share/mklocale/zh_CN.GBK.src#1 branch
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/vm_machdep.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/vm_machdep.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#4 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/asm.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/param.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/profile.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/setjmp.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/boot0/boot0.s#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/sys/cam/cam_periph.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_sa.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#25 integrate
.. //depot/projects/trustedbsd/base/sys/conf/newvers.sh#4 integrate
.. //depot/projects/trustedbsd/base/sys/ddb/db_command.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-card.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus_cis.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ccd/ccd.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/en/midway.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/fwmem.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci_pci.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohcireg.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751var.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_cnfg.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_init.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_ioc.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_raid.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_freebsd.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_freebsd.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs.h#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/dev/snc/if_snc.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/au88x0.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/au88x0.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/syscons/scmouse.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsec.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsecvar.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/vinum/vinum.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vnops.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom.h#27 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_bsd.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_ccd.c#1 branch
.. //depot/projects/trustedbsd/base/sys/geom/geom_ctl.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_ctl.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_ext.h#3 delete
.. //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_sunlabel.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/i386/acpica/OsdEnvironment.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_machdep.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakecode.S#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakeup.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/i386/bios/apm.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/bios/mca_machdep.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/bios/smapi.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/bios/smapi_bios.S#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/bios/smbios.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/bios/vpd.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#33 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/atomic.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/autoconf.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/bios.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/critical.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/db_disasm.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/db_interface.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/db_trace.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/dump_machdep.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/elan-mmcr.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/elf_machdep.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/genassym.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/i386-gdbstub.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/i686_mem.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/in_cksum.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/initcpu.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/k6_mem.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/legacy.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/math_emulate.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/mem.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/mp_clock.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/mpapic.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/nexus.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/perfmon.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/tsc.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/vm86.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_errno.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_fcntl.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_ioctl.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_ipc.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_isc.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_misc.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_msg.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_other.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_signal.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_stat.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_sysi86.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_sysvec.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_util.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/imgact_coff.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/acpica_machdep.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/asm.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/profile.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/asc.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/clock.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/cronyx.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/ctx.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/cx.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/cy.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/elink.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/gpib.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/gsc.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/if_cx.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/if_el.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/if_le.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/if_rdp.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/intr_machdep.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/isa.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/isa_compat.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/isa_dma.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/istallion.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/ithread.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/loran.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/mse.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/npx.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/pcaudio.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/pcf.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/pmtimer.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/prof_machdep.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/spic.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/spigot.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/spkr.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/stallion.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/vesa.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/wt.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/imgact_linux.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_dummy.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_genassym.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_ptrace.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysvec.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/i386/pci/pci_bus.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/i386/pci/pci_cfgreg.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/mem.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/vm_machdep.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/kern/init_main.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_timeout.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_umtx.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#31 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#42 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vnode_if.src#15 integrate
.. //depot/projects/trustedbsd/base/sys/modules/geom/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/sys/modules/geom/geom_vol_ffs/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/sound/driver/au88x0/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/net/if_media.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_encap.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_fw.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/opencrypto/crypto.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/opencrypto/cryptodev.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/opencrypto/cryptodev.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/pc98/clock.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/pc98/fd.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/pc98/ppc.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/pc98/sio.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_dc.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/ofw_machdep.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/vm_machdep.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_lomac/mac_lomac.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/vm_machdep.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/sys/ccdvar.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/sys/extattr.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/sys/filedesc.h#15 integrate
.. //depot/projects/trustedbsd/base/sys/sys/kernel.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/sys/kse.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/sys/param.h#25 integrate
.. //depot/projects/trustedbsd/base/sys/sys/proc.h#41 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sem.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscall.h#32 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#32 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#33 integrate
.. //depot/projects/trustedbsd/base/sys/sys/umtx.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extattr.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_object.h#14 integrate
.. //depot/projects/trustedbsd/base/tools/regression/ccd/layout/ccd.sh#2 integrate
.. //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.s3.out#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.s4.out#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.s5.out#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.sg.out#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.sh#4 integrate
.. //depot/projects/trustedbsd/base/tools/tools/crypto/cryptotest.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/checknr/checknr.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/env/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/env/env.1#1 branch
.. //depot/projects/trustedbsd/base/usr.bin/kdump/kdump.1#2 integrate
.. //depot/projects/trustedbsd/base/usr.bin/kdump/kdump.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/lorder/lorder.sh#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/mklocale/yacc.y#8 integrate
.. //depot/projects/trustedbsd/base/usr.bin/printenv/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/printenv/printenv.1#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/sed/process.c#9 integrate
.. //depot/projects/trustedbsd/base/usr.bin/stat/stat.1#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/unifdef/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/Makefile#25 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/chroot/chroot.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/exec_elf32.c#9 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/extattr/rmextattr.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/fwcontrol.8#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/mergemaster/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ntp/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ntp/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sendmail/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/disks.c#14 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dist.c#18 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/tcpdchk/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/tcpdmatch/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ypbind/ypbind.8#4 integrate

Differences ...

==== //depot/projects/trustedbsd/base/MAINTAINERS#16 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.60 2003/04/27 05:51:12 imp Exp $
+$FreeBSD: src/MAINTAINERS,v 1.65 2003/06/05 05:03:01 roberto Exp $
 
 subsystem	login	notes
 -----------------------------
@@ -78,3 +78,101 @@
 sppp(4)		joerg	Just keep me informed of changes, try not to break it.
 libc		nectar	Opportuntity for pre-commit review appreciated for
 			nsdispatch(3) and its consumers.
+unifdef(1)	fanf	Pre-commit review requested.
+ntp         roberto	Pre-commit review requested.
+
+Following are the entries from the Makefiles, and a few other sources.
+Please remove stale entries from both their origin, and this file.
+
+Please also consider removing the lines from the files listed below and
+stating your preferences here instead.
+
+bin/dd/Makefile:MAINTAINER=	green at FreeBSD.org
+bin/rmail/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
+contrib/cvs/FREEBSD-upgrade:MAINTAINER=	peter at FreeBSD.org
+games/fortune/datfiles/Makefile:MAINTAINER=	jkh at FreeBSD.org
+gnu/usr.bin/binutils/Makefile:MAINTAINER=	obrien at FreeBSD.org
+gnu/usr.bin/cvs/Makefile:MAINTAINER=	peter at FreeBSD.org
+gnu/usr.bin/cvs/contrib/Makefile:MAINTAINER=	peter at FreeBSD.org
+gnu/usr.bin/cvs/cvs/Makefile:MAINTAINER=	peter at FreeBSD.org
+gnu/usr.bin/cvs/cvsbug/Makefile:MAINTAINER=	peter at FreeBSD.org
+gnu/usr.bin/cvs/doc/Makefile:MAINTAINER=	peter at FreeBSD.org
+gnu/usr.bin/cvs/lib/Makefile:MAINTAINER=	peter at FreeBSD.org
+gnu/usr.bin/cvs/libdiff/Makefile:MAINTAINER=	peter at FreeBSD.org
+gnu/usr.bin/man/apropos/Makefile:MAINTAINER=	wosch at FreeBSD.org
+lib/libbz2/Makefile:MAINTAINER=	obrien at FreeBSD.org
+lib/libc/posix1e/Makefile.inc:MAINTAINER=	rwatson at FreeBSD.org
+lib/libcam/Makefile:MAINTAINER=	ken at FreeBSD.ORG
+lib/libdevstat/Makefile:MAINTAINER=	ken at FreeBSD.ORG
+lib/libmilter/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
+lib/libsm/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
+lib/libsmdb/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
+lib/libsmutil/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
+lib/libusbhid/Makefile:MAINTAINER=	n_hibma at FreeBSD.ORG
+lib/libz/Makefile:MAINTAINER=	peter at FreeBSD.org
+libexec/lukemftpd/Makefile:MAINTAINER=	obrien at FreeBSD.org
+libexec/mail.local/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
+libexec/smrsh/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
+sbin/camcontrol/Makefile:MAINTAINER=	ken at FreeBSD.org
+sbin/dhclient/Makefile.inc:MAINTAINER=	murray at FreeBSD.org
+sbin/ffsinfo/Makefile:MAINTAINER=	tomsoft at FreeBSD.ORG, chm at FreeBSD.ORG
+sbin/growfs/Makefile:MAINTAINER=	tomsoft at FreeBSD.ORG, chm at FreeBSD.ORG
+sbin/ipf/Makefile:MAINTAINER=	guido at freebsd.org
+sbin/ipfs/Makefile:MAINTAINER=	darrenr at freebsd.org
+sbin/ipfstat/Makefile:MAINTAINER=	guido at freebsd.org
+sbin/ipmon/Makefile:MAINTAINER=	guido at freebsd.org
+sbin/ipnat/Makefile:MAINTAINER=	guido at freebsd.org
+share/doc/smm/08.sendmailop/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
+share/sendmail/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
+sys/boot/i386/cdboot/Makefile:MAINTAINER=	jhb at FreeBSD.org
+sys/boot/i386/pxeldr/Makefile:MAINTAINER=	jhb at FreeBSD.org
+sys/compat/svr4/Makefile:MAINTAINER=	newton at freebsd.org
+sys/dev/asr/MAINTAINER:MAINTAINER=	obrien at freebsd.org, scott_long at btc.adaptec.com, mark_salyzyn at adaptec.com
+sys/dev/bktr/CHANGELOG.TXT:MAINTAINER=	Roger Hardiman <roger at freebsd.org>
+sys/dev/ep/if_ep.c:MAINTAINER=	Matthew N. Dodd <winter at jurai.net>
+sys/dev/ex/if_ex.c:MAINTAINER=	Matthew N. Dodd <winter at jurai.net>
+sys/dev/ie/if_ie.c:MAINTAINER=	Matthew N. Dodd <winter at jurai.net>
+sys/dev/sound/pcm/feeder_rate.c:MAINTAINER=	Orion Hodson <orion at freebsd.org>
+sys/modules/3dfx/Makefile:MAINTAINER=	cokane at FreeBSD.org
+sys/modules/bktr/bktr_mem/Makefile:MAINTAINER=	roger at freebsd.org
+sys/modules/cam/Makefile:MAINTAINER=	n_hibma at freebsd.org
+sys/modules/linux/Makefile:MAINTAINER=	emulation at FreeBSD.org
+sys/modules/osf1/Makefile:MAINTAINER=	gallatin at FreeBSD.org
+sys/modules/pecoff/Makefile:MAINTAINER=	takawata at FreeBSD.org
+sys/modules/streams/Makefile:MAINTAINER=	newton at atdot.dotat.org
+sys/modules/svr4/Makefile:MAINTAINER=	newton at FreeBSD.org
+sys/modules/udbp/Makefile:MAINTAINER=	n_hibma at freebsd.org
+sys/modules/ugen/Makefile:MAINTAINER=	n_hibma at freebsd.org
+sys/modules/uhid/Makefile:MAINTAINER=	n_hibma at freebsd.org
+sys/modules/ukbd/Makefile:MAINTAINER=	n_hibma at freebsd.org
+sys/modules/ulpt/Makefile:MAINTAINER=	n_hibma at freebsd.org
+sys/modules/umass/Makefile:MAINTAINER=	n_hibma at freebsd.org
+sys/modules/umodem/Makefile:MAINTAINER=	n_hibma at freebsd.org
+sys/modules/ums/Makefile:MAINTAINER=	n_hibma at freebsd.org
+sys/modules/urio/Makefile:MAINTAINER=	Iwasa Kazmi <kzmi at ca2.so-net.ne.jp>
+sys/modules/usb/Makefile:MAINTAINER=	n_hibma at freebsd.org
+sys/modules/uscanner/Makefile:MAINTAINER=	n_hibma at freebsd.org
+usr.bin/brandelf/Makefile:MAINTAINER=	obrien at FreeBSD.org
+usr.bin/bzip2/Makefile:MAINTAINER=	obrien at FreeBSD.org
+usr.bin/bzip2recover/Makefile:MAINTAINER=	obrien at FreeBSD.org
+usr.bin/chat/Makefile:MAINTAINER=	peter at freebsd.org
+usr.bin/locate/Makefile:MAINTAINER=	wosch at FreeBSD.org
+usr.bin/vacation/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
+usr.bin/whois/Makefile:MAINTAINER=	mike at FreeBSD.org
+usr.sbin/editmap/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
+usr.sbin/inetd/Makefile:MAINTAINER=	dwmalone at FreeBSD.org
+usr.sbin/iostat/Makefile:MAINTAINER=	ken at FreeBSD.ORG
+usr.sbin/ipftest/Makefile:MAINTAINER=	guido at freebsd.org
+usr.sbin/ipresend/Makefile:MAINTAINER=	guido at freebsd.org
+usr.sbin/ipsend/Makefile:MAINTAINER=	guido at freebsd.org
+usr.sbin/iptest/Makefile:MAINTAINER=	guido at freebsd.org
+usr.sbin/lpr/Makefile:MAINTAINER=	wollman at FreeBSD.org
+usr.sbin/lpr/Makefile:MAINTAINER+=	gad at FreeBSD.org
+usr.sbin/mailstats/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
+usr.sbin/makemap/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
+usr.sbin/ntp/doc/Makefile:MAINTAINER=	sheldonh at FreeBSD.org
+usr.sbin/pppd/Makefile:MAINTAINER=	peter at freebsd.org
+usr.sbin/pppstats/Makefile:MAINTAINER=	peter at freebsd.org
+usr.sbin/praliases/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
+usr.sbin/sendmail/Makefile:MAINTAINER=	gshapiro at FreeBSD.org
+usr.sbin/zic/Makefile:MAINTAINER=	wollman at FreeBSD.org

==== //depot/projects/trustedbsd/base/bin/df/df.1#5 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $
+.\" $FreeBSD: src/bin/df/df.1,v 1.30 2003/06/03 12:00:35 bde Exp $
 .\"
 .Dd May 8, 1995
 .Dt DF 1
@@ -148,9 +148,7 @@
 .Sh BUGS
 The
 .Fl n
-and
-.Fl t
-flags are ignored if a file or file system is specified.
+flag is ignored if a file or file system is specified.
 .Sh SEE ALSO
 .Xr lsvfs 1 ,
 .Xr quota 1 ,

==== //depot/projects/trustedbsd/base/bin/df/df.c#15 (text+ko) ====

@@ -48,7 +48,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.48 2003/05/03 16:02:52 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.50 2003/06/03 11:54:42 bde Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -271,6 +271,7 @@
 			}
 		} else
 			mntpt = *argv;
+
 		/*
 		 * Statfs does not take a `wait' flag, so we cannot
 		 * implement nflag here.
@@ -280,6 +281,18 @@
 			rv = 1;
 			continue;
 		}
+
+		/*
+		 * Check to make sure the arguments we've been given are
+		 * satisfied.  Return an error if we have been asked to
+		 * list a mount point that does not match the other args
+		 * we've been given (-l, -t, etc.).
+		 */
+		if (checkvfsname(statfsbuf.f_fstypename, vfslist)) {
+			rv = 1;
+			continue;
+		}
+
 		if (argc == 1) {
 			bzero(&maxwidths, sizeof(maxwidths));
 			update_maxwidths(&maxwidths, &statfsbuf);

==== //depot/projects/trustedbsd/base/bin/ed/Makefile#5 (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/trustedbsd/base/bin/ed/cbc.c#5 (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.19 2003/06/03 17:03:48 jhay 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,25 @@
 	MODE_ENCRYPT, MODE_DECRYPT, MODE_AUTHENTICATE
 } mode = MODE_ENCRYPT;
 
-Desbuf ivec;				/* initialization vector */
-Desbuf pvec;				/* padding vector */
+#ifdef DES
+DES_cblock ivec;			/* initialization vector */
+DES_cblock pvec;			/* padding vector */
+#endif
+
 char bits[] = {				/* used to extract bits from a char */
 	'\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001'
 };
+
 int pflag;				/* 1 to preserve parity bits */
 
+#ifdef DES
+DES_key_schedule schedule;		/* expanded DES key */
+#endif
+
 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 +109,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 +169,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 +179,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 +300,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 +312,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 +339,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 +354,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 +370,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/trustedbsd/base/bin/ed/ed.h#5 (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 *);

>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message



More information about the trustedbsd-cvs mailing list