Date: Fri, 3 Mar 2006 12:19:44 GMT From: soc-bushman <soc-bushman@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 92677 for review Message-ID: <200603031219.k23CJi5r029656@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=92677 Change 92677 by soc-bushman@soc-bushman_stinger on 2006/03/03 12:18:47 branches integrated to be up-to-date, bug in getaddrinfo.c is going to be fixed Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/include/Makefile#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/dlfcn.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/gssapi.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/include/gssapi/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/include/gssapi/gssapi.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/include/nl_types.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/printf.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/include/proc_service.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/resolv.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/rpc/auth.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/stdio.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/stdlib.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/Makefile#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/dlfcn.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/getttyent.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/nlist.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/valloc.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/valloc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gmon/gmon.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/libc_private.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#7 edit .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_net.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_net_ntop.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_net_pton.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_comp.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_debug.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_query.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_send.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/auth_des.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/auth_none.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/auth_unix.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/clnt_dg.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/clnt_raw.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/clnt_simple.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/clnt_vc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/getpublickey.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/key_call.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/mt_misc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/mt_misc.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/netconfig.5#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/rpc_com.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/rpc_generic.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/rpc_soc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/rpcb_clnt.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc_auth.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc_dg.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc_generic.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc_raw.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc_run.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc_simple.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc_vc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/Makefile.inc#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/fread.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/local.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/vfprintf.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/vfscanf.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_errno.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_float.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_hexdump.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_int.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_quote.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_str.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_time.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_vis.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/Makefile.inc#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/a64l.3#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/a64l.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/calloc.c#3 delete .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/grantpt.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/l64a.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/malloc.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/posix_memalign.3#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/Makefile.inc#6 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/abort2.2#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/aio_read.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/aio_write.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/kldnext.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/lio_listio.2#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq_close.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq_getattr.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq_notify.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq_open.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq_receive.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq_send.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq_setattr.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/open.2#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/pipe.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/recv.2#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/rename.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/rmdir.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/sigaction.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/sigqueue.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/sigwaitinfo.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/stat.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/statfs.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/timer_create.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/timer_settime.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/undelete.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/utimes.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/wait.2#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/Makefile#7 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/adduser/adduser.sh#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/arp/arp.4#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/arp/arp.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/audit/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/auditd/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/auditreduce/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/bthidcontrol/sdp.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/bthidd/kbd.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/hccontrol/hccontrol.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/hccontrol/info.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/hccontrol/link_control.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/hccontrol/util.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/hcsecd/hcsecd.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/sdpd/scr.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/sdpd/sdpd.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/sdpd/server.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/sdpd/server.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/sdpd/srr.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/sdpd/sur.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_begemot.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/btxld/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/btxld/btxld.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/Makefile#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/Makefile#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agent.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agent.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/Makefile.inc#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/group.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/group.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/hosts.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/hosts.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/passwd.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/passwd.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/services.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/services.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.8#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.conf#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.conf.5#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachelib.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachelib.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cacheplcs.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cacheplcs.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/config.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/config.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/hashtable.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/log.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/log.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_rs_query.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_rs_query.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_ws_query.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_ws_query.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/parser.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/parser.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/protocol.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/protocol.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/query.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/query.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/singletons.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/singletons.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/startup/cached#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/config.5#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/config.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/config.y#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/configvers.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/lang.l#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/main.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/mkmakefile.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/mkoptions.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cron/crontab/crontab.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/crunch/crunchgen/crunchgen.1#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/crunch/crunchgen/crunchgen.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/crunch/crunchide/exec_elf32.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/inetd/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/inetd/inetd.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/inetd/inetd.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/inetd/inetd.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/jail/jail.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kbdcontrol/kbdcontrol.1#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kbdmap/kbdmap.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kldxref/ef.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kldxref/ef.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kldxref/ef_amd64.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kldxref/ef_i386.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kldxref/ef_obj.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kldxref/ef_powerpc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kldxref/ef_sparc64.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lmcconfig/lmcconfig.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/mergemaster/mergemaster.sh#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/mixer/mixer.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/mountd/exports.5#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/moused/moused.8#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/moused/moused.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/newsyslog/newsyslog.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/nfsd/nfsd.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/add.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/extract.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/perform.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/create/perform.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/create/pkg_create.1#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/create/pl.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/info/info.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/info/main.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/info/perform.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/info/pkg_info.1#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/info/show.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/lib/lib.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/lib/plist.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/lib/url.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/version/perform.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmccontrol/pmccontrol.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmcstat/pmcstat.c#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmcstat/pmcstat_log.c#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/portsnap/phttpget/phttpget.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/portsnap/portsnap/portsnap.8#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/portsnap/portsnap/portsnap.sh#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/powerd/Makefile#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/powerd/powerd.c#7 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/praudit/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/quot/quot.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/Makefile#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/anonFTP.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/config.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/devices.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/disks.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/dispatch.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/dist.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/dmenu.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/ftp.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/anonftp.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/distributions.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/fixit.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/html.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/options.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/partition.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/securelevel.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/shortcuts.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/slice.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/tcp.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/usermgmt.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/http.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/index.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/install.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/installUpgrade.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/keymap.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/label.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/main.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/media.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/menus.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/network.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/options.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/package.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/sysinstall.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/system.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/tcpip.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/user.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/wizard.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/syslogd/syslog.conf.5#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/traceroute6/traceroute6.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/Makefile#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#3 integrate Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/include/Makefile#5 (text+ko) ==== @@ -1,20 +1,20 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.252 2005/12/01 21:46:01 ru Exp $ +# $FreeBSD: src/include/Makefile,v 1.254 2005/12/29 14:40:19 dfr Exp $ # # Doing a "make install" builds /usr/include. CLEANFILES= osreldate.h version vers.c -SUBDIR= arpa protocols rpcsvc rpc +SUBDIR= arpa gssapi protocols rpcsvc rpc INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \ db.h \ dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \ - fts.h ftw.h getopt.h glob.h grp.h \ + fts.h ftw.h getopt.h glob.h grp.h gssapi.h \ histedit.h ieeefp.h ifaddrs.h \ inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \ locale.h malloc.h memory.h monetary.h mpool.h mqueue.h \ ndbm.h netconfig.h \ netdb.h nl_types.h nlist.h nss.h nsswitch.h objformat.h paths.h \ - proc_service.h pthread.h \ + printf.h proc_service.h pthread.h \ pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \ resolv.h runetype.h search.h setjmp.h sgtty.h \ signal.h stab.h \ ==== //depot/projects/soc2005/nsswitch_cached/src/include/dlfcn.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/dlfcn.h,v 1.19 2003/02/13 17:47:43 kan Exp $ + * $FreeBSD: src/include/dlfcn.h,v 1.20 2005/12/18 19:43:31 kan Exp $ */ #ifndef _DLFCN_H_ @@ -131,6 +131,8 @@ void (*_lock_release)(void *_lock), void (*_lock_destroy)(void *_lock), void (*_context_destroy)(void *_context)); +void *dlvsym(void * __restrict, const char * __restrict, + const char * __restrict); #endif /* __BSD_VISIBLE */ __END_DECLS ==== //depot/projects/soc2005/nsswitch_cached/src/include/nl_types.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/include/nl_types.h,v 1.11 2005/02/27 16:20:53 phantom Exp $ + * $FreeBSD: src/include/nl_types.h,v 1.12 2006/01/26 20:53:40 stefanf Exp $ */ #ifndef _NL_TYPES_H_ @@ -97,8 +97,7 @@ __BEGIN_DECLS nl_catd catopen(const char *, int); -char *catgets(nl_catd, int, int, const char *) - __attribute__((__format_arg__(4))); +char *catgets(nl_catd, int, int, const char *) __format_arg(4); int catclose(nl_catd); __END_DECLS ==== //depot/projects/soc2005/nsswitch_cached/src/include/proc_service.h#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/include/proc_service.h,v 1.3 2005/05/31 09:43:03 dfr Exp $ + * $FreeBSD: src/include/proc_service.h,v 1.4 2006/02/07 02:29:54 davidxu Exp $ */ #ifndef _PROC_SERVICE_H_ @@ -56,6 +56,7 @@ ps_err_e ps_lsetxmmregs (struct ps_prochandle *, lwpid_t, const char *); #endif ps_err_e ps_lstop(struct ps_prochandle *, lwpid_t); +ps_err_e ps_linfo(struct ps_prochandle *, lwpid_t, void *); ps_err_e ps_pcontinue(struct ps_prochandle *); ps_err_e ps_pdmodel(struct ps_prochandle *, int *); ps_err_e ps_pglobal_lookup(struct ps_prochandle *, const char *, const char *, ==== //depot/projects/soc2005/nsswitch_cached/src/include/resolv.h#3 (text+ko) ==== @@ -51,7 +51,7 @@ /* * @(#)resolv.h 8.1 (Berkeley) 6/2/93 * From Id: resolv.h,v 8.12 1998/04/28 19:36:46 halley Exp $ - * $FreeBSD: src/include/resolv.h,v 1.27 2005/09/12 15:53:28 stefanf Exp $ + * $FreeBSD: src/include/resolv.h,v 1.28 2006/02/24 17:00:50 ume Exp $ */ #ifndef _RESOLV_H_ @@ -92,7 +92,7 @@ #define LOCALDOMAINPARTS 2 /* min levels in name that is "local" */ #define RES_TIMEOUT 5 /* min. seconds between retries */ -#define RES_DFLRETRY 4 /* retries per each name server */ +#define RES_DFLRETRY 2 /* retries per each name server */ #define MAXRESOLVSORT 10 /* number of net to sort on */ #define RES_MAXNDOTS 15 /* should reflect bit field size */ #define RES_MAXRETRANS 30 /* only for resolv.conf/RES_OPTIONS */ ==== //depot/projects/soc2005/nsswitch_cached/src/include/rpc/auth.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * from: @(#)auth.h 1.17 88/02/08 SMI * from: @(#)auth.h 2.3 88/08/07 4.0 RPCSRC * from: @(#)auth.h 1.43 98/02/02 SMI - * $FreeBSD: src/include/rpc/auth.h,v 1.20 2003/01/01 18:48:42 schweikh Exp $ + * $FreeBSD: src/include/rpc/auth.h,v 1.21 2006/02/28 16:02:26 deischen Exp $ */ /* @@ -299,7 +299,7 @@ */ __BEGIN_DECLS extern int getpublickey (const char *, char *); -extern int getpublicandprivatekey (char *, char *); +extern int getpublicandprivatekey (const char *, char *); extern int getsecretkey (char *, char *, char *); __END_DECLS ==== //depot/projects/soc2005/nsswitch_cached/src/include/stdio.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.56 2004/06/20 10:01:30 tjr Exp $ + * $FreeBSD: src/include/stdio.h,v 1.57 2006/01/26 20:53:40 stefanf Exp $ */ #ifndef _STDIO_H_ @@ -328,12 +328,7 @@ int asprintf(char **, const char *, ...) __printflike(2, 3); char *ctermid_r(char *); char *fgetln(FILE *, size_t *); -#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3 -#define __ATTR_FORMAT_ARG __attribute__((__format_arg__(2))) -#else -#define __ATTR_FORMAT_ARG -#endif -__const char *fmtcheck(const char *, const char *) __ATTR_FORMAT_ARG; +__const char *fmtcheck(const char *, const char *) __format_arg(2); int fpurge(FILE *); void setbuffer(FILE *, char *, int); int setlinebuf(FILE *); ==== //depot/projects/soc2005/nsswitch_cached/src/include/stdlib.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.58 2005/09/12 15:58:15 stefanf Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.61 2006/01/12 07:58:59 jasone Exp $ */ #ifndef _STDLIB_H_ @@ -80,6 +80,7 @@ __BEGIN_DECLS void abort(void) __dead2; +void abort2(const char *, int, void **) __dead2; int abs(int) __pure2; int atexit(void (*)(void)); double atof(const char *); @@ -157,7 +158,7 @@ * research can be done. */ #if __POSIX_VISIBLE /* >= ??? */ -/* int posix_memalign(void **, size_t, size_t); (ADV) */ +int posix_memalign(void **, size_t, size_t); /* (ADV) */ int rand_r(unsigned *); /* (TSF) */ int setenv(const char *, const char *, int); void unsetenv(const char *); @@ -171,7 +172,7 @@ */ #if __XSI_VISIBLE /* XXX XSI requires pollution from <sys/wait.h> here. We'd rather not. */ -/* long a64l(const char *); */ +long a64l(const char *); double drand48(void); /* char *ecvt(double, int, int * __restrict, int * __restrict); */ double erand48(unsigned short[3]); @@ -181,7 +182,7 @@ int grantpt(int); char *initstate(unsigned long /* XSI requires u_int */, char *, long); long jrand48(unsigned short[3]); -/* char *l64a(long); */ +char *l64a(long); void lcong48(unsigned short[7]); long lrand48(void); #ifndef _MKSTEMP_DECLARED @@ -257,6 +258,7 @@ getprogname(void); int heapsort(void *, size_t, size_t, int (*)(const void *, const void *)); +int l64a_r(long, char *, int); int mergesort(void *, size_t, size_t, int (*)(const void *, const void *)); void qsort_r(void *, size_t, size_t, void *, int (*)(void *, const void *, const void *)); ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.57 2005/08/06 16:53:54 phk Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.58 2005/12/29 04:10:52 grehan Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -32,9 +32,7 @@ .include "${.CURDIR}/compat-43/Makefile.inc" .include "${.CURDIR}/gdtoa/Makefile.inc" .include "${.CURDIR}/gen/Makefile.inc" -.if ${MACHINE_ARCH} != "powerpc" .include "${.CURDIR}/gmon/Makefile.inc" -.endif .include "${.CURDIR}/locale/Makefile.inc" .include "${.CURDIR}/net/Makefile.inc" .include "${.CURDIR}/nls/Makefile.inc" ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/dlfcn.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.12 2004/03/05 08:10:17 markm Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.13 2005/12/18 19:43:32 kan Exp $"); /* * Linkage to services provided by the dynamic linker. @@ -104,6 +104,15 @@ return NULL; } +#pragma weak dlvsym +void * +dlvsym(void * __restrict handle, const char * __restrict name, + const char * __restrict version) +{ + _rtld_error(sorry); + return NULL; +} + #pragma weak dlinfo int dlinfo(void * __restrict handle, int request, void * __restrict p) ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/getttyent.c#4 (text+ko) ==== @@ -35,19 +35,25 @@ static char sccsid[] = "@(#)getttyent.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.13 2005/07/25 17:57:15 mdodd Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.15 2006/01/26 11:15:08 pjd Exp $"); #include <ttyent.h> #include <stdio.h> #include <stdlib.h> #include <ctype.h> #include <string.h> +#include <dirent.h> +#include <paths.h> static char zapchar; static FILE *tf; +static int maxpts = 0; +static int curpts = 0; +static int pts_valid = 0; static size_t lbsize; static char *line; +#define PTS "pts/" #define MALLOCCHUNK 100 static char *skip(char *); @@ -73,6 +79,7 @@ getttyent() { static struct ttyent tty; + static char devpts_name[] = "pts/4294967295"; char *p; int c; size_t i; @@ -80,8 +87,19 @@ if (!tf && !setttyent()) return (NULL); for (;;) { - if (!fgets(p = line, lbsize, tf)) + if (!fgets(p = line, lbsize, tf)) { + if (pts_valid == 1 && curpts <= maxpts) { + sprintf(devpts_name, "pts/%d", curpts++); + tty.ty_name = devpts_name; + tty.ty_getty = tty.ty_type = NULL; + tty.ty_status = TTY_NETWORK; + tty.ty_window = NULL; + tty.ty_comment = NULL; + tty.ty_group = _TTYS_NOGROUP; + return (&tty); + } return (NULL); + } /* extend buffer if line was too big, and retry */ while (!index(p, '\n')) { i = strlen(p); @@ -209,12 +227,29 @@ int setttyent() { + DIR *devpts_dir; if (line == NULL) { if ((line = malloc(MALLOCCHUNK)) == NULL) return (0); lbsize = MALLOCCHUNK; } + devpts_dir = opendir(_PATH_DEV PTS); + if (devpts_dir) { + struct dirent *dp; + + while ((dp = readdir(devpts_dir))) { + if (strcmp(dp->d_name, ".") != 0 && + strcmp(dp->d_name, "..") != 0) { + if (atoi(dp->d_name) > maxpts) { + maxpts = atoi(dp->d_name); + pts_valid = 1; + curpts = 0; + } + } + } + closedir(devpts_dir); + } if (tf) { rewind(tf); return (1); @@ -228,6 +263,7 @@ { int rval; + pts_valid = 0; /* * NB: Don't free `line' because getttynam() * may still be referencing it ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/nlist.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/nlist.c,v 1.18 2003/02/27 13:40:00 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/nlist.c,v 1.19 2005/12/18 04:52:33 marcel Exp $"); #include "namespace.h" #include <sys/param.h> @@ -243,8 +243,8 @@ { struct nlist *p; Elf_Off symoff = 0, symstroff = 0; - Elf_Word symsize = 0, symstrsize = 0; - Elf_Sword cc, i; + Elf_Size symsize = 0, symstrsize = 0; + Elf_Ssize cc, i; int nent = -1; int errsave; Elf_Sym sbuf[1024]; @@ -252,7 +252,7 @@ Elf_Ehdr ehdr; char *strtab = NULL; Elf_Shdr *shdr = NULL; - Elf_Word shdr_size; + Elf_Size shdr_size; void *base; struct stat st; ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/valloc.3#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)valloc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/valloc.3,v 1.10 2002/12/18 13:33:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/valloc.3,v 1.11 2006/01/12 09:29:38 jasone Exp $ .\" -.Dd June 4, 1993 +.Dd September 13, 2005 .Dt VALLOC 3 .Os .Sh NAME @@ -48,9 +48,9 @@ .Bf -symbolic The .Fn valloc -function is obsoleted by the current version of -.Xr malloc 3 , -which aligns page-sized and larger allocations. +function is obsoleted by +.Xr posix_memalign 3 , +which can be used to request page-aligned allocations. .Ef .Pp The @@ -59,23 +59,23 @@ allocates .Fa size bytes aligned on a page boundary. -It is implemented by calling -.Xr malloc 3 -with a slightly larger request, saving the true beginning of the block -allocated, and returning a properly aligned pointer. .Sh RETURN VALUES The .Fn valloc function returns a pointer to the allocated space if successful; otherwise -a null pointer is returned +a null pointer is returned. +.Sh SEE ALSO +.Xr posix_memalign 3 .Sh HISTORY The .Fn valloc function appeared in .Bx 3.0 . -.Sh BUGS -A -.Fn vfree -function -has not been implemented. +.Pp +The +.Fn valloc +function correctly allocated memory that could be deallocated via +.Fn free +in +.Bx 7.0 . ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/valloc.c#3 (text+ko) ==== @@ -35,18 +35,18 @@ static char sccsid[] = "@(#)valloc.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/valloc.c,v 1.3 2002/03/22 21:52:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/valloc.c,v 1.4 2006/01/12 09:29:38 jasone Exp $"); #include <stdlib.h> #include <unistd.h> void * -valloc(i) - size_t i; +valloc(size_t i) { - long valsiz = getpagesize(), j; - void *cp = malloc(i + (valsiz-1)); + void *ret; + + if (posix_memalign(&ret, getpagesize(), i) != 0) + ret = NULL; - j = ((long)cp + (valsiz-1)) &~ (valsiz-1); - return ((void *)j); + return ret; } ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gmon/gmon.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)gmon.c 8.1 (Berkeley) 6/4/93"; #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.20 2004/10/16 06:32:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.21 2005/12/29 04:09:38 grehan Exp $"); #include "namespace.h" #include <sys/param.h> @@ -53,7 +53,7 @@ #include "libc_private.h" -#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) || defined(__powerpc__) extern char *minbrk __asm (".minbrk"); #else extern char *minbrk __asm ("minbrk"); ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/libc_private.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.13 2005/09/12 13:46:31 stefanf Exp $ + * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.14 2006/01/12 07:28:20 jasone Exp $ * * Private definitions for libc, libc_r and libpthread. * @@ -130,10 +130,11 @@ extern const char *__progname; /* - * This is the lock to make malloc() thread-safe. It is externalized - * so that thread libraries can protect malloc across fork(). + * These functions are used by the threading libraries in order to protect + * malloc across fork(). */ -extern struct _spinlock *__malloc_lock; +void _malloc_prefork(void); +void _malloc_postfork(void); /* * Function to clean up streams, called from abort() and exit(). ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#7 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.70 2005/07/22 18:21:28 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.72 2006/03/01 15:53:49 ume Exp $"); #include "namespace.h" #include <sys/types.h> @@ -1569,6 +1569,7 @@ } #endif + #ifdef NS_CACHING static int addrinfo_id_func(char *buffer, size_t *buffer_size, va_list ap, @@ -1585,8 +1586,12 @@ hostname = va_arg(ap, char *); hints = va_arg(ap, struct addrinfo *); - size = strlen(hostname); - desired_size = sizeof(int) + sizeof(int) * 4 + size + 1; + desired_size = sizeof(int) + sizeof(int) * 4; + if (hostname != NULL) { + size = strlen(hostname); + desired_soze += size + 1; + } else + size = 0; if (desired_size > *buffer_size) { *buffer_size = desired_size; @@ -1618,7 +1623,8 @@ memcpy(p, &ai_protocol, sizeof(int)); p += sizeof(int); - memcpy(p, hostname, size + 1); + if (hostname != NULL) + memcpy(p, hostname, size); *buffer_size = desired_size; return (NS_SUCCESS); @@ -2582,7 +2588,9 @@ HEADER *hp = (HEADER *)(void *)target->answer; /*XXX*/ u_int dots; int trailing_dot, ret, saved_herrno; - int got_nodata = 0, got_servfail = 0, tried_as_is = 0; + int got_nodata = 0, got_servfail = 0, root_on_list = 0; + int tried_as_is = 0; + int searched = 0; char abuf[MAXDNAME]; if ((_res.options & RES_INIT) == 0 && res_init() == -1) { @@ -2606,14 +2614,26 @@ return (res_queryN(cp, target)); /* - * If there are dots in the name already, let's just give it a try - * 'as is'. The threshold can be set with the "ndots" option. + * If there are enough dots in the name, let's just give it a + * try 'as is'. The threshold can be set with the "ndots" option. + * Also, query 'as is', if there is a trailing dot in the name. */ saved_herrno = -1; - if (dots >= _res.ndots) { + if (dots >= _res.ndots || trailing_dot) { ret = res_querydomainN(name, NULL, target); - if (ret > 0) + if (ret > 0 || trailing_dot) return (ret); + if (errno == ECONNREFUSED) { + h_errno = TRY_AGAIN; + return (-1); + } + switch (h_errno) { + case NO_DATA: + case HOST_NOT_FOUND: + break; + default: + return (-1); + } saved_herrno = h_errno; tried_as_is++; } @@ -2631,6 +2651,14 @@ for (domain = (const char * const *)_res.dnsrch; *domain && !done; domain++) { + searched = 1; + + if (domain[0][0] == '\0' || + (domain[0][0] == '.' && domain[0][1] == '\0')) + root_on_list++; + + if (root_on_list && tried_as_is) + continue; ret = res_querydomainN(name, *domain, target); if (ret > 0) @@ -2681,12 +2709,20 @@ } } + switch (h_errno) { + case NO_DATA: + case HOST_NOT_FOUND: + break; + default: + goto giveup; + } + /* - * if we have not already tried the name "as is", do that now. - * note that we do this regardless of how many dots were in the - * name or whether it ends with a dot. + * If the query has not already been tried as is then try it + * unless RES_NOTLDQUERY is set and there were no dots. */ - if (!tried_as_is && (dots || !(_res.options & RES_NOTLDQUERY))) { + if ((dots || !searched || !(_res.options & RES_NOTLDQUERY)) && + !(tried_as_is || root_on_list)) { ret = res_querydomainN(name, NULL, target); if (ret > 0) return (ret); @@ -2700,6 +2736,7 @@ * else send back meaningless h_errno, that being the one from * the last DNSRCH we did. */ +giveup: if (saved_herrno != -1) h_errno = saved_herrno; else if (got_nodata) ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_net.3#3 (text+ko) ==== @@ -34,9 +34,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/inet_net.3,v 1.2 2002/12/19 09:40:22 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/inet_net.3,v 1.3 2006/02/26 05:44:21 ume Exp $ .\" -.Dd June 18, 1997 +.Dd February 26, 2006 .Dt INET_NET 3 .Os .Sh NAME @@ -88,10 +88,12 @@ .Er ENOENT if the Internet network number was not valid). .Pp -The only value for +The currently supported values for .Fa af -currently supported is -.Dv AF_INET . +are +.Dv AF_INET +and +.Dv AF_INET6 . The .Fa size argument @@ -149,6 +151,10 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603031219.k23CJi5r029656>