PERFORCE change 106876 for review

Michael Bushkov bushman at FreeBSD.org
Fri Sep 29 05:37:07 PDT 2006


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

Change 106876 by bushman at bushman_nss_ldap_cached on 2006/09/29 12:36:20

	IFC

Affected files ...

.. //depot/projects/soc2006/nss_ldap_cached/src/Makefile.inc1#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/periodic.conf#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#7 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/etc.alpha/ttys#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/freebsd-update.conf#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/hosts.allow#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/inetd.conf#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/libalias.conf#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.include.dist#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.usr.dist#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.var.dist#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/network.subr#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/pccard_ether#4 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/410.logincheck#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/weekly/120.clean-kvmdb#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/weekly/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/phones#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/Makefile#4 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/auditd#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/bthidd#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/devd#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/powerd#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ramdisk#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ramdisk-own#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/sshd#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ypxfrd#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.initdiskless#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.subr#6 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/include/Makefile#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/Makefile#8 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/Makefile#7 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/Makefile.inc#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/SYS.h#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/Symbol.map#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/_fpmath.h#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/arith.h#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/Makefile.inc#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/_ctx_start.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/_set_tp.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/_setjmp.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/divrem.m4#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/fabs.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/flt_rounds.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/fpgetmask.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/fpgetround.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/fpgetsticky.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/fpsetmask.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/fpsetround.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/infinity.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/makecontext.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/modf.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/rfork_thread.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/setjmp.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/signalcontext.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/sigsetjmp.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/net/Makefile.inc#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/net/byte_swap_2.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/net/byte_swap_4.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/net/htonl.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/net/htons.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/net/ntohl.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/net/ntohs.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/stdlib/Makefile.inc#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/string/Makefile.inc#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/string/bcopy.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/string/bzero.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/string/ffs.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/string/memcpy.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/string/memmove.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/Makefile.inc#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/Ovfork.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/brk.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/cerror.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/exect.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/fork.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/pipe.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/ptrace.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/sbrk.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/setlogin.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/sigreturn.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/net/htonl.S#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/net/htons.S#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/net/ntohl.S#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/net/ntohs.S#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getgrent.c#5 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/pwcache.3#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tls.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/vis.3#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/gen/Makefile.inc#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/gen/alloca.S#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/sys/i386_set_watch.3#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/ia64/gen/_set_tp.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/isc/eventlib_p.h#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/gai_strerror.3#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/gethostbyname.3#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/powerpc/gen/_set_tp.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/rpc/clnt_bcast.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/rpc/clnt_vc.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/rpc/getnetconfig.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/rpc/getnetpath.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/rpc/rpc_clnt_create.3#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/rpc/rpcb_clnt.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/rpc/rpcb_prot.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/rpc/svc_simple.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/rpc/svc_vc.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fclose.3#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/findfp.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/vfprintf.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/vfwprintf.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/alloca.3#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/getopt_long.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/malloc.3#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/malloc.c#6 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/Symbol.map#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/aio_error.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/chflags.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/clock_gettime.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/connect.2#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getsockopt.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/gettimeofday.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/kldnext.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/kqueue.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/listen.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/mmap.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/open.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/recv.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/send.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/sigqueue.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/timer_create.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/timer_delete.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/timer_settime.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/utimes.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_compat/compat_group.c#5 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_compat/nss_compat.c#5 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_group.c#6 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.cpu.mk#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.endian.mk#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.lib.mk#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.own.mk#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.port.mk#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.prog.mk#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/IPXrouted/main.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/Makefile#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/auditreduce/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/authpf/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/bthid_config.h#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/bthidd.8#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/bthidd.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/bthidd.conf.sample#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/bthidd.h#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/client.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/hid.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/kbd.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/kbd.h#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/lexer.l#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/parser.y#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/server.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/session.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/hccontrol/hccontrol.h#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/hccontrol/link_control.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/hccontrol/util.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/hcsecd/hcsecd.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/sdpd/server.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cron/crontab/crontab.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cron/lib/entry.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/crunch/crunchide/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/edquota/edquota.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/eeprom/eeprom.8#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/eeprom/ofw_options.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/freebsd-update/Makefile#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/freebsd-update/freebsd-update.8#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/freebsd-update/freebsd-update.sh#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/inetd/inetd.8#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/inetd/inetd.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/inetd/inetd.h#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ipfwpcap/ipfwpcap.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/kbdcontrol/kbdcontrol.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/lmcconfig/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ndiscvt/ndiscvt.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/msg.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/add/main.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pnpinfo/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/portsnap/portsnap/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ppp/command.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ppp/lcp.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ppp/ppp.8.m4#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ppp/server.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pw/pw.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rip6query/rip6query.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.lockd/lockd.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.statd/procs.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.statd/statd.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sendmail/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/config.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/devices.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/install.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/tcpdump/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/tcpdump/tcpdump/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/tcpdump/tcpslice/Makefile#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/tcpdump/tcpslice/gwtm2secs.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/tcpdump/tcpslice/search.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/tcpdump/tcpslice/tcpslice.1#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/tcpdump/tcpslice/tcpslice.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/tcpdump/tcpslice/tcpslice.h#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/tcpdump/tcpslice/util.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/traceroute/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/vidcontrol/vidcontrol.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/watchdogd/watchdog.8#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/watchdogd/watchdogd.8#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/wpa/hostapd/hostapd.conf.5#2 integrate

Differences ...

==== //depot/projects/soc2006/nss_ldap_cached/src/Makefile.inc1#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.552 2006/08/09 11:03:06 netchild Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.559 2006/09/08 10:09:02 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -11,7 +11,7 @@
 #	-DNO_PORTSUPDATE do not update ports in ${MAKE} update
 #	-DNO_DOCUPDATE do not update doc in ${MAKE} update
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
-#	TARGET_ARCH="arch" to crossbuild world to a different arch
+#	TARGET="machine" to crossbuild world for a different machine type
 
 #
 # The intended user-driven targets are:
@@ -95,14 +95,36 @@
 OSRELDATE=	0
 .endif
 .endif
+
+# Guess machine architecture from machine type, and vice versa.
+.if !defined(TARGET_ARCH) && defined(TARGET)
+TARGET_ARCH=	${TARGET:S/pc98/i386/}
+.elif !defined(TARGET) && defined(TARGET_ARCH) && \
+    ${TARGET_ARCH} != ${MACHINE_ARCH}
+TARGET=		${TARGET_ARCH}
+.endif
+# Otherwise, default to current machine type and architecture.
+TARGET?=	${MACHINE}
 TARGET_ARCH?=	${MACHINE_ARCH}
-.if ${TARGET_ARCH} == ${MACHINE_ARCH}
-TARGET?=	${MACHINE}
+
+KNOWN_ARCHES?=	amd64 arm i386 i386/pc98 ia64 powerpc sparc64
+.if ${TARGET} == ${TARGET_ARCH}
+_t=		${TARGET}
+.else
+_t=		${TARGET_ARCH}/${TARGET}
+.endif
+.for _t in ${_t}
+.if empty(KNOWN_ARCHES:M${_t})
+.error Unknown target ${TARGET_ARCH}:${TARGET}.
+.endif
+.endfor
+
+.if ${TARGET} == ${MACHINE}
 TARGET_CPUTYPE?=${CPUTYPE}
 .else
-TARGET?=	${TARGET_ARCH}
 TARGET_CPUTYPE?=
 .endif
+
 .if !empty(TARGET_CPUTYPE)
 _TARGET_CPUTYPE=${TARGET_CPUTYPE}
 .else
@@ -185,11 +207,13 @@
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		-DWITHOUT_FORTRAN -DWITHOUT_GDB
 
 # world stage
@@ -465,10 +489,20 @@
 WMAKE_TGTS+=	build32
 .endif
 
-buildworld: ${WMAKE_TGTS}
-.ORDER: ${WMAKE_TGTS}
+buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
+.ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
 
+buildworld_prologue:
+	@echo "--------------------------------------------------------------"
+	@echo ">>> World build started on `LC_ALL=C date`"
+	@echo "--------------------------------------------------------------"
 
+buildworld_epilogue:
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo ">>> World build completed on `LC_ALL=C date`"
+	@echo "--------------------------------------------------------------"
+
 #
 # We need to have this as a target because the indirection between Makefile
 # and Makefile.inc1 causes the correct PATH to be used, rather than a
@@ -926,9 +960,6 @@
 .if ${MK_RESCUE} != "no" || defined(RELEASEDIR)
 _crunchide=	usr.sbin/crunch/crunchide
 .endif
-.if ${TARGET_ARCH} == "alpha"
-_elf2exe=	usr.sbin/elf2exe
-.endif
 .if ${TARGET_ARCH} == "i386" && defined(RELEASEDIR)
 _kgzip=		usr.sbin/kgzip
 .endif
@@ -941,7 +972,6 @@
     usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
     ${_btxld} \
     ${_crunchide} \
-    ${_elf2exe} \
     ${_kgzip}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
@@ -1036,8 +1066,9 @@
 .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
 ${_lib}__L: .PHONY
 .if exists(${.CURDIR}/${_lib})
-	${_+_}@${ECHODIR} "===> ${_lib} (depend,all,install)"; \
+	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_lib}; \
+		${MAKE} DIRPRFX=${_lib}/ obj; \
 		${MAKE} DIRPRFX=${_lib}/ depend; \
 		${MAKE} DIRPRFX=${_lib}/ all; \
 		${MAKE} DIRPRFX=${_lib}/ install
@@ -1048,8 +1079,9 @@
 # static PAM library, and dynamic PAM library before dynamic PAM
 # modules.
 lib/libpam__L: .PHONY
-	${_+_}@${ECHODIR} "===> lib/libpam (depend,all,install)"; \
+	${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
 		cd ${.CURDIR}/lib/libpam; \
+		${MAKE} DIRPRFX=lib/libpam/ obj; \
 		${MAKE} DIRPRFX=lib/libpam/ depend; \
 		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \
 		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.356 2006/05/03 15:14:46 ume Exp $
+# $FreeBSD: src/etc/Makefile,v 1.358 2006/09/26 23:26:48 piso Exp $
 
 .include <bsd.own.mk>
 
@@ -9,9 +9,10 @@
 
 BIN1=	amd.map apmd.conf auth.conf \
 	crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \
-	dhclient.conf disktab fbtab ftpusers gettytab group \
+	dhclient.conf disktab fbtab freebsd-update.conf \
+	ftpusers gettytab group \
 	hosts hosts.allow hosts.equiv hosts.lpd \
-	inetd.conf login.access login.conf mac.conf motd \
+	inetd.conf libalias.conf login.access login.conf mac.conf motd \
 	netconfig network.subr networks newsyslog.conf nsswitch.conf \
 	portsnap.conf pf.conf pf.os phones profile protocols \
 	rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/periodic.conf#2 (text+ko) ====

@@ -13,7 +13,7 @@
 # For a more detailed explanation of all the periodic.conf variables, please
 # refer to the periodic.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/periodic.conf,v 1.38 2006/05/12 19:17:33 mlaier Exp $
+# $FreeBSD: src/etc/defaults/periodic.conf,v 1.41 2006/08/29 08:49:57 ru Exp $
 #
 
 # What files override these defaults ?
@@ -159,6 +159,9 @@
 # 400.passwdless
 daily_status_security_passwdless_enable="YES"
 
+# 410.logincheck
+daily_status_security_logincheck_enable="YES"
+
 # 500.ipfwdenied
 daily_status_security_ipfwdenied_enable="YES"
 
@@ -196,11 +199,6 @@
 weekly_show_info="YES"					# scripts returning 1
 weekly_show_badconfig="NO"				# scripts returning 2
 
-# 120.clean-kvmdb
-weekly_clean_kvmdb_enable="YES"				# Clean kvmdb weekly
-weekly_clean_kvmdb_days=7				# If not accessed for
-weekly_clean_kvmdb_verbose="YES"			# Mention files deleted
-
 # 310.locate
 weekly_locate_enable="YES"				# Update locate weekly
 
@@ -217,7 +215,7 @@
 # 400.status-pkg
 weekly_status_pkg_enable="NO"				# Find out-of-date pkgs
 pkg_version=pkg_version					# Use this program
-pkg_version_index=/usr/ports/INDEX-6			# Use this index file
+pkg_version_index=/usr/ports/INDEX-7			# Use this index file
 
 # 999.local
 weekly_local="/etc/weekly.local"			# Local scripts

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#7 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.294 2006/08/17 20:13:24 brian Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.296 2006/09/20 19:48:31 brooks Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -40,7 +40,6 @@
 kldxref_module_path=""	# Override kern.module_path. A ';'-delimited list.
 powerd_enable="NO" 	# Run powerd to lower our power usage.
 powerd_flags=""		# Flags to powerd (if enabled).
-removable_route_flush="NO" # Flush routes when removing an interface
 tmpmfs="AUTO"		# Set to YES to always create an mfs /tmp, NO to never
 tmpsize="20m"		# Size of mfs /tmp if created
 tmpmfs_flags="-S -M"	# Extra mdmfs options for the mfs /tmp
@@ -336,6 +335,10 @@
 sdpd_groupname="nobody"		# set spdp(8) user/group to run as after
 sdpd_username="nobody"		# it initializes
 
+bthidd_enable="NO"		# Enable bthidd(8) (or NO)
+bthidd_config="/etc/bluetooth/bthidd.conf" # bthidd(8) configuration file
+bthidd_hids="/var/db/bthidd.hids" # bthidd(8) known HID devices file
+
 ### Miscellaneous network options: ###
 icmp_bmcastecho="NO"	# respond to broadcast ping packets
 

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/hosts.allow#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #
 # hosts.allow access control file for "tcp wrapped" applications.
-# $FreeBSD: src/etc/hosts.allow,v 1.22 2006/06/01 14:14:58 csjp Exp $
+# $FreeBSD: src/etc/hosts.allow,v 1.23 2006/08/29 09:20:48 ru Exp $
 #
 # NOTE: The hosts.deny file is deprecated.
 #       Place both 'allow' and 'deny' rules in the hosts.allow file.
@@ -39,43 +39,43 @@
 ALL : localhost 127.0.0.1 : allow
 # Comment out next line if you build libwrap without IPv6 support.
 ALL : [::1] : allow
-ALL : my.machine.example.com 192.0.2.35 : allow
+#ALL : my.machine.example.com 192.0.2.35 : allow
 
 # To use IPv6 addresses you must enclose them in []'s
-ALL : [fe80::%fxp0]/10 : allow
-ALL : [fe80::]/10 : deny
-ALL : [2001:db8:2:1:2:3:4:3fe1] : deny
-ALL : [2001:db8:2:1::]/64 : allow
+#ALL : [fe80::%fxp0]/10 : allow
+#ALL : [fe80::]/10 : deny
+#ALL : [2001:db8:2:1:2:3:4:3fe1] : deny
+#ALL : [2001:db8:2:1::]/64 : allow
 
 # Sendmail can help protect you against spammers and relay-rapers
 sendmail : localhost : allow
-sendmail : .nice.guy.example.com : allow
-sendmail : .evil.cracker.example.com : deny
+#sendmail : .nice.guy.example.com : allow
+#sendmail : .evil.cracker.example.com : deny
 sendmail : ALL : allow
 
 # Exim is an alternative to sendmail, available in the ports tree
 exim : localhost : allow
-exim : .nice.guy.example.com : allow
-exim : .evil.cracker.example.com : deny
+#exim : .nice.guy.example.com : allow
+#exim : .evil.cracker.example.com : deny
 exim : ALL : allow
 
 # Rpcbind is used for all RPC services; protect your NFS!
 # (IP addresses rather than hostnames *MUST* be used here)
-rpcbind : 192.0.2.32/255.255.255.224 : allow
-rpcbind : 192.0.2.96/255.255.255.224 : allow
+#rpcbind : 192.0.2.32/255.255.255.224 : allow
+#rpcbind : 192.0.2.96/255.255.255.224 : allow
 rpcbind : ALL : deny
 
 # NIS master server. Only local nets should have access
 # (Since this is an RPC service, rpcbind needs to be considered)
 ypserv : localhost : allow
-ypserv : .unsafe.my.net.example.com : deny
-ypserv : .my.net.example.com : allow
+#ypserv : .unsafe.my.net.example.com : deny
+#ypserv : .my.net.example.com : allow
 ypserv : ALL : deny
 
 # Provide a small amount of protection for ftpd
 ftpd : localhost : allow
-ftpd : .nice.guy.example.com : allow
-ftpd : .evil.cracker.example.com : deny
+#ftpd : .nice.guy.example.com : allow
+#ftpd : .evil.cracker.example.com : deny
 ftpd : ALL : allow
 
 # You need to be clever with finger; do _not_ backfinger!! You can easily

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/inetd.conf#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/inetd.conf,v 1.71 2006/02/05 19:23:05 ceri Exp $
+# $FreeBSD: src/etc/inetd.conf,v 1.72 2006/08/31 17:15:10 obrien Exp $
 #
 # Internet server configuration database
 #
@@ -8,6 +8,8 @@
 #
 #ftp	stream	tcp	nowait	root	/usr/libexec/ftpd	ftpd -l
 #ftp	stream	tcp6	nowait	root	/usr/libexec/ftpd	ftpd -l
+#ftp	stream	tcp	nowait	root	/usr/libexec/lukemftpd	ftpd -l -r
+#ftp	stream	tcp6	nowait	root	/usr/libexec/lukemftpd	ftpd -l -r
 #ssh	stream	tcp	nowait	root	/usr/sbin/sshd		sshd -i -4
 #ssh	stream	tcp6	nowait	root	/usr/sbin/sshd		sshd -i -6
 #telnet	stream	tcp	nowait	root	/usr/libexec/telnetd	telnetd

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.include.dist#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.107 2006/08/01 22:19:00 sobomax Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.108 2006/09/07 18:24:24 emax Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -66,6 +66,8 @@
         ..
         utopia
         ..
+        vkbd
+        ..
         wi
         ..
     ..

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.usr.dist#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.319 2006/08/03 05:44:51 jb Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.320 2006/09/02 20:58:37 marcel Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -661,6 +661,8 @@
                 ..
                 i386
                 ..
+                powerpc
+                ..
                 sparc64
                 ..
             ..
@@ -694,6 +696,8 @@
                     ..
                     i386
                     ..
+                    powerpc
+                    ..
                     sparc64
                     ..
                 ..
@@ -766,6 +770,8 @@
                 ..
                 i386
                 ..
+                powerpc
+                ..
                 sparc64
                 ..
             ..

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.var.dist#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.74 2006/02/05 18:22:56 rwatson Exp $
+# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.75 2006/08/31 09:51:33 cperciva Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -32,6 +32,8 @@
     db
         entropy         uname=operator gname=operator mode=0700
         ..
+        freebsd-update
+        ..
         ipf             mode=0700
         ..
         pkg

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/network.subr#3 (text+ko) ====

@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/network.subr,v 1.172 2006/08/17 03:03:38 brooks Exp $
+# $FreeBSD: src/etc/network.subr,v 1.173 2006/09/21 01:44:52 brooks Exp $
 #
 
 #
@@ -237,6 +237,30 @@
 	return 1
 }
 
+# ipv6if if
+#	Returns 0 if the interface should be configured for IPv6 and
+#	1 otherwise.
+ipv6if()
+{
+	if ! checkyesno ipv6_enable; then
+		return 1
+	fi
+	case "${ipv6_network_interfaces}" in
+	[Aa][Uu][Tt][Oo])
+		return 0
+		;;
+	''|[Nn][Oo][Nn][Ee])
+		return 1
+		;;
+	esac
+	for v6if in ${ipv6_network_interfaces}; do
+		if [ "${v6if}" = "${1}" ]; then
+			return 0
+		fi
+	done
+	return 1
+}
+
 # ifexists if
 #	Returns 0 if the interface exists and 1 otherwise.
 ifexists()

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/pccard_ether#4 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD: src/etc/pccard_ether,v 1.50 2006/08/18 13:19:45 brooks Exp $
+# $FreeBSD: src/etc/pccard_ether,v 1.53 2006/09/21 01:44:52 brooks Exp $
 #
 # pccard_ether interfacename [start|stop|restart]
 #
@@ -69,11 +69,13 @@
 {
 	ifexists $ifn || exit 1
 
-	if [ -z "$rc_force" -a -x /usr/bin/grep ]; then
-		if ifconfig $ifn | grep -s '[<,]UP[,>]' > /dev/null 2>&1; then
-		    # Interface is already up, so ignore it.
-		    exit 0
-		fi
+	if [ -z "$rc_force" ]; then
+		for uif in `ifconfig -ul`; do
+			if [ "${uif}" = "${ifn}" ]; then
+				# Interface is already up, so ignore it.
+				exit 0
+			fi
+		done
 	fi
 
 	/etc/rc.d/netif start $ifn
@@ -87,7 +89,11 @@
 	fi
 
 	# IPv6 setup
-	if checkyesno ipv6_enable; then
+	if ipv6if $ifn; then
+		# XXX: network6_interface_setup assumes you're calling
+		# it with ALL the IPv6 interfaces at once and thus isn't
+		# really appropraite for this job, but it's the best we've
+		# got for now.
 		network6_interface_setup $ifn
 	fi
 }
@@ -104,11 +110,6 @@
 
 	# clean ARP table
 	ifexists $ifn && arp -d -i $ifn -a
-
-	# Clean the routing table
-	if checkyesno removable_route_flush; then
-		route -n flush -inet > /dev/null
-	fi
 }
 
 pccard_ether_restart()

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/Makefile#2 (text+ko) ====

@@ -1,9 +1,10 @@
-# $FreeBSD: src/etc/periodic/security/Makefile,v 1.5 2006/05/12 19:17:34 mlaier Exp $
+# $FreeBSD: src/etc/periodic/security/Makefile,v 1.6 2006/08/25 07:34:36 trhodes Exp $
 
 FILES=	100.chksetuid \
 	200.chkmounts \
 	300.chkuid0 \
 	400.passwdless \
+	410.logincheck \
 	500.ipfwdenied \
 	510.ipfdenied \
 	520.pfdenied \

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/weekly/Makefile#2 (text+ko) ====

@@ -1,7 +1,6 @@
-# $FreeBSD: src/etc/periodic/weekly/Makefile,v 1.8 2002/07/18 12:33:01 ru Exp $
+# $FreeBSD: src/etc/periodic/weekly/Makefile,v 1.9 2006/08/29 08:49:57 ru Exp $
 
-FILES=	120.clean-kvmdb \
-	310.locate \
+FILES=	310.locate \
 	320.whatis \
 	330.catman \
 	340.noid \

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/phones#2 (text+ko) ====

@@ -1,11 +1,8 @@
-# $FreeBSD: src/etc/phones,v 1.8 1999/08/27 23:23:43 peter Exp $
+# $FreeBSD: src/etc/phones,v 1.9 2006/08/31 21:13:12 ru Exp $
 #	From: @(#)phones	5.2 (Berkeley) 6/30/90
 #
 # phones -- remote host phone number data base
 # see tip(1), phones(5)
-#
-system1		9=3155557750
-system2		  9145551241
-netcom		1(408)555-9760
-netcom		1(415)555-9940
-omen		1(503)555-3746
+# examples:
+#system1	9=2225551212
+#system2	  9995551212

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/Makefile#4 (text+ko) ====

@@ -1,12 +1,12 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.74 2006/08/04 18:37:03 des Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.76 2006/09/07 22:25:08 emax Exp $
 
 .include <bsd.own.mk>
 
 FILES=	DAEMON LOGIN NETWORKING SERVERS \
 	abi accounting addswap adjkerntz amd \
 	apm apmd archdep atm1 atm2 atm3 auditd \
-	bgfsck bluetooth bootparams bridge bsnmpd \
+	bgfsck bluetooth bootparams bridge bsnmpd bthidd \
 	ccd cleanvar cleartmp cron \
 	devd devfs dhclient \
 	dmesg dumpon \
@@ -30,7 +30,7 @@
 	pf pflog pfsync \
 	powerd power_profile ppp pppoed pwcheck \
 	quota \
-	ramdisk ramdisk-own random rarpd resolv root \
+	random rarpd resolv root \
 	route6d routed routing rpcbind rtadvd rwho \
 	savecore sdpd securelevel sendmail \
 	serial sppp swap1 \

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/auditd#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/auditd,v 1.2 2006/06/06 17:22:55 trhodes Exp $
+# $FreeBSD: src/etc/rc.d/auditd,v 1.3 2006/09/24 17:31:04 rwatson Exp $
 #
 # Start up for the Audit daemon.
 #
@@ -25,6 +25,7 @@
 {
 
 	/usr/sbin/audit -t
+	sleep 1
 }
 
 load_rc_config $name

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/devd#3 (text+ko) ====

@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/devd,v 1.9 2006/06/01 00:41:07 thompsa Exp $
+# $FreeBSD: src/etc/rc.d/devd,v 1.10 2006/09/21 14:29:32 brooks Exp $
 #
 
 # PROVIDE: devd
-# REQUIRE: netif
+# REQUIRE: netif network_ipv6
 # BEFORE: NETWORKING mountcritremote
 # KEYWORD: nojail
 

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/powerd#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/powerd,v 1.3 2005/10/28 16:55:38 yar Exp $
+# $FreeBSD: src/etc/rc.d/powerd,v 1.4 2006/08/27 11:04:39 cperciva Exp $
 #
 
 # PROVIDE: powerd
@@ -13,6 +13,13 @@
 name="powerd"
 rcvar=`set_rcvar`
 command="/usr/sbin/${name}"
+stop_postcmd=powerd_poststop
+
+powerd_poststop()
+{
+	sysctl dev.cpu.0.freq=`sysctl -n dev.cpu.0.freq_levels |
+	    sed -e 's:/.*::'` > /dev/null
+}
 
 load_rc_config $name
 run_rc_command "$1"

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/sshd#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: sshd,v 1.18 2002/04/29 08:23:34 lukem Exp $
-# $FreeBSD: src/etc/rc.d/sshd,v 1.11 2006/04/11 09:08:15 flz Exp $
+# $FreeBSD: src/etc/rc.d/sshd,v 1.12 2006/08/22 11:17:28 flz Exp $
 #
 
 # PROVIDE: sshd
@@ -19,8 +19,6 @@
 
 timeout=300
 
-load_rc_config $name
-
 user_reseed()
 {
 	(
@@ -49,46 +47,47 @@
 	umask 022
 
 	# Can't do anything if ssh is not installed
-	[ -x ${prefix}/bin/ssh-keygen ] || {
-		warn "${prefix}/bin/ssh-keygen does not exist."
+	[ -x /usr/bin/ssh-keygen ] || {
+		warn "/usr/bin/ssh-keygen does not exist."
 		return 1
 	}
 
-	if [ -f ${etcdir}/ssh/ssh_host_key ]; then
+	if [ -f /etc/ssh/ssh_host_key ]; then
 		echo "You already have an RSA host key" \
-		    "in ${etcdir}/ssh/ssh_host_key"
+		    "in /etc/ssh/ssh_host_key"
 		echo "Skipping protocol version 1 RSA Key Generation"
 	else
-		${prefix}/bin/ssh-keygen -t rsa1 -b 1024 \
-		    -f ${etcdir}/ssh/ssh_host_key -N ''
+		/usr/bin/ssh-keygen -t rsa1 -b 1024 \
+		    -f /etc/ssh/ssh_host_key -N ''
 	fi
 
-	if [ -f ${etcdir}/ssh/ssh_host_dsa_key ]; then
+	if [ -f /etc/ssh/ssh_host_dsa_key ]; then
 		echo "You already have a DSA host key" \
-		    "in ${etcdir}/ssh/ssh_host_dsa_key"
+		    "in /etc/ssh/ssh_host_dsa_key"
 		echo "Skipping protocol version 2 DSA Key Generation"
 	else
-		${prefix}/bin/ssh-keygen -t dsa -f ${etcdir}/ssh/ssh_host_dsa_key -N ''
+		/usr/bin/ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
 	fi
 
-	if [ -f ${etcdir}/ssh/ssh_host_rsa_key ]; then
+	if [ -f /etc/ssh/ssh_host_rsa_key ]; then
 		echo "You already have a RSA host key" \
-		    "in ${etcdir}/ssh/ssh_host_rsa_key"
+		    "in /etc/ssh/ssh_host_rsa_key"
 		echo "Skipping protocol version 2 RSA Key Generation"
 	else
-		${prefix}/bin/ssh-keygen -t rsa -f ${etcdir}/ssh/ssh_host_rsa_key -N ''
+		/usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
 	fi
 	)
 }
 
 sshd_precmd()
 {
-	if [ ! -f ${etcdir}/ssh/ssh_host_key -o \
-	    ! -f ${etcdir}/ssh/ssh_host_dsa_key -o \
-	    ! -f ${etcdir}/ssh/ssh_host_rsa_key ]; then
+	if [ ! -f /etc/ssh/ssh_host_key -o \
+	    ! -f /etc/ssh/ssh_host_dsa_key -o \
+	    ! -f /etc/ssh/ssh_host_rsa_key ]; then
 		user_reseed
 		run_rc_command keygen
 	fi
 }
 
+load_rc_config $name
 run_rc_command "$1"

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ypxfrd#2 (text+ko) ====

@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.6 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.7 2006/08/22 14:58:23 flz Exp $
 #
 
 # PROVIDE: ypxfrd
-# REQUIRE: rpcbind
+# REQUIRE: rpcbind ypserv
 
 . /etc/rc.subr
 

==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.initdiskless#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.initdiskless,v 1.49 2006/01/11 21:59:30 brooks Exp $
+# $FreeBSD: src/etc/rc.initdiskless,v 1.51 2006/09/01 16:33:15 brooks Exp $
 
 # On entry to this script the entire system consists of a read-only root
 # mounted via NFS. The kernel has run BOOTP and configured an interface
@@ -76,6 +76,9 @@
 #		If the file contains a pathname starting with "/", then
 #		the root path is prepended to it; this allows relocation of
 #		the root filesystem without changing configuration files.
+#		Because mount_nfs understands ".." in paths, it is
+#		possible to mount from locations above the NFS root with
+#		paths such as "/../../etc".
 #
 # /conf/T/M/md_size
 #		The contents of the file specifies the size of the memory
@@ -97,21 +100,27 @@
 #		The list of paths contained in the file are rm -rf'd
 #		relative to /SUBDIR.
 #
+# /conf/diskless_remount
+#		Similar to /conf/T/M/diskless_remount above, but allows
+#		all of /conf to be remounted.  This can be used to allow
+#		multiple roots to share the same /conf.
+#		
+#
 # You will almost universally want to create the following files under /conf
 #
-# File				Content
-# ----------------------------	------------------------------------------
-# /conf/base/etc/md_size	size of /etc filesystem
-# /conf/base/diskless_remount	"/etc"
-# /conf/default/etc/rc.conf	generic diskless config parameters
-# /conf/default/etc/fstab	generic diskless fstab e.g. like this
+# File					Content
+# ----------------------------		----------------------------------
+# /conf/base/etc/md_size		size of /etc filesystem
+# /conf/base/etc/diskless_remount	"/etc"
+# /conf/default/etc/rc.conf		generic diskless config parameters
+# /conf/default/etc/fstab		generic diskless fstab e.g. like this
 #
-#	foo:/root_part		/	nfs	ro		0 0
-#	foo:/usr_part		/usr	nfs     ro		0 0
-#	foo:/home_part		/home   nfs     rw      	0 0
-#	md			/tmp	mfs     -s=30m,rw	0 0
-#	md			/var	mfs	-s=30m,rw	0 0

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list