PERFORCE change 95671 for review
soc-bushman
soc-bushman at FreeBSD.org
Thu Apr 20 12:10:30 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=95671
Change 95671 by soc-bushman at soc-bushman_stinger on 2006/04/20 12:09:41
changes were made to take RES_USE_INET6 into account and also to remove nscache.h and nscachedcli.h from src/include
Affected files ...
.. //depot/projects/soc2005/nsswitch_cached/src/etc/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/defaults/rc.conf#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/gettytab#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/hosts.allow#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/mtree/BSD.include.dist#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/mtree/Makefile#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/network.subr#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/rc.d/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/rc.d/amd#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/rc.d/ike#2 delete
.. //depot/projects/soc2005/nsswitch_cached/src/etc/rc.d/jail#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/rc.d/kernel#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/etc/rc.d/nsswitch#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/rc.d/serial#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/rc.d/sshd#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/rc.subr#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/sendmail/freebsd.mc#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/sendmail/freebsd.submit.mc#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/include/Makefile#7 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/include/arpa/inet.h#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/include/arpa/nameser.h#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/include/arpa/nameser_compat.h#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/include/malloc_np.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/include/netdb.h#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/include/nscache.h#8 delete
.. //depot/projects/soc2005/nsswitch_cached/src/include/nscachedcli.h#6 delete
.. //depot/projects/soc2005/nsswitch_cached/src/include/res_update.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/include/resolv.h#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/include/stdlib.h#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/include/time.h#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/Makefile#6 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/alpha/Makefile.inc#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/amd64/Makefile.inc#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/db/man/dbm.3#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gdtoa/Symbol.map#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/getgrent.c#8 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/getpwent.c#11 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/tls.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/vis.3#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/ia64/Makefile.inc#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/isc/eventlib.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/namespace.h#5 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/nscache.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/nscachedcli.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/port_after.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/port_before.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/resolv_mt.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/un-namespace.h#5 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/Makefile.inc#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/inet_addr.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/inet_cidr_ntop.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/inet_cidr_pton.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/inet_lnaof.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/inet_makeaddr.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/inet_net_ntop.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/inet_net_pton.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/inet_neta.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/inet_netof.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/inet_network.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/inet_ntoa.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/inet_ntop.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/inet_pton.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/inet/nsap_addr.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/isc/Makefile.inc#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/isc/ev_streams.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/isc/ev_timers.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/isc/eventlib_p.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/Symbol.map#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/utf8.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/nameser/Makefile.inc#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/nameser/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/nameser/ns_name.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/nameser/ns_netint.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/nameser/ns_parse.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/nameser/ns_print.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/nameser/ns_samedomain.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/nameser/ns_ttl.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/Makefile.inc#7 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/Symbol.map#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#10 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/gethostbydns.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/gethostbyht.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/gethostbynis.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/gethostnamadr.c#7 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getnameinfo.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getnetbydns.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getnetbyht.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getnetbynis.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getnetnamadr.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getproto.c#4 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getprotoent.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getprotoname.c#4 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservbyname.c#7 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservbyport.c#7 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservent.c#20 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/herror.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_addr.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_lnaof.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_makeaddr.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_net_ntop.c#4 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_net_pton.c#4 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_neta.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_netof.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_network.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_ntoa.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_ntop.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_pton.c#4 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/name6.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/netdb_private.h#9 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/ns_name.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/ns_netint.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/ns_parse.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/ns_print.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/ns_ttl.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/nsap_addr.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/nscache.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/nscachedcli.c#9 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_comp.c#4 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_config.h#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_data.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_debug.c#4 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_init.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_mkquery.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_mkupdate.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_query.c#4 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_send.c#4 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_send_private.h#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_update.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/resolv/Makefile.inc#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/resolv/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/resolv/h_errno.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/resolv/herror.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/resolv/mtctxres.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/resolv/res_comp.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/resolv/res_data.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/resolv/res_debug.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/resolv/res_debug.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/resolv/res_init.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/resolv/res_mkquery.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/resolv/res_private.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/resolv/res_query.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/resolv/res_send.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/resolv/res_state.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/getrpcent.c#10 edit
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sparc64/Makefile.inc#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sparc64/Symbol.map#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sparc64/fpu/fpu_qp.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/Symbol.map#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/vfprintf.c#5 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/vfscanf.c#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/vfwprintf.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/vfwscanf.c#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf.c#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/Makefile.inc#5 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/Symbol.map#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/malloc.3#5 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/malloc.c#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/strtonum.3#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/strtonum.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/getsockopt.2#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mmap.2#5 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/write.2#5 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/Makefile#8 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/amd/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/amd/amd/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/amd/include/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/bthidd/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/bthidd/bthidd.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/bthidd/client.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/bthidd/hid.c#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/bthidd/server.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/sdpd/server.c#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bootparamd/bootparamd/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/bsnmpd/Makefile#5 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/Makefile#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/inetd/Makefile#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/inetd/builtins.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/iostat/iostat.8#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/iostat/iostat.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/jail/jail.8#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/jail/jail.c#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/mailwrapper/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ntp/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ntp/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ntp/doc/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ntp/ntp-keygen/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ntp/ntpd/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ntp/ntpdc/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ntp/ntpq/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/create/main.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/lib/lib.h#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/sign/sign.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/sign/x509.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmcstat/pmcstat.8#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmcstat/pmcstat.c#6 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmcstat/pmcstat.h#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmcstat/pmcstat_log.c#6 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/portsnap/portsnap/portsnap.sh#6 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ppp/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pppd/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/rpcbind/Makefile#5 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/rtadvd/config.c#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/rtsold/if.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sendmail/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/snapinfo/snapinfo.8#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/devices.c#5 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/dist.c#6 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/keymap.c#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/label.c#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/menus.c#6 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/syslogd/syslog.conf.5#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/syslogd/syslogd.c#7 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/tcpdchk/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/tcpdmatch/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/tcpdump/tcpdump/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/vnconfig/Makefile#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/Makefile#6 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/Packet32.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#6 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/ypserv/Makefile.yp#3 integrate
Differences ...
==== //depot/projects/soc2005/nsswitch_cached/src/etc/Makefile#3 (text+ko) ====
@@ -1,7 +1,9 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.353 2006/03/11 08:51:16 ru Exp $
+# $FreeBSD: src/etc/Makefile,v 1.354 2006/03/17 18:54:20 ru Exp $
+
+.include <bsd.own.mk>
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
SUBDIR= sendmail
.endif
@@ -29,7 +31,7 @@
BSM_ETC_EXEC_FILES= ${OPENBSMDIR}/etc/audit_warn
BSM_ETC_DIR= ${DESTDIR}/etc/security
-.if !defined(NO_LPR)
+.if ${MK_LPR} != "no"
BIN1+= printcap
.endif
@@ -37,12 +39,12 @@
BIN1+= cached.conf
.endif
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
-.if !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
SSH= ${.CURDIR}/../crypto/openssh/ssh_config \
${.CURDIR}/../crypto/openssh/sshd_config \
${.CURDIR}/../crypto/openssh/moduli
.endif
+.if ${MK_OPENSSL} != "no"
SSL= ${.CURDIR}/../crypto/openssl/apps/openssl.cnf
.endif
@@ -51,24 +53,24 @@
MTREE= BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \
BSD.var.dist BSD.x11.dist BSD.x11-4.dist
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
MTREE+= BSD.sendmail.dist
.endif
-.if !defined(NO_BIND)
+.if ${MK_BIND} != "no"
MTREE+= BIND.chroot.dist
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
MTREE+= BIND.include.dist
.endif
.endif
-.if !defined(NO_BIND_ETC) && !defined(NO_BIND)
+.if ${MK_BIND_ETC} != "no"
NAMEDB= PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \
make-localhost
.endif
PPPCNF= ppp.conf
-.if defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} == "no"
ETCMAIL=mailer.conf aliases
.else
ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \
@@ -79,7 +81,7 @@
FREEBSD=COPYRIGHT
afterinstall:
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
cd ${.CURDIR}/../share/man; ${MAKE} makedb
.endif
@@ -129,21 +131,21 @@
${BSM_ETC_RESTRICTED_FILES} ${BSM_ETC_DIR}
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \
${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR}
-.if !defined(NO_I4B)
+.if ${MK_I4B} != "no"
cd ${.CURDIR}/isdn; ${MAKE} install
.endif
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
cd ${.CURDIR}/sendmail; ${MAKE} distribution
.endif
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
-.if !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${SSH} ${DESTDIR}/etc/ssh
.endif
+.if ${MK_OPENSSL} != "no"
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${SSL} ${DESTDIR}/etc/ssl
.endif
-.if !defined(NO_KERBEROS)
+.if ${MK_KERBEROS} != "no"
cd ${.CURDIR}/root; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.k5login ${DESTDIR}/root/.k5login;
@@ -160,18 +162,16 @@
ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${MTREE} ${DESTDIR}/etc/mtree
-.if !defined(NO_BIND)
-.if !defined(NO_BIND_ETC)
+.if ${MK_BIND_ETC} != "no"
cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${NAMEDB} ${DESTDIR}/var/named/etc/namedb
.endif
-.if !defined(NO_BIND_MTREE)
+.if ${MK_BIND_MTREE} != "no"
@if [ ! -e ${DESTDIR}/etc/namedb ]; then \
set -x; \
ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
fi
.endif
-.endif
cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
${PPPCNF} ${DESTDIR}/etc/ppp
cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
@@ -199,17 +199,15 @@
mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \
-p ${DESTDIR}/usr/include
-.if !defined(NO_BIND)
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \
-p ${DESTDIR}/usr/include
.endif
-.if !defined(NO_BIND_MTREE)
+.if ${MK_BIND_MTREE} != "no"
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \
-p ${DESTDIR}/var/named
.endif
-.endif
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/
.endif
cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
==== //depot/projects/soc2005/nsswitch_cached/src/etc/defaults/rc.conf#2 (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.277 2006/02/14 04:16:56 imp Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.280 2006/04/13 18:34:13 brooks Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -95,6 +95,8 @@
dhclient_program="/sbin/dhclient" # Path to dhcp client program.
dhclient_flags="" # Additional flags to pass to dhcp client.
background_dhclient="NO" # Start dhcp client in the background.
+synchronous_dhclient="YES" # Start dhclient directly on configured
+ # interfaces during startup.
firewall_enable="NO" # Set to YES to enable firewall functionality
firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall
firewall_type="UNKNOWN" # Firewall type (see /etc/rc.firewall)
@@ -229,6 +231,7 @@
### Network daemon (NFS): All need rpcbind_enable="YES" ###
amd_enable="NO" # Run amd service with $amd_flags (or NO).
+amd_program="/usr/sbin/amd" # path to amd, if you want a different one.
amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map"
amd_map_program="NO" # Can be set to "ypcat -k amd.master"
nfs_client_enable="NO" # This host is an NFS client (or NO).
==== //depot/projects/soc2005/nsswitch_cached/src/etc/gettytab#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/gettytab,v 1.23 2006/01/22 15:33:16 matteo Exp $
+# $FreeBSD: src/etc/gettytab,v 1.24 2006/04/11 09:54:23 des Exp $
# from: @(#)gettytab 5.14 (Berkeley) 3/27/91
#
# Most of the table entries here are just copies of the old getty table,
@@ -204,6 +204,16 @@
autologin|al.9600:\
:al=root:tc=std.9600:
+al.19200:\
+ :al=root:tc=std.19200:
+al.38400:\
+ :al=root:tc=std.38400:
+al.57600:\
+ :al=root:tc=std.57600:
+al.115200:\
+ :al=root:tc=std.115200:
+al.230400:\
+ :al=root:tc=std.230400:
#
# Entries for 3-wire serial terminals. These don't supply carrier, so
==== //depot/projects/soc2005/nsswitch_cached/src/etc/hosts.allow#2 (text+ko) ====
@@ -1,6 +1,6 @@
#
# hosts.allow access control file for "tcp wrapped" applications.
-# $FreeBSD: src/etc/hosts.allow,v 1.20 2006/02/16 14:46:03 ume Exp $
+# $FreeBSD: src/etc/hosts.allow,v 1.21 2006/03/17 18:54:21 ru Exp $
#
# NOTE: The hosts.deny file is deprecated.
# Place both 'allow' and 'deny' rules in the hosts.allow file.
@@ -37,7 +37,7 @@
# Allow anything from localhost. Note that an IP address (not a host
# name) *MUST* be specified for rpcbind(8).
ALL : localhost 127.0.0.1 : allow
-# Comment out next line if you build libwrap with NO_INET6=yes.
+# Comment out next line if you build libwrap without IPv6 support.
ALL : [::1] : allow
ALL : my.machine.example.com 192.0.2.35 : allow
==== //depot/projects/soc2005/nsswitch_cached/src/etc/mtree/BSD.include.dist#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.105 2005/12/29 14:40:19 dfr Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.106 2006/03/19 15:44:53 rwatson Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -210,6 +210,8 @@
rpcsvc
..
security
+ audit
+ ..
mac_biba
..
mac_bsdextended
==== //depot/projects/soc2005/nsswitch_cached/src/etc/mtree/Makefile#2 (text+ko) ====
@@ -1,4 +1,6 @@
-# $FreeBSD: src/etc/mtree/Makefile,v 1.5 2004/12/21 08:46:50 ru Exp $
+# $FreeBSD: src/etc/mtree/Makefile,v 1.6 2006/03/17 18:54:21 ru Exp $
+
+.include <bsd.own.mk>
FILES= ${_BIND.chroot.dist} \
${_BIND.include.dist} \
@@ -10,9 +12,9 @@
BSD.x11-4.dist \
BSD.x11.dist
-.if !defined(NO_BIND)
+.if ${MK_BIND} != "no"
_BIND.chroot.dist= BIND.chroot.dist
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
_BIND.include.dist= BIND.include.dist
.endif
.endif
==== //depot/projects/soc2005/nsswitch_cached/src/etc/network.subr#2 (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.168 2005/11/14 23:34:50 brooks Exp $
+# $FreeBSD: src/etc/network.subr,v 1.171 2006/04/13 18:34:13 brooks Exp $
#
#
@@ -44,7 +44,7 @@
ifconfig_args=`ifconfig_getargs $1`
if [ -n "${ifconfig_args}" ]; then
ifconfig $1 up
- eval "ifconfig $1 ${ifconfig_args}"
+ ifconfig $1 ${ifconfig_args}
_cfg=0
fi
@@ -60,7 +60,9 @@
if [ $_cfg -ne 0 ] ; then
ifconfig $1 up
fi
- /etc/rc.d/dhclient start $1
+ if syncdhcpif $1; then
+ /etc/rc.d/dhclient start $1
+ fi
_cfg=0
fi
@@ -72,6 +74,8 @@
# 0 if inet entries were found and removed. It returns 1 if
# no entries were found or they could not be removed.
#
+# XXX: should not be only inet
+#
ifconfig_down()
{
[ -z "$1" ] && return 1
@@ -105,9 +109,36 @@
_cfg=0
fi
+ ifconfig $1 down
+
return $_cfg
}
+# get_if_var if var [default]
+# Return the value of the pseudo-hash corresponding to $if where
+# $var is a string containg the sub-string "IF" which will be
+# replaced with $if after the characters defined in _punct are
+# replaced with '_'. If the variable is unset, replace it with
+# $default if given.
+get_if_var()
+{
+ if [ $# -ne 2 -a $# -ne 3 ]; then
+ err 3 'USAGE: get_if_var name var [default]'
+ fi
+
+ _if=$1
+ _punct=". - / +"
+ for _punct_c in $_punct; do
+ _if=`ltr ${_if} ${_punct_c} '_'`
+ done
+ _var=$2
+ _default=$3
+
+ prefix=${_var%%IF*}
+ suffix=${_var##*IF}
+ eval echo \${${prefix}${_if}${suffix}-${_default}}
+}
+
# _ifconfig_getargs if
# Echos the arguments for the supplied interface to stdout.
# returns 1 if empty. In general, ifconfig_getargs should be used
@@ -119,9 +150,7 @@
return 1
fi
- eval _args=\${ifconfig_$1-$ifconfig_DEFAULT}
-
- echo "$_args"
+ get_if_var $_ifn ifconfig_IF "$ifconfig_DEFAULT"
}
# ifconfig_getargs if
@@ -137,12 +166,11 @@
for _arg in $_tmpargs; do
case $_arg in
- [Dd][Hh][Cc][Pp])
- ;;
- [Nn][Oo][Aa][Uu][Tt][Oo])
- ;;
- [Ww][Pp][Aa])
- ;;
+ [Dd][Hh][Cc][Pp]) ;;
+ [Nn][Oo][Aa][Uu][Tt][Oo]) ;;
+ [Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;;
+ [Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;;
+ [Ww][Pp][Aa]) ;;
*)
_args="$_args $_arg"
;;
@@ -178,11 +206,40 @@
[Dd][Hh][Cc][Pp])
return 0
;;
+ [Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp])
+ return 0
+ ;;
+ [Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp])
+ return 0
+ ;;
esac
done
return 1
}
+# syncdhcpif
+# Returns 0 if the interface should be configured synchronously and
+# 1 otherwise.
+syncdhcpif()
+{
+ _tmpargs=`_ifconfig_getargs $1`
+ for _arg in $_tmpargs; do
+ case $_arg in
+ [Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp])
+ return 1
+ ;;
+ [Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp])
+ return 0
+ ;;
+ esac
+ done
+ if checkyesno synchronous_dhclient; then
+ return 0
+ else
+ return 1
+ fi
+}
+
# wpaif if
# Returns 0 if the interface is a WPA interface and 1 otherwise.
wpaif()
@@ -226,7 +283,7 @@
_action=$2
# get ipv4-addresses
- eval cidr_addr=\${ipv4_addrs_${_if}}
+ cidr_addr=`get_if_var $_if ipv4_addrs_IF`
for _cidr in ${cidr_addr}; do
_ipaddr=${_cidr%%/*}
@@ -266,7 +323,7 @@
_ret=1
alias=0
while : ; do
- eval ifconfig_args=\$ifconfig_$1_alias${alias}
+ ifconfig_args=`get_if_var $1 ifconfig_IF_alias${alias}`
if [ -n "${ifconfig_args}" ]; then
ifconfig $1 ${ifconfig_args} alias
alias=$((${alias} + 1))
@@ -288,7 +345,7 @@
_ret=1
alias=0
while : ; do
- eval ifconfig_args=\$ifconfig_$1_alias${alias}
+ ifconfig_args=`get_if_var $1 ifconfig_IF_alias${alias}`
if [ -n "${ifconfig_args}" ]; then
ifconfig $1 ${ifconfig_args} -alias
alias=$((${alias} + 1))
@@ -367,7 +424,7 @@
;;
*)
for i in ${gif_interfaces}; do
- eval peers=\$gifconfig_$i
+ peers=`get_if_var $i gifconfig_IF`
case ${peers} in
'')
continue
@@ -391,7 +448,7 @@
ipx_up()
{
ifn="$1"
- eval ifconfig_args=\$ifconfig_${ifn}_ipx
+ ifconfig_args=`get_if_var $ifn ifconfig_IF_ipx`
if [ -n "${ifconfig_args}" ]; then
ifconfig ${ifn} ${ifconfig_args}
return 0
@@ -438,7 +495,7 @@
_ifn_list="`ifconfig -l`"
[ -z "$_ifn_list" ] && return 0
for _if in ${_ifn_list} ; do
- eval _ifname=\$ifconfig_${_if}_name
+ _ifname=`get_if_var $_if ifconfig_IF_name`
if [ ! -z "$_ifname" ]; then
ifconfig $_if name $_ifname
fi
@@ -499,7 +556,7 @@
if dhcpif $_if; then
_dhcplist="${_dhcplist}${_aprefix}${_if}"
[ -z "$_aprefix" ] && _aprefix=' '
- elif [ -n "`_ifconfig_getargs $if`" ]; then
+ elif [ -n "`_ifconfig_getargs $_if`" ]; then
_nodhcplist="${_nodhcplist}${_bprefix}${_if}"
[ -z "$_bprefix" ] && _bprefix=' '
fi
@@ -564,7 +621,7 @@
esac
for i in $interfaces; do
rtsol_interface=yes
- eval prefix=\$ipv6_prefix_$i
+ prefix=`get_if_var $i ipv6_prefix_IF`
if [ -n "${prefix}" ]; then
rtsol_available=no
rtsol_interface=no
@@ -584,7 +641,7 @@
esac
done
fi
- eval ipv6_ifconfig=\$ipv6_ifconfig_$i
+ ipv6_ifconfig=`get_if_var $i ipv6_ifconfig_IF`
if [ -n "${ipv6_ifconfig}" ]; then
rtsol_available=no
rtsol_interface=no
@@ -619,7 +676,7 @@
for i in $interfaces; do
alias=0
while : ; do
- eval ipv6_ifconfig=\$ipv6_ifconfig_${i}_alias${alias}
+ ipv6_ifconfig=`get_if_var $i ipv6_ifconfig_IF_alias${alias}`
if [ -z "${ipv6_ifconfig}" ]; then
break;
fi
@@ -695,7 +752,7 @@
;;
*)
for i in ${ipv6_static_routes}; do
- eval ipv6_route_args=\$ipv6_route_${i}
+ ipv6_route_args=`get_if_var $i ipv6_route_IF`
route add -inet6 ${ipv6_route_args}
done
;;
==== //depot/projects/soc2005/nsswitch_cached/src/etc/rc.d/Makefile#3 (text+ko) ====
@@ -1,5 +1,7 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.66 2006/02/13 20:08:31 imp Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.69 2006/03/28 18:28:33 simon Exp $
+
+.include <bsd.own.mk>
FILES= DAEMON LOGIN NETWORKING SERVERS \
abi accounting addswap adjkerntz amd \
@@ -13,12 +15,11 @@
gbde geli geli2 \
hcsecd \
hostapd hostname \
- ike \
inetd initrandom \
ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \
ipnat ipsec ipxrouted isdnd \
jail \
- kadmind kerberos keyserv kldxref kpasswdd \
+ kadmind kerberos kernel keyserv kldxref kpasswdd \
ldconfig local localpkg lpd \
mixer motd mountcritlocal mountcritremote \
mountd moused mroute6d mrouted msgs \
@@ -41,7 +42,7 @@
ypbind yppasswdd ypserv \
ypset ypupdated ypxfrd
-.if !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
FILES+= sshd
.endif
==== //depot/projects/soc2005/nsswitch_cached/src/etc/rc.d/amd#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $
-# $FreeBSD: src/etc/rc.d/amd,v 1.16 2005/12/30 08:57:33 rse Exp $
+# $FreeBSD: src/etc/rc.d/amd,v 1.17 2006/04/11 09:02:06 flz Exp $
#
# PROVIDE: amd
-# REQUIRE: rpcbind ypbind nfsclient cleanvar
+# REQUIRE: rpcbind ypbind nfsclient cleanvar ldconfig
# BEFORE: DAEMON
# KEYWORD: nojail
==== //depot/projects/soc2005/nsswitch_cached/src/etc/rc.d/jail#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/jail,v 1.26 2006/03/08 20:40:37 fjoe Exp $
+# $FreeBSD: src/etc/rc.d/jail,v 1.27 2006/04/08 12:15:35 flz Exp $
#
# PROVIDE: jail
@@ -33,9 +33,10 @@
jail_procdir="${jail_rootdir}/proc"
eval jail_hostname=\"\$jail_${_j}_hostname\"
eval jail_ip=\"\$jail_${_j}_ip\"
+ eval jail_interface=\"\${jail_${_j}_interface:-${jail_interface}}\"
eval jail_exec=\"\$jail_${_j}_exec\"
- eval jail_exec_start=\"\$jail_${_j}_exec_start\"
- eval jail_exec_stop=\"\$jail_${_j}_exec_stop\"
+ eval jail_exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\"
+ eval jail_exec_stop=\"\${jail_${_j}_exec_stop:-${jail_exec_stop}}\"
if [ -n "${jail_exec}" ]; then
# simple/backward-compatible execution
jail_exec_start="${jail_exec}"
@@ -51,20 +52,20 @@
fi
# The default jail ruleset will be used by rc.subr if none is specified.
- eval jail_ruleset=\"\$jail_${_j}_devfs_ruleset\"
- eval jail_devfs=\"\$jail_${_j}_devfs_enable\"
+ eval jail_ruleset=\"\${jail_${_j}_devfs_ruleset:-${jail_devfs_ruleset}}\"
+ eval jail_devfs=\"\${jail_${_j}_devfs_enable:-${jail_devfs_enable}}\"
[ -z "${jail_devfs}" ] && jail_devfs="NO"
- eval jail_fdescfs=\"\$jail_${_j}_fdescfs_enable\"
+ eval jail_fdescfs=\"\${jail_${_j}_fdescfs_enable:-${jail_fdescfs_enable}}\"
[ -z "${jail_fdescfs}" ] && jail_fdescfs="NO"
- eval jail_procfs=\"\$jail_${_j}_procfs_enable\"
+ eval jail_procfs=\"\${jail_${_j}_procfs_enable:-${jail_procfs_enable}}\"
[ -z "${jail_procfs}" ] && jail_procfs="NO"
- eval jail_mount=\"\$jail_${_j}_mount_enable\"
+ eval jail_mount=\"\${jail_${_j}_mount_enable:-${jail_mount_enable}}\"
[ -z "${jail_mount}" ] && jail_mount="NO"
# "/etc/fstab.${_j}" will be used for {,u}mount(8) if none is specified.
- eval jail_fstab=\"\$jail_${_j}_fstab\"
+ eval jail_fstab=\"\${jail_${_j}_fstab:-${jail_fstab}}\"
[ -z "${jail_fstab}" ] && jail_fstab="/etc/fstab.${_j}"
- eval jail_flags=\"\$jail_${_j}_flags\"
+ eval jail_flags=\"\${jail_${_j}_flags:-${jail_flags}}\"
[ -z "${jail_flags}" ] && jail_flags="-l -U root"
# Debugging aid
@@ -75,6 +76,7 @@
debug "$_j mount enable: $jail_mount"
debug "$_j hostname: $jail_hostname"
debug "$_j ip: $jail_ip"
+ debug "$_j interface: $jail_interface"
debug "$_j root: $jail_rootdir"
debug "$_j devdir: $jail_devdir"
debug "$_j fdescdir: $jail_fdescdir"
@@ -162,6 +164,9 @@
echo -n " [${jail_hostname} already running (/var/run/jail_${_jail}.id exists)]"
continue;
fi
+ if [ -n ${jail_interface} ]; then
+ ifconfig ${jail_interface} alias ${jail_ip} netmask 255.255.255.255
+ fi
if checkyesno jail_mount; then
info "Mounting fstab for jail ${_jail} (${jail_fstab})"
if [ ! -f "${jail_fstab}" ]; then
@@ -234,6 +239,9 @@
jail_umount_fs
echo -n " $jail_hostname"
fi
+ if [ -n ${jail_interface} ]; then
+ ifconfig ${jail_interface} -alias ${jail_ip}
+ fi
rm /var/run/jail_${_jail}.id
else
echo "cannot stop jail ${_jail}. No jail id in /var/run"
==== //depot/projects/soc2005/nsswitch_cached/src/etc/rc.d/nsswitch#2 (text+ko) ====
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/nsswitch,v 1.5 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/nsswitch,v 1.7 2006/04/12 12:01:53 ume Exp $
#
# PROVIDE: nsswitch
@@ -40,17 +40,29 @@
{
host_conf=$1; shift;
nsswitch_conf=$1; shift;
- awk ' \
- /^[:blank:]*#/ { next } \
- /(hosts|local|file)/ { nsswitch[c] = "files"; c++; next } \
- /(dns|bind)/ { nsswitch[c] = "dns"; c++; next } \
- /nis/ { nsswitch[c] = "nis"; c++; next } \
- { printf "Warning: unrecognized line [%s]", $0 > "/dev/stderr" } \
- END { \
- printf "hosts: "; \
- for (i in nsswitch) printf "%s ", nsswitch[i]; \
- printf "\n"; \
- }' < $host_conf > $nsswitch_conf
+
+ while read line; do
+ line=${line##[ ]}
+ case $line in
+ hosts|local|file)
+ _nsswitch="${_nsswitch}${_nsswitch+ }files"
+ ;;
+ dns|bind)
+ _nsswitch="${_nsswitch}${_nsswitch+ }dns"
+ ;;
+ nis)
+ _nsswitch="${_nsswitch}${_nsswitch+ }nis"
+ ;;
+ '#'*)
+ ;;
+ *)
+ printf "Warning: unrecognized line [%s]", $line > "/dev/stderr"
+ ;;
+
+ esac
+ done < $host_conf
+
+ echo "hosts: $_nsswitch" > $nsswitch_conf
}
generate_nsswitch_conf()
@@ -73,30 +85,47 @@
nsswitch_conf=$1; shift;
host_conf=$1; shift;
- awk '
-BEGIN {
- xlat["files"] = "hosts";
- xlat["dns"] = "bind";
- xlat["nis"] = "nis";
- cont = 0;
-}
-sub(/^[\t ]*hosts:/, "") || cont {
- if (!cont)
- srcs = ""
- sub(/#.*/, "")
- gsub(/[][]/, " & ")
- cont = sub(/\\$/, "")
- srcs = srcs " " $0
-}
-END {
- print "# Auto-generated from nsswitch.conf, do not edit"
- ns = split(srcs, s)
- for (n = 1; n <= ns; ++n) {
- if (s[n] in xlat)
- print xlat[s[n]]
- }
-}
-' <$nsswitch_conf >$host_conf
+ _cont=0
+ _sources=""
+ while read line; do
+ line=${line##[ ]}
+ case $line in
+ hosts:*)
+ ;;
+ *)
+ if [ $_cont -ne 1 ]; then
+ continue
+ fi
+ ;;
+ esac
+ if [ "${line%\\}" = "${line}\\" ]; then
+ _cont=1
+ fi
+ line=${line#hosts:}
+ line=${line%\\}
+ line=${line%%#*}
+ _sources="${_sources}${_sources:+ }$line"
+ done < $nsswitch_conf
+
+ echo "# Auto-generated from nsswitch.conf" > $host_conf
+ for _s in ${_sources}; do
+ case $_s in
+ files)
+ echo "hosts" >> $host_conf
+ ;;
+ dns)
+ echo "dns" >> $host_conf
+ ;;
+ nis)
+ echo "nis" >> $host_conf
+ ;;
+ *=*)
+ ;;
+ *)
+ printf "Warning: unrecognized source [%s]", $_s > "/dev/stderr"
+ ;;
+ esac
+ done
}
nsswitch_start()
==== //depot/projects/soc2005/nsswitch_cached/src/etc/rc.d/serial#2 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list