PERFORCE change 103575 for review
Michael Bushkov
bushman at FreeBSD.org
Thu Aug 10 15:09:22 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=103575
Change 103575 by bushman at bushman_nss_ldap_cached on 2006/08/10 15:08:13
IFC. _icmp_ nsswitch source functionality will be moved to the separate nss_icmp module library. Currently it is omitted in the branch.
Affected files ...
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.include.dist#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.local.dist#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.usr.dist#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/Makefile#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/archdep#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/dhclient#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ipfw#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/kernel#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mdconfig#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mdconfig2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mountcritlocal#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mountlate#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/natd#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ntpdate#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.subr#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/include/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/Makefile#6 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getgrent.c#4 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/msgctl.3#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/syslog.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tls.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/Makefile.inc#6 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/getaddrinfo.c#4 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/name6.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/resolver.3#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/posix1e/Makefile.inc#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/posix1e/mac_is_present.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/posix1e/mac_is_present_np.3#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/posix1e/mac_prepare.3#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/posix1e/mac_set.3#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/posix1e/mac_text.3#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/resolv/res_init.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/resolv/res_send.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/malloc.c#4 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/Symbol.map#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/kse.2#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/uuid/uuid_compare.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_compat/compat_group.c#4 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_group.c#5 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/config/config.y#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/config/mkmakefile.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cron/cron/cron.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/elf2exe/Makefile#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/elf2exe/elf2exe.8#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/elf2exe/elf2exe.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/fdread/fdread.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/i4b/isdnd/controller.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/i4b/isdnd/main.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/i4b/isdndebug/main.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/i4b/isdnmonitor/main.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/i4b/isdnphone/main.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/i4b/isdntelctl/main.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/i4b/isdntest/main.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/inetd/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/kldxref/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/kldxref/kldxref.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/lpr/Makefile.inc#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/lpr/lpd/printjob.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mailwrapper/mailwrapper.8#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mailwrapper/mailwrapper.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mld6query/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mountd/mountd.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/moused/moused.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mtree/misc.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mtree/mtree.8#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mtree/mtree.h#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mtree/spec.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mtree/test/test05.sh#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mtree/verify.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ndp/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/newsyslog/newsyslog.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/config.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/debug.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/main.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/mkpeer.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/name.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/status.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/types.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/nvram/Makefile#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/nvram/nvram.8#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/nvram/nvram.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/lib/url.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rip6query/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/route6d/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rrenumd/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rtadvd/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rtsold/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/Makefile#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/command.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/config.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/devices.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/disks.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/dispatch.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/dmenu.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/globals.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/help/partition.hlp#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/help/slice.hlp#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/install.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/label.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/list.h#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/main.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/menus.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/misc.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/msg.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/sade.8#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/sade.h#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/system.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/termcap.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/variable.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/wizard.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/devices.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/install.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/main.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/misc.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/sysinstall.h#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/syslogd/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/traceroute6/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/trpt/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/trpt/trpt.c#2 integrate
Differences ...
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#3 (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.288 2006/06/07 17:14:27 brueffer Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.291 2006/08/05 20:28:50 njl Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -261,6 +261,8 @@
ntpdate_enable="NO" # Run ntpdate to sync time on boot (or NO).
ntpdate_program="/usr/sbin/ntpdate" # path to ntpdate, if you want a different one.
ntpdate_flags="-b" # Flags to ntpdate (if enabled).
+ntpdate_config="/etc/ntp.conf" # ntpdate(8) configuration file
+ntpdate_hosts="" # Whitespace-separated list of ntpdate(8) servers.
ntpd_enable="NO" # Run ntpd Network Time Protocol (or NO).
ntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one.
ntpd_config="/etc/ntp.conf" # ntpd(8) configuration file
@@ -480,7 +482,6 @@
linux_enable="NO" # Linux binary compatibility loaded at startup (or NO).
svr4_enable="NO" # SysVR4 emulation loaded at startup (or NO).
-osf1_enable="NO" # Alpha OSF/1 emulation loaded at startup (or NO).
clear_tmp_enable="NO" # Clear /tmp at startup.
clear_tmp_X="YES" # Clear and recreate X11-related directories in /tmp
ldconfig_insecure="NO" # Set to YES to disable ldconfig security checks
@@ -500,7 +501,6 @@
# in the system booting with securelevel set to 1, as
# init(8) will raise the level when rc(8) completes.
update_motd="YES" # update version info in /etc/motd (or NO)
-unaligned_print="YES" # print unaligned access warnings on the alpha (or NO).
entropy_file="/entropy" # Set to NO to disable caching entropy through reboots.
# /var/db/entropy-file is preferred if / is not avail.
entropy_dir="/var/db/entropy" # Set to NO to disable caching entropy via cron.
@@ -516,9 +516,9 @@
devfs_system_ruleset="" # The name of a ruleset to apply to /dev
devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to
# apply (must be mounted already, i.e. fstab(5))
-performance_cx_lowest="LOW" # Online CPU idle state
+performance_cx_lowest="HIGH" # Online CPU idle state
performance_cpu_freq="NONE" # Online CPU frequency
-economy_cx_lowest="LOW" # Offline CPU idle state
+economy_cx_lowest="HIGH" # Offline CPU idle state
economy_cpu_freq="NONE" # Offline CPU frequency
virecover_enable="YES" # Perform housekeeping for the vi(1) editor
ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.include.dist#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.106 2006/03/19 15:44:53 rwatson Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.107 2006/08/01 22:19:00 sobomax Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -56,6 +56,8 @@
..
ppbus
..
+ powermac_nvram
+ ..
smbus
..
speaker
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.local.dist#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.118 2006/01/08 10:15:30 dougb Exp $
+# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.119 2006/08/02 17:22:30 marcel Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -111,8 +111,6 @@
cat3
..
cat4
- alpha
- ..
i386
..
..
@@ -123,8 +121,6 @@
cat7
..
cat8
- alpha
- ..
i386
..
..
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.usr.dist#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.314 2006/05/17 09:33:05 phk Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.319 2006/08/03 05:44:51 jb Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -18,6 +18,10 @@
aout
..
..
+ dtrace
+ ..
+ engines
+ ..
..
libdata
gcc
@@ -653,8 +657,6 @@
cat3
..
cat4
- alpha
- ..
amd64
..
i386
@@ -669,8 +671,6 @@
cat7
..
cat8
- alpha
- ..
amd64
..
i386
@@ -690,8 +690,6 @@
cat3
..
cat4
- alpha
- ..
amd64
..
i386
@@ -706,8 +704,6 @@
cat7
..
cat8
- alpha
- ..
amd64
..
i386
@@ -766,8 +762,6 @@
man3
..
man4
- alpha
- ..
amd64
..
i386
@@ -782,8 +776,6 @@
man7
..
man8
- alpha
- ..
amd64
..
i386
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.73 2006/06/01 11:01:54 thompsa Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.74 2006/08/04 18:37:03 des Exp $
.include <bsd.own.mk>
@@ -21,7 +21,7 @@
jail \
kadmind kerberos kernel keyserv kldxref kpasswdd \
ldconfig local localpkg lpd \
- mixer motd mountcritlocal mountcritremote \
+ mixer motd mountcritlocal mountcritremote mountlate \
mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \
named natd netif netoptions \
network_ipv6 newsyslog nfsclient nfsd \
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/archdep#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/archdep,v 1.11 2006/02/19 08:18:48 dougb Exp $
+# $FreeBSD: src/etc/rc.d/archdep,v 1.12 2006/07/21 15:55:18 yar Exp $
#
# PROVIDE: archdep
@@ -13,27 +13,6 @@
start_cmd="archdep_start"
stop_cmd=":"
-# should we print out unaligned access warnings?
-#
-unaligned_warnings()
-{
- if ! checkyesno unaligned_print; then
- sysctl machdep.unaligned_print=0
- fi
-}
-
-# Alpha OSF/1 binary emulation
-#
-osf1_compat()
-{
- if checkyesno osf1_enable; then
- echo -n ' OSF/1'
- if ! kldstat -v | grep osf1_ecoff > /dev/null; then
- kldload osf1 > /dev/null 2>&1
- fi
- fi
-}
-
# SCO binary emulation
#
ibcs2_compat()
@@ -61,10 +40,6 @@
i386)
ibcs2_compat
;;
- alpha)
- osf1_compat
- unaligned_warnings
- ;;
esac
echo '.'
}
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/dhclient#2 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/dhclient,v 1.21 2005/07/26 00:37:19 brooks Exp $
+# $FreeBSD: src/etc/rc.d/dhclient,v 1.22 2006/07/09 06:54:24 stefanf Exp $
#
# PROVIDE: dhclient
@@ -18,7 +18,7 @@
dhclient_start()
{
- # prevent unnecessicary restarts
+ # prevent unnecessary restarts
# XXX: should use a pidfile
if [ -x /usr/bin/pgrep ]; then
pids=`/usr/bin/pgrep -f "dhclient: $ifn(\$| .*)"`
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ipfw#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ipfw,v 1.12 2006/02/26 16:45:29 wkoszek Exp $
+# $FreeBSD: src/etc/rc.d/ipfw,v 1.13 2006/07/25 17:28:18 yar Exp $
#
# PROVIDE: ipfw
@@ -35,23 +35,21 @@
[ -z "${firewall_script}" ] && firewall_script=/etc/rc.firewall
if [ -r "${firewall_script}" ]; then
- echo -n 'Starting divert daemons:'
if [ -f /etc/rc.d/natd ] ; then
/etc/rc.d/natd start
fi
. "${firewall_script}"
- echo -n 'Firewall rules loaded'
+ echo 'Firewall rules loaded.'
elif [ "`ipfw list 65535`" = "65535 deny ip from any to any" ]; then
echo 'Warning: kernel has firewall functionality, but' \
' firewall rules are not enabled.'
echo ' All ip services are disabled.'
fi
- echo '.'
# Firewall logging
#
if checkyesno firewall_logging; then
- echo 'Firewall logging enabled'
+ echo 'Firewall logging enabled.'
sysctl net.inet.ip.fw.verbose=1 >/dev/null
fi
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/kernel#2 (text) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/kernel,v 1.1 2006/03/17 16:28:12 des Exp $
+# $FreeBSD: src/etc/rc.d/kernel,v 1.2 2006/07/30 12:54:37 mckay Exp $
#
# PROVIDE: kernel
@@ -16,8 +16,10 @@
kernel_start()
{
bootdir=$(dirname $(sysctl -n kern.bootfile))
- if [ ! -e /boot/kernel -o -h /boot/kernel ] ; then
- ln -hfs ${bootdir} /boot/kernel
+ if [ "$bootdir" != /boot/kernel ] ; then
+ if [ ! -e /boot/kernel -o -h /boot/kernel ] ; then
+ ln -hfs ${bootdir} /boot/kernel
+ fi
fi
}
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mdconfig#2 (text) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/mdconfig,v 1.2 2006/05/18 16:04:56 flz Exp $
+# $FreeBSD: src/etc/rc.d/mdconfig,v 1.3 2006/07/25 17:19:00 pjd Exp $
#
# PROVIDE: mdconfig
@@ -103,6 +103,11 @@
{
local _md _mp _config _type _dev _file _fs _newfs _fsck_cmd
+ # If there are no devices return before loading geom_md.ko.
+ if [ -z "${_mdconfig_list}" ]; then
+ return
+ fi
+
kldstat -q -m g_md || kldload geom_md || err 1 "geom_md failed to load."
for _md in ${_mdconfig_list}; do
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mdconfig2#2 (text) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/mdconfig2,v 1.2 2006/05/18 16:04:56 flz Exp $
+# $FreeBSD: src/etc/rc.d/mdconfig2,v 1.3 2006/07/25 17:19:00 pjd Exp $
#
# PROVIDE: mdconfig2
@@ -111,6 +111,11 @@
{
local _md _fs _mp _mounted _dev _config _type _file _owner _perms _files _populate _fsck_cmd _i
+ # If there are no devices return before loading geom_md.ko.
+ if [ -z "${_mdconfig2_list}" ]; then
+ return
+ fi
+
kldstat -q -m g_md || kldload geom_md || err 1 "geom_md failed to load."
for _md in ${_mdconfig2_list}; do
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mountcritlocal#2 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $
-# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.12 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.13 2006/07/12 16:05:51 des Exp $
#
# PROVIDE: mountcritlocal
@@ -27,6 +27,7 @@
esac
# Mount everything except nfs filesystems.
+ echo -n 'Mounting local file systems:'
mount_excludes='no'
for i in ${netfs_types}; do
fstype=${i%:*}
@@ -34,6 +35,7 @@
done
mount_excludes=${mount_excludes%,}
mount -a -t ${mount_excludes}
+ echo '.'
case $? in
0)
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/natd#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/natd,v 1.3 2004/10/22 19:36:03 andre Exp $
+# $FreeBSD: src/etc/rc.d/natd,v 1.4 2006/07/25 17:25:44 yar Exp $
#
# PROVIDE: natd
@@ -12,8 +12,8 @@
name="natd"
rcvar=`set_rcvar`
command="/sbin/${name}"
+pidfile="/var/run/${name}.pid"
start_precmd="natd_precmd"
-start_cmd="natd_start"
natd_precmd()
{
@@ -24,31 +24,25 @@
fi
fi
- return 0
-}
+ if [ -n "${natd_interface}" ]; then
+ dhcp_list="`list_net_interfaces dhcp`"
+ for ifn in ${dhcp_list}; do
+ case "${natd_interface}" in
+ ${ifn})
+ rc_flags="$rc_flags -dynamic"
+ ;;
+ esac
+ done
-natd_start()
-{
- dhcp_list="`list_net_interfaces dhcp`"
- for ifn in ${dhcp_list}; do
- case ${natd_interface} in
- ${ifn})
- natd_flags="$natd_flags -dynamic"
- ;;
- *)
- ;;
- esac
- done
- if [ -n "${natd_interface}" ]; then
- if echo ${natd_interface} | \
- grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then
- natd_flags="$natd_flags -a ${natd_interface}"
+ if echo "${natd_interface}" | \
+ grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then
+ rc_flags="$rc_flags -a ${natd_interface}"
else
- natd_flags="$natd_flags -n ${natd_interface}"
+ rc_flags="$rc_flags -n ${natd_interface}"
fi
fi
- echo -n ' natd'
- ${natd_program:-/sbin/natd} ${natd_flags} ${natd_ifarg}
+
+ return 0
}
load_rc_config $name
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ntpdate#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ntpdate,v 1.15 2006/01/16 06:03:42 dougb Exp $
+# $FreeBSD: src/etc/rc.d/ntpdate,v 1.16 2006/07/20 10:07:34 flz Exp $
#
# PROVIDE: ntpdate
@@ -16,11 +16,11 @@
ntpdate_start()
{
- if [ -z "$ntpdate_hosts" -a -f /etc/ntp.conf ]; then
+ if [ -z "$ntpdate_hosts" -a -f ${ntpdate_config} ]; then
ntpdate_hosts=`awk '
/^server[ \t]*127.127/ {next}
/^(server|peer)/ {print $2}
- ' </etc/ntp.conf`
+ ' < ${ntpdate_config}`
fi
if [ -n "$ntpdate_hosts" -o -n "$rc_flags" ]; then
echo "Setting date via ntp."
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.subr#3 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: rc.subr,v 1.66 2006/04/01 10:05:50 he Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.59 2006/06/21 09:42:55 yar Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.64 2006/07/26 08:03:24 yar Exp $
#
# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -613,7 +613,7 @@
fi
if [ ! -x ${_chroot}${command} ]; then
- info "run_rc_command: cannot run ($command)."
+ warn "run_rc_command: cannot run $command"
return 1
fi
@@ -656,7 +656,7 @@
return 1
fi
- # setup the command to run, and run it
+ # setup the full command to run
#
echo "Starting ${name}."
if [ -n "$_chroot" ]; then
@@ -674,6 +674,7 @@
fi
fi
+ # run the full command;
# if the cmd failed and force
# isn't set, exit
#
@@ -1141,7 +1142,7 @@
return 1
fi
if [ ! -d "$linkdir" ]; then
- warn "$_me: the directory $linkdir does not exist"
+ warn "$_me: the directory $linkdir does not exist."
return 1
fi
if ! ln -sf $src $link; then
@@ -1358,12 +1359,12 @@
# Code common to scripts that need to load a kernel module
# if it isn't in the kernel yet. Syntax:
-# load_kld [-e regexp] [-m modname] filename
+# load_kld [-e regex] [-m module] file
# where -e or -m chooses the way to check if the module
# is already loaded:
-# regexp is egrep'd in the output from `kldstat -v',
-# modname is passed to `kldstat -m'.
-# The default way is as though `-m filename' were specified.
+# regex is egrep'd in the output from `kldstat -v',
+# module is passed to `kldstat -m'.
+# The default way is as though `-m file' were specified.
load_kld()
{
local _loaded _mod _opt _re
@@ -1372,9 +1373,13 @@
case "$_opt" in
e) _re="$OPTARG" ;;
m) _mod="$OPTARG" ;;
+ *) err 3 'USAGE: load_kld [-e regex] [-m module] file' ;;
esac
done
shift $(($OPTIND - 1))
+ if [ $# -ne 1 ]; then
+ err 3 'USAGE: load_kld [-e regex] [-m module] file'
+ fi
_mod=${_mod:-$1}
_loaded=false
if [ -n "$_re" ]; then
@@ -1390,7 +1395,11 @@
if ! kldload "$1"; then
warn "Unable to load kernel module $1"
return 1
+ else
+ info "$1 kernel module loaded."
fi
+ else
+ debug "load_kld: $1 kernel module already loaded."
fi
return 0
}
==== //depot/projects/soc2006/nss_ldap_cached/src/include/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.261 2006/03/30 20:15:53 ume Exp $
+# $FreeBSD: src/include/Makefile,v 1.262 2006/08/01 22:19:00 sobomax Exp $
#
# Doing a "make install" builds /usr/include.
@@ -41,7 +41,7 @@
LSUBDIRS= cam/scsi \
dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \
dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \
- dev/pbio dev/ppbus dev/smbus dev/speaker dev/usb dev/wi dev/utopia \
+ dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/wi dev/utopia \
fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \
fs/unionfs \
@@ -55,6 +55,10 @@
security/mac_mls security/mac_partition \
ufs/ffs ufs/ufs
+.if ${MACHINE_ARCH} == "powerpc"
+_dev_powermac_nvram= dev/powermac_nvram
+.endif
+
.if ${MK_GPIB} != "no"
_dev_ieee488= dev/ieee488
.endif
==== //depot/projects/soc2006/nss_ldap_cached/src/lib/Makefile#6 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.214 2006/03/20 14:24:57 ru Exp $
+# $FreeBSD: src/lib/Makefile,v 1.215 2006/08/04 17:56:31 marcel Exp $
.include <bsd.own.mk>
@@ -115,7 +115,7 @@
_libthr= libthr
.endif
-.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "powerpc"
+.if ${MACHINE_ARCH} != "arm"
_libthread_db= libthread_db
.endif
==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getgrent.c#4 (text+ko) ====
==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/msgctl.3#2 (text+ko) ====
@@ -29,7 +29,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.19 2003/09/08 19:57:14 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.20 2006/08/09 18:05:44 maxim Exp $
.\"/
.Dd November 24, 1997
.Dt MSGCTL 3
@@ -83,7 +83,7 @@
The
.Vt ipc_perm
structure used inside the
-.Vt shmid_ds
+.Vt msqid_ds
structure is defined in
.In sys/ipc.h
and looks like this:
==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/syslog.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)syslog.c 8.5 (Berkeley) 4/29/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.37 2006/05/11 09:10:33 davidxu Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.38 2006/08/07 20:12:18 phk Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -116,7 +116,7 @@
h->base += len;
h->left -= len;
}
- return 0;
+ return len;
}
/*
==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tls.c#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/lib/libc/gen/tls.c,v 1.9 2006/03/28 06:06:38 davidxu Exp $
+ * $FreeBSD: src/lib/libc/gen/tls.c,v 1.10 2006/07/26 16:56:56 imp Exp $
*/
/*
@@ -40,8 +40,6 @@
#include "libc_private.h"
-/* XXX not sure what variants to use for arm. */
-
__weak_reference(__libc_allocate_tls, _rtld_allocate_tls);
__weak_reference(__libc_free_tls, _rtld_free_tls);
==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/Makefile.inc#6 (text+ko) ====
@@ -1,5 +1,5 @@
# from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93
-# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.60 2006/05/21 11:19:36 ume Exp $
+# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.61 2006/07/26 08:36:46 yar Exp $
# machine-independent net sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net
@@ -19,7 +19,11 @@
SYM_MAPS+=${.CURDIR}/net/Symbol.map
-CFLAGS+=-DINET6 -I${.OBJDIR} -I${.CURDIR}/net
+.if ${MK_INET6_SUPPORT} != "no"
+CFLAGS+=-DINET6
+.endif
+
+CFLAGS+=-I${.OBJDIR}
# name6.c refers res_private.h
CFLAGS+=-I${.CURDIR}/resolv
==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/getaddrinfo.c#4 (text+ko) ====
@@ -33,7 +33,6 @@
* "#ifdef FAITH" part is local hack for supporting IPv4-v6 translator.
*
* Issues to be discussed:
- * - Thread safe-ness must be checked.
* - Return values. There are nonstandard return values defined and used
* in the source code. This is because RFC2553 is silent about which error
* code must be returned for which situation.
@@ -50,20 +49,12 @@
* against NULL hostname (3) what is AI_ADDRCONFIG itself. AF not ready?
* non-loopback address configured? global address configured?
*
- * OS specific notes for netbsd/openbsd/freebsd4/bsdi4:
- * - To avoid search order issue, we have a big amount of code duplicate
- * from gethnamaddr.c and some other places. The issues that there's no
- * lower layer function to lookup "IPv4 or IPv6" record. Calling
- * gethostbyname2 from getaddrinfo will end up in wrong search order, as
- * presented above.
- *
* OS specific notes for freebsd4:
* - FreeBSD supported $GAI. The code does not.
- * - FreeBSD allowed classful IPv4 numeric (127.1), the code does not.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.80 2006/04/28 12:03:35 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.85 2006/07/23 15:31:03 ume Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -213,7 +204,7 @@
{ 0 }
};
-static int str2number(const char *);
+static int str2number(const char *, int *);
static int explore_null(const struct addrinfo *,
const char *, struct addrinfo **);
static int explore_numeric(const struct addrinfo *, const char *,
@@ -328,7 +319,7 @@
}
static int
-str2number(const char *p)
+str2number(const char *p, int *portp)
{
char *ep;
unsigned long v;
@@ -338,9 +329,10 @@
ep = NULL;
errno = 0;
v = strtoul(p, &ep, 10);
- if (errno == 0 && ep && *ep == '\0' && v <= UINT_MAX)
- return v;
- else
+ if (errno == 0 && ep && *ep == '\0' && v <= UINT_MAX) {
+ *portp = v;
+ return 0;
+ } else
return -1;
}
@@ -1040,13 +1032,11 @@
{
int s;
const struct afd *afd;
- struct addrinfo *cur;
- struct addrinfo sentinel;
+ struct addrinfo *ai;
int error;
*res = NULL;
- sentinel.ai_next = NULL;
- cur = &sentinel;
+ ai = NULL;
/*
* filter out AFs that are not supported by the kernel
@@ -1070,26 +1060,19 @@
return 0;
if (pai->ai_flags & AI_PASSIVE) {
- GET_AI(cur->ai_next, afd, afd->a_addrany);
- /* xxx meaningless?
- * GET_CANONNAME(cur->ai_next, "anyaddr");
- */
- GET_PORT(cur->ai_next, servname);
+ GET_AI(ai, afd, afd->a_addrany);
+ GET_PORT(ai, servname);
} else {
- GET_AI(cur->ai_next, afd, afd->a_loopback);
- /* xxx meaningless?
- * GET_CANONNAME(cur->ai_next, "localhost");
- */
- GET_PORT(cur->ai_next, servname);
+ GET_AI(ai, afd, afd->a_loopback);
+ GET_PORT(ai, servname);
}
- cur = cur->ai_next;
- *res = sentinel.ai_next;
+ *res = ai;
return 0;
free:
- if (sentinel.ai_next)
- freeaddrinfo(sentinel.ai_next);
+ if (ai != NULL)
+ freeaddrinfo(ai);
return error;
}
@@ -1101,14 +1084,12 @@
const char *servname, struct addrinfo **res, const char *canonname)
{
const struct afd *afd;
- struct addrinfo *cur;
- struct addrinfo sentinel;
+ struct addrinfo *ai;
int error;
char pton[PTON_MAX];
*res = NULL;
- sentinel.ai_next = NULL;
- cur = &sentinel;
+ ai = NULL;
/*
* if the servname does not match socktype/protocol, ignore it.
@@ -1121,57 +1102,48 @@
return 0;
switch (afd->a_af) {
-#if 1 /*X/Open spec*/
case AF_INET:
- if (inet_aton(hostname, (struct in_addr *)pton) == 1) {
- if (pai->ai_family == afd->a_af ||
- pai->ai_family == PF_UNSPEC /*?*/) {
- GET_AI(cur->ai_next, afd, pton);
- GET_PORT(cur->ai_next, servname);
- if ((pai->ai_flags & AI_CANONNAME)) {
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list