PERFORCE change 130740 for review
John Birrell
jb at FreeBSD.org
Wed Dec 12 14:13:50 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=130740
Change 130740 by jb at jb_freebsd1 on 2007/12/12 22:13:35
Another day, another IFC.
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#52 integrate
.. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/Makefile#3 integrate
.. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/nanobsd/Makefile#1 branch
.. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/nanobsd/article.sgml#1 branch
.. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#12 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#17 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#12 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#13 integrate
.. //depot/projects/dtrace/ports/LEGAL#26 integrate
.. //depot/projects/dtrace/ports/MOVED#54 integrate
.. //depot/projects/dtrace/src/include/nsswitch.h#5 integrate
.. //depot/projects/dtrace/src/lib/Makefile#18 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/getgrent.c#7 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/getgrouplist.c#5 integrate
.. //depot/projects/dtrace/src/lib/libc/locale/localeconv.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/net/nsdispatch.c#6 integrate
.. //depot/projects/dtrace/src/lib/libc/string/strtok.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/string/strtok.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/string/wcstok.c#4 integrate
.. //depot/projects/dtrace/src/share/man/man5/src.conf.5#12 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.own.mk#18 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#23 integrate
.. //depot/projects/dtrace/src/sys/conf/files#57 integrate
.. //depot/projects/dtrace/src/sys/dev/amr/amr.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/amr/amr_cam.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/amr/amr_pci.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/amr/amrvar.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pci/ich.c#9 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#22 integrate
.. //depot/projects/dtrace/src/sys/net/route.c#10 integrate
.. //depot/projects/dtrace/src/sys/net/route.h#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_l2tp.c#6 integrate
.. //depot/projects/dtrace/src/sys/netinet/if_ether.c#13 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_ofld.c#1 branch
.. //depot/projects/dtrace/src/sys/netinet/tcp_ofld.h#1 branch
.. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#15 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.h#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_var.h#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/toedev.h#1 branch
.. //depot/projects/dtrace/src/sys/sys/socket.h#8 integrate
.. //depot/projects/dtrace/src/tools/build/options/WITHOUT_BZIP2#2 integrate
.. //depot/projects/dtrace/src/tools/build/options/WITHOUT_GNU#3 integrate
.. //depot/projects/dtrace/src/tools/build/options/WITHOUT_GSSAPI#1 branch
.. //depot/projects/dtrace/src/tools/build/options/WITHOUT_KERBEROS#4 integrate
.. //depot/projects/dtrace/src/tools/build/options/WITHOUT_KVM#2 integrate
.. //depot/projects/dtrace/src/tools/build/options/WITHOUT_PAM#3 integrate
.. //depot/projects/dtrace/src/tools/build/options/WITHOUT_TOOLCHAIN#4 integrate
.. //depot/projects/dtrace/src/tools/build/options/WITH_GSSAPI#2 delete
.. //depot/projects/dtrace/src/tools/build/options/makeman#9 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#52 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.741 2007/12/04 12:41:22 chinsan Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.743 2007/12/12 18:50:26 chinsan Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -1191,6 +1191,11 @@
</listitem>
<listitem>
+ <para>BluePex Security Solutions
+ <email>freebsd-ports at bluepex.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Bob Frazier
<email>bobf at mrp3.com</email></para>
</listitem>
@@ -6057,6 +6062,11 @@
</listitem>
<listitem>
+ <para>Matthias Schmidt
+ <email>schmidtm at mathematik.uni-marburg.de</email></para>
+ </listitem>
+
+ <listitem>
<para>Matthias Sund
<email>m.sund at arcor.de</email></para>
</listitem>
==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/Makefile#3 (text+ko) ====
@@ -2,7 +2,7 @@
# The FreeBSD Documentation Project
# The FreeBSD French Documentation Project
#
-# $FreeBSD: doc/fr_FR.ISO8859-1/articles/Makefile,v 1.16 2003/08/15 10:21:34 gioria Exp $
+# $FreeBSD: doc/fr_FR.ISO8859-1/articles/Makefile,v 1.17 2007/12/12 18:34:58 blackend Exp $
# Original revision: 1.3
#
@@ -24,6 +24,7 @@
SUBDIR+= make-world
SUBDIR+= mh
SUBDIR+= multi-os
+SUBDIR+= nanobsd
SUBDIR+= new-users
SUBDIR+= ntfs
SUBDIR+= pam
==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#4 (text+ko) ====
@@ -6,7 +6,7 @@
traduction francaise
$Id: translators.ent,v 1.8 2001/11/19 22:24:01 eagle Exp $
- $FreeBSD: doc/fr_FR.ISO8859-1/share/sgml/translators.ent,v 1.9 2007/12/05 12:19:22 blackend Exp $
+ $FreeBSD: doc/fr_FR.ISO8859-1/share/sgml/translators.ent,v 1.10 2007/12/12 18:32:54 blackend Exp $
Original revision: N/A
-->
@@ -42,6 +42,8 @@
<email>blackend at FreeBSD.org</email>">
<!ENTITY a.fr.mathieu "Clément Mathieu
<email>cykl at mAdchAt.org</email>">
+<!ENTITY a.fr.tignon "Jean-Loic Tignon
+ <email>loic at vigilan.net</email>">
@@ -80,4 +82,6 @@
"<para><emphasis>Version française de &a.fr.fonvieille;.</emphasis></para>">
<!ENTITY trans.a.mathieu
"<para><emphasis>Version française de &a.fr.mathieu;.</emphasis></para>">
+<!ENTITY trans.a.tignon
+ "<para><emphasis>Version française de &a.fr.tignon;.</emphasis></para>">
==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#12 (text+ko) ====
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
- Original Revision: 1.149
- $FreeBSD: doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml,v 1.15 2007/10/23 02:08:21 loader Exp $
+ Original Revision: 1.150
+ $FreeBSD: doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml,v 1.16 2007/12/12 05:30:50 loader Exp $
-->
<chapter id="basics">
@@ -264,6 +264,35 @@
¾¡¹ÜÈÔÈ»ÄܽøÈëµ¥Óû§Ä£Ê½£¬ µ«Èç¹ûÄú²»ÊìϤËü¾Í»á·Ç³£ÁîÈËÍ·ÌÛ¡£</para>
</note>
</sect2>
+
+ <sect2 id="consoles-vidcontrol">
+ <title>¸Ä±ä¿ØÖÆ̨µÄÏÔʾģʽ</title>
+
+ <para>FreeBSD ¿ØÖÆ̨ĬÈϵÄÏÔʾģʽ¿ÉÒÔ±»µ÷ÕûΪ 1024x768£¬ 1280x1024£¬
+ »òÕßÈκÎÄãµÄÏÔ¿¨Ð¾Æ¬ºÍÏÔʾÆ÷ËùÖ§³ÖµÄÆäËû³ß´ç¡£
+ ҪʹÓÃÒ»¸ö²»Í¬µÄÏÔʾģʽ£¬
+ Äã±ØÐëÊ×ÏÈÖØбàÒëÄں˲¢°üº¬ÒÔÏÂ2¸öÑ¡Ï</para>
+
+ <programlisting>OPTIONS VESA
+OPTIONS SC_PIXEL_MODE</programlisting>
+
+ <para>ÔÚÄÚºËÓÃÕâ2¸öÑ¡Ïî±àÒëÍê³Éºó£¬Äã¾Í¿ÉÒÔʹÓà &man.vidcontrol.1;
+ ¹¤¾ßÀ´²â¶¨ÄãµÄÓ²¼þÖ§³ÖºÎÖÖÏÔʾģʽÁË¡£ ÒÔ root
+ Éí·ÝÔÚ¿ØÖÆ̨¼üÈëÒÔÏÂÃüÁîÀ´»ñµÃÒ»·ÝËùÖ§³ÖµÄÏÔʾģʽÁÐ±í¡£</para>
+
+ <screen>&prompt.root; <userinput>vidcontrol -i mode</userinput></screen>
+
+ <para>Õâ¸öÃüÁîµÄÊä³öÊÇÒ»·ÝÄãµÄÓ²¼þËùÖ§³ÖµÄÏÔʾģʽÁÐ±í¡£
+ Äã¿ÉÒÔÔÚÒÔ root Éí·ÝÔÚ¿ØÖÆ̨ÉϼüÈëÒÔÏÂÃüÁîÀ´¸Ä±äÏÔʾģʽ£º</para>
+
+ <screen>&prompt.root; <userinput>vidcontrol MODE_279</userinput></screen>
+
+ <para>Èç¹ûÄã¶ÔÓÚеÄÏÔʾģʽÂúÒ⣬ÄÇô¿ÉÒÔ°ÑËü¼ÓÈëµ½
+ <filename>/etc/rc.conf</filename> ʹ»úÆ÷ÔÚÿ´ÎÆô¶¯µÄʱºò¶¼ÄÜÉúЧ£¬
+ ÎÒÃÇʹÓÃÁËÉÏÒ»¸öÀý×ÓÖеÄģʽ£º</para>
+
+ <programlisting>allscreens_flags="MODE_279"</programlisting>
+ </sect2>
</sect1>
<sect1 id="permissions">
==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#17 (text+ko) ====
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
- Original Revision: 1.384
- $FreeBSD: doc/zh_CN.GB2312/books/handbook/install/chapter.sgml,v 1.25 2007/11/20 14:10:29 loader Exp $
+ Original Revision: 1.385
+ $FreeBSD: doc/zh_CN.GB2312/books/handbook/install/chapter.sgml,v 1.26 2007/12/12 05:30:51 loader Exp $
-->
<chapter id="install">
@@ -191,11 +191,11 @@
µÄÓ²¼þÖÖÀàʵÔÚÌ«¹ý¸´ÔÓ£¬Õâ¸ö²½Öè²»Ò»¶¨×ÜÊÇÄܳɹ¦¡£
Õâʱ£¬Äú¾Í¿ÉÄÜÐèÒªÊÖ¶¯¸ü¸ÄÓÐÎÊÌâµÄÉ豸µÄÉ趨ֵ¡£</para>
- <para>Èç¹ûÄúÒѾ°²×°ÁËÆäËüµÄ²Ù×÷ϵͳ£¬Èç &windows; »ò Linux£¬ÄÇôÄú¿ÉÒÔÏÈÓÉ
- ÕâЩϵͳËùÌṩµÄ¹¤¾ßÀ´²é¿´ÄúµÄÉ豸É趨ֵÊÇÔõô·ÖÅäµÄ¡£Èç¹ûÄúÕæµÄû°ì·¨
- È·¶¨Ä³Ð©½Ó¿Ú¿¨ÓÃʲôÉ趨ֵ£¬ÄÇôÄú¿ÉÒÔ¼ì²é¿´¿´£¬Ëµ²»¶¨ËüµÄÉ趨ÒѾ±êʾ
- ÔÚ¿¨ÉÏ¡£³£ÓÃµÄ IRQ ºÅºÅÂëΪ 3¡¢5 ÒÔ¼° 7£»IO ¶Ë¿ÚµÄֵͨ³£ÒÔ 16 ½øÖÆλ±íʾ£¬ÀýÈç
- Ox330¡£</para>
+ <para>Èç¹ûÄúÒѾ°²×°ÁËÆäËüµÄ²Ù×÷ϵͳ£¬Èç &windows; »ò Linux£¬
+ ÄÇôÄú¿ÉÒÔÏÈÓÉÕâЩϵͳËùÌṩµÄ¹¤¾ßÀ´²é¿´ÄúµÄÉ豸É趨ֵÊÇÔõô·ÖÅäµÄ¡£
+ Èç¹ûÄúÕæµÄû°ì·¨È·¶¨Ä³Ð©½Ó¿Ú¿¨ÓÃʲôÉ趨ֵ£¬ÄÇôÄú¿ÉÒÔ¼ì²é¿´¿´£¬
+ ˵²»¶¨ËüµÄÉ趨ÒѾ±êʾÔÚ¿¨ÉÏ¡£³£ÓÃµÄ IRQ ºÅÂëΪ 3¡¢5 ÒÔ¼° 7£»
+ IO ¶Ë¿ÚµÄֵͨ³£ÒÔ 16 ½øÖÆλ±íʾ£¬ÀýÈç Ox330¡£</para>
<para>ÎÒÃǽ¨ÒéÄúÔÚ°²×° FreeBSD ֮ǰ°ÑÕâЩÐÅÏ¢´òÓ¡»ò¼Ç¼ÏÂÀ´£¬×ö³É±í¸ñ
µÄÑù×ÓÒ²Ðí»á±È½ÏÓаïÖú£¬ÀýÈ磺</para>
@@ -333,12 +333,13 @@
<para>FreeBSD ±ØÐë°²×°ÔÚÖ÷·ÖÇø¡£ FreeBSD ¿ÉÒÔÔÚÕâ¸ö·ÖÇøÉÏÃæ´æ·ÅϵͳÊý¾Ý
»òÊÇÄú½¨Á¢µÄÈκÎÎļþ¡£È»¶ø£¬Èç¹ûÄúÓжà¸öÓ²ÅÌ£¬ÄúÒ²¿ÉÒÔÔÚÕâЩӲÅÌÉÏ(È«²¿
»ò²¿·Ö)½¨Á¢ FreeBSD ·ÖÇø¡£ÔÚÄú°²×° FreeBSD µÄʱºò£¬±ØÐëÒªÓÐÒ»¸ö·ÖÇø¿ÉÒÔ¸ø
- FreeBSD ʹÓá£Õâ¸ö·ÖÇø¿ÉÒÔÊÇÉÐδ¹æ»®µÄ·ÖÇø»òÊÇÒѾ»®ºÃ£¬µ«ÊÇÀïÃæµÄÊý¾Ý
- Äú¶¼²»Ïë±£´æµÄ·ÖÇø¡£</para>
+ FreeBSD ʹÓá£Õâ¸ö·ÖÇø¿ÉÒÔÊÇÉÐδ¹æ»®µÄ·ÖÇø£¬
+ »òÊÇÒѾ´æÔÚÇÒ´æÓÐÊý¾Ýµ«Äú²»ÔÙÐèÒªµÄ·ÖÇø¡£</para>
- <para>Èç¹ûÄúÒѾÓÃÍêÁËÄúÓ²ÅÌÉϵÄËùÓзÖÇø£¬ÄÇôÄú±ØÐëʹÓÃÆäËü²Ù×÷ϵͳËù
- ÌṩµÄ¹¤¾ß(Èç DOS »ò &windows; Ï嵀 <command>fdisk</command>)À´ÌÚ³öÒ»¸ö·ÖÇø
- ¸ø FreeBSD ʹÓá£</para>
+ <para>Èç¹ûÄúÒѾÓÃÍêÁËÄúÓ²ÅÌÉϵÄËùÓзÖÇø£¬
+ ÄÇôÄú±ØÐëʹÓÃÆäËü²Ù×÷ϵͳËùÌṩµÄ¹¤¾ß
+ (Èç DOS »ò &windows; Ï嵀 <command>fdisk</command>)
+ À´ÌÚ³öÒ»¸ö·ÖÇø¸ø FreeBSD ʹÓá£</para>
<para>Èç¹ûÄúµÄij¸ö·ÖÇøÓжàÓàµÄ¿Õ¼ä£¬Äú¿ÉÒÔʹÓÃËü¡£µ«ÊÇʹÓÃÇ°ÄúÐèÒªÏÈÕûÀí
Ò»ÏÂÕâЩ·ÖÇø¡£</para>
@@ -355,7 +356,7 @@
<application>PResizer</application>£¬ËüÃǵÄÎĵµ¿ÉÒÔÔÚͬһĿ¼ÖÐÕÒµ½¡£<application>FIPS</application>¡¢
<application>PResizer</application>£¬ºÍ <application>&partitionmagic;</application>
Äܹ»¸Ä±ä <acronym>FAT16</acronym> ÒÔ¼° <acronym>FAT32</acronym> ·ÖÇøµÄ´óС —
- ËüÃÇ¿ÉÒÔÔÚ &ms-dos; ÒÔ¼° &windows; ME ϵͳÖÐʹÓᣠÕâЩ¹¤¾ßµÄ˵Ã÷Îļþ¿ÉÒÔÔÚͬһ¸öĿ¼ÏÂÃæÕÒµ½
+ ËüÃÇ¿ÉÒÔÔÚ &ms-dos; ÒÔ¼° &windows; ME ϵͳÖÐʹÓᣠÕâЩ¹¤¾ßµÄ˵Ã÷Îļþ¿ÉÒÔÔÚͬһ¸öĿ¼ÏÂÃæÕÒµ½¡£
<application>&partitionmagic;</application> ºÍ <application>GParted</application>
¶¼Äܸıä <acronym>NTFS</acronym> ·ÖÇøµÄ³ß´ç¡£ <application>GParted</application>
ÔÚÐí¶à Live CD Linux ·¢Ðа棬 Èç
@@ -363,7 +364,7 @@
<para>Ä¿Ç°ÒѾÓб¨¸æÏÔʾ¸Ä±ä µsoft; Vista
·ÖÇø³ß´çʱ»á³öÏÖÎÊÌâ¡£ ÔÚ½øÐдËÀà²Ù×÷ʱ£¬ ½¨ÒéÄú×¼±¸Ò»ÕÅ Vista °²×° CDROM¡£
- ´ËÍ⣬ ÓëÆäËû´ÅÅÌά»¤²Ù×÷ÀàÎÒÎÒ£¬ Ç¿ÁÒ½¨ÒéÄúÊÂÏȽøÐб¸·Ý¡£</para>
+ ÈçͬÆäËûµÄ´ÅÅÌά»¤²Ù×÷Ò»Ñù£¬ Ç¿ÁÒ½¨ÒéÄúÊÂÏȽøÐб¸·Ý¡£</para>
<warning>
<para>²»µ±µÄʹÓÃÕâЩ¹¤¾ß¿ÉÄÜ»áɾµôÄúÓ²ÅÌÉϵÄÊý¾Ý×ÊÁÏ£¡ÔÚʹÓÃÕâЩ¹¤¾ßÇ°
@@ -399,8 +400,8 @@
</listitem>
<listitem>
- <para>ʹÓÃÉÏÃæÌá¼°µÄ <application>&partitionmagic;</application> À´ÕûÀí
- »òÇиîÄúµÄ·ÖÇø¡£</para>
+ <para>ʹÓÃÉÏÃæÌá¼°µÄ <application>&partitionmagic;</application>
+ À´ÕûÀí»òÇиîÄúµÄ·ÖÇø¡£</para>
</listitem>
</orderedlist>
</example>
@@ -412,9 +413,10 @@
<indexterm><primary>Alpha</primary></indexterm>
- <para>ÔÚ Alpha ÉÏ£¬Äú±ØÐëʹÓÃÒ»Õû¿ÅÓ²Å̸ø FreeBSD£¬Ã»Óа취ÔÚͬһ¸öÓ²ÅÌÉϸú
- ÆäËü²Ù×÷ϵͳ¹²´æ¡£¸ù¾Ý²»Í¬µÄ Alpha »úÆ÷£¬ÄúµÄÓ²ÅÌ¿ÉÒÔÊÇ SCSI »ò IDE Ó²ÅÌ£¬Ö»Òª
- ÄúµÄ»úÆ÷¿ÉÒÔ´ÓÕâЩӲÅÌ¿ª»ú¾Í¿ÉÒÔ¡£</para>
+ <para>ÔÚ Alpha ÉÏ£¬Äú±ØÐëʹÓÃÒ»Õû¿ÅÓ²Å̸ø FreeBSD£¬
+ ûÓа취ÔÚͬһ¸öÓ²ÅÌÉϸúÆäËü²Ù×÷ϵͳ¹²´æ¡£
+ ¸ù¾Ý²»Í¬µÄ Alpha »úÆ÷£¬ÄúµÄÓ²ÅÌ¿ÉÒÔÊÇ SCSI »ò IDE Ó²ÅÌ£¬
+ Ö»ÒªÄúµÄ»úÆ÷¿ÉÒÔ´ÓÕâЩӲÅÌ¿ª»ú¾Í¿ÉÒÔ¡£</para>
<para>°´ÕÕ Digital/Compaq ʹÓÃÊÖ²áÊéдµÄ¹ßÀý£¬ËùÓÐ SRM ÊäÈëµÄ²¿·Ö¶¼Óôóд
±íʾ¡£×¢Ò⣬SRM ´óСдÓбð¡£</para>
@@ -629,11 +631,13 @@
<step>
<title>×¼±¸ÈíÅÌ</title>
- <para>Äú±ØÐëΪÄúÏÂÔصÄÿһ¸öÓ³ÏñÎļþ×¼±¸Ò»ÕÅÈíÅÌ¡£²¢ÇÒÇë±ÜÃâʹÓõ½»µµôµÄ
- ÈíÅÌ¡£×î¼òµ¥µÄ·½Ê½¾ÍÊÇÄúÏȽ«ÕâЩÈíÅ̸ñʽ»¯£¬²»ÒªÏàÐÅËùνµÄÒѸñʽ»¯µÄÈí
- ÅÌ¡£ÔÚ &windows; ϵĸñʽ»¯³ÌÐò²»»á¸æËßÄú³öÏÖ¶àÉÙ»µ¿é£¬ËüÖ»ÊǼòµ¥µÄ±ê¼ÇËü
- ÃÇΪ <quote>bad</quote> ²¢ÇÒºöÂÔËüÃÇ¡£¸ù¾Ý½¨ÒéÄúÓ¦¸ÃʹÓÃȫеÄÈíÅÌÀ´´æ·Å
- °²×°³ÌÐò¡£</para>
+ <para>Äú±ØÐëΪÄúÏÂÔصÄÿһ¸öÓ³ÏñÎļþ×¼±¸Ò»ÕÅÈíÅÌ¡£
+ ²¢ÇÒÇë±ÜÃâʹÓõ½»µµôµÄÈíÅÌ¡£
+ ×î¼òµ¥µÄ·½Ê½¾ÍÊÇÄúÏȽ«ÕâЩÈíÅ̸ñʽ»¯£¬
+ ²»ÒªÏàÐÅËùνµÄÒѸñʽ»¯µÄÈíÅÌ¡£ÔÚ &windows;
+ ϵĸñʽ»¯³ÌÐò²»»á¸æËßÄú³öÏÖ¶àÉÙ»µ¿é£¬
+ ËüÖ»ÊǼòµ¥µÄ±ê¼ÇËüÃÇΪ <quote>bad</quote> ²¢ÇÒºöÂÔËüÃÇ¡£
+ ¸ù¾Ý½¨ÒéÄúÓ¦¸ÃʹÓÃȫеÄÈíÅÌÀ´´æ·Å°²×°³ÌÐò¡£</para>
<important>
<para>Èç¹ûÄúÔÚ°²×° FreeBSD µÄ¹ý³ÌÖÐÔì³Éµ±»ú¡¢¶³½á»òÊÇÆäËü¹ÖÒìÏÖÏ󣬵ÚÒ»¸ö
@@ -3560,8 +3564,22 @@
<guimenuitem>System Tools</guimenuitem> ²Ëµ¥µÄ <application>Compression Agent</application>
À´Íê³É¡£</para>
- <para>&os;¿ÉÒÔÖ§³Ö»ùÓÚ &ms-dos; µÄÎļþϵͳ (FAT16 ºÍ FAT32)¡£
- ÕâÒªÇóÄúʹÓôø²ÎÊýµÄ &man.mount.8; ÃüÁî¡£ ×ʹÓõÄÊÇ£º</para>
+ <para>&os; ¿ÉÒÔÖ§³Ö»ùÓÚ &ms-dos; µÄÎļþϵͳ £¨ÓÐʱ±»³ÆΪ FAT
+ Îļþϵͳ£©¡£ &man.mount.msdosfs.8;
+ ÃüÁîÄܹ»°ÑÕâÑùµÄÎļþϵͳ¹Ò½Óµ½ÏÖÓеÄĿ¼½á¹¹ÖУ¬
+ ²¢ÔÊÐí·ÃÎÊ FAT ÎļþϵͳÉϵÄÄÚÈÝ¡£ ͨ³£ÎÒÃDz¢²»Ö±½ÓʹÓÃ
+ &man.mount.msdosfs.8;£¬ËüÒ»°ã»áÔÚ <filename>/etc/fstab</filename>
+ ÖеÄijһÐб»µ÷ÓûòÕß±» &man.mount.8; ¹¤¾ß²¢ÅäºÏÊʵ±µÄ²ÎÊýÀ´µ÷Óá£
+
+ <para><filename>/etc/fstab</filename>ÖÐÒ»¸öµäÐ͵ÄÀý×Ó£º</para>
+
+ <programlisting>/dev/ad0sN /dos msdosfs rw 0 0</programlisting>
+
+ <note><para><filename>/dos</filename> Ŀ¼±ØÐëÊÂÏÈ´æÔÚ¡£
+ ¸ü¶à¹ØÓÚ <filename>/etc/fstab</filename> µÄϸ½Ú£¬
+ Çë²ÎÔÄ &man.fstab.5;¡£</para></note>
+
+ <para>Ò»¸öʹÓà &man.mount.8; ¹ÒÔØ &ms-dos; ÎļþϵͳµÄÀý×Ó£º</para>
<screen>&prompt.root; <userinput>mount -t msdosfs /dev/ad0s1 /mnt</userinput></screen>
@@ -3569,11 +3587,11 @@
²é¿´ÃüÁî <command>dmesg</command>ºÍ <command>mount</command> µÄÊä³ö¡£ËüÃÇÓ¦¸Ã
¿ÉÒÔÈÃÄúµÃµ½×ã¹»µÄ·ÖÇøÐÅÏ¢¡£</para>
- <note><para> &ms-dos; µÄÀ©Õ¹·ÖÇø»á±»Ó³ÉäÔÚ &os;·ÖÇøµÄĩβ¡£»»¾ä»°Ëµ£¬·ÖÇøºÅÒª´óÓÚ
- &os; ÕýÔÚʹÓõķÖÇøºÅ¡£ÀýÈ磬µÚÒ»¸ö &ms-dos; ·ÖÇø¿ÉÄÜλÓÚ
- <filename>/dev/ad0s1</filename>£¬&os; ·ÖÇø¿ÉÄÜλÓÚ
- <filename>/dev/ad0s2</filename>£¬¸ú×ÅÊÇ &ms-dos; µÄÀ©Õ¹·ÖÇøλÓÚ
- <filename>/dev/ad0s3</filename>¡£Õâ¿ÉÄÜ»áʹÄú¸Ð¾õÃÔã¡£</para></note>
+ <note><para>&os; ¿ÉÄÜʹÓúÍÆäËû²Ù×÷ϵͳ²»Í¬¼ÆÊý·½·¨À´±ê¼Ç´ÅÅÌ slices£¬
+ ÌرðÐèÒªÖ¸³öµÄÊÇ£¬ &ms-dos;
+ µÄÀ©Õ¹·ÖÇøͨ³£»á±È &ms-dos; Ö÷·ÖÇø±»±ê¼ÇΪ¸ü¸ßµÄÊýÖµ¡£
+ ¿ÉÒÔʹÓà &man.fdisk.8; ¹¤¾ßÀ´°ïÖú²â¶¨ÄÄЩ slices ÊôÓÚ &os;
+ ÄÄЩÊÇÊôÓÚÆäËûµÄ²Ù×÷ϵͳ¡£</para></note>
<para>NTFS ·ÖÇøÒ²¿ÉÒÔͨ¹ýÀàËÆ &man.mount.ntfs.8; ÃüÁî¹Ò½ÓÔÚFreeBSDÉÏ¡£</para>
</sect2>
==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#12 (text+ko) ====
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
- Original Revision: 1.441
- $FreeBSD: doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml,v 1.18 2007/11/20 14:10:30 loader Exp $
+ Original Revision: 1.442
+ $FreeBSD: doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml,v 1.19 2007/12/12 05:30:51 loader Exp $
-->
<appendix id="mirrors">
@@ -1190,8 +1190,10 @@
doc/el_*
doc/es_*
doc/fr_*
+doc/hu_*
doc/it_*
doc/ja_*
+doc/mn_*
doc/nl_*
doc/no_*
doc/pl_*
==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#13 (text+ko) ====
@@ -3,7 +3,7 @@
The FreeBSD Simplified Chinese Project
Original Revision: 1.184
- $FreeBSD: doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml,v 1.20 2007/08/09 15:40:40 loader Exp $
+ $FreeBSD: doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml,v 1.21 2007/12/12 05:30:51 loader Exp $
-->
<chapter id="x11">
@@ -459,7 +459,7 @@
<filename>Xorg.8.log</filename> µÈµÈ¡£</para>
</note>
- <para>Èç¹ûÒ»ÇÐ×¼±¸Í£µ±£¬ ¾Í¿ÉÒÔ°ÑÅäÖÃÎļþ·Åµ½¹«¹²µÄĿ¼ÖÐÁË¡£
+ <para>Èç¹ûÒ»ÇÐ×¼±¸Í×µ±£¬ ¾Í¿ÉÒÔ°ÑÅäÖÃÎļþ·Åµ½¹«¹²µÄĿ¼ÖÐÁË¡£
Äú¿ÉÒÔÔÚ &man.Xorg.1; ÀïÃæÕÒµ½¾ßÌåλÖá£
Õâ¸öλÖÃͨ³£ÊÇ <filename>/etc/X11/xorg.conf</filename> »ò
<filename>/usr/local/etc/X11/xorg.conf</filename>¡£</para>
==== //depot/projects/dtrace/ports/LEGAL#26 (text+ko) ====
@@ -1,5 +1,5 @@
# Creator: Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.557 2007/10/26 21:07:02 jkim Exp $
+# $FreeBSD: ports/LEGAL,v 1.558 2007/12/12 11:34:22 garga Exp $
**********************************************************************
*** NOTE TO COMMITTERS ***
@@ -477,8 +477,6 @@
distribution coming with the
TV card
qkmj95p5-freebsd games/qkmj Do not sell for profit
-qmail* mail/qmail-* Restricted binary distribution
- of modified versions
qtools-* mail/qtools Possibly restricted binary
distribution of modified
versions
==== //depot/projects/dtrace/ports/MOVED#54 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1517 2007/12/11 21:47:57 lioux Exp $
+# $FreeBSD: ports/MOVED,v 1.1519 2007/12/12 17:42:10 linimon Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -3335,3 +3335,10 @@
x11-themes/kde-icons-gorilla_svg||2007-12-11|Unfetchable
x11-themes/kde-icons-kids||2007-12-11|Unfetchable
x11-themes/kde-icons-outline||2007-12-11|Unfetchable
+java/jdk11|java/jdk16|2007-12-11|Obsolete version|
+java/jdk12|java/jdk16|2007-12-11|Obsolete version|
+java/jfc||2007-12-11|For obsolete version of jdk|
+java/jre||2007-12-11|For obsolete version of jdk|
+java/linux-blackdown-jdk12|java/linux-blackdown-jdk14|2007-12-11|Obsolete version|
+java/linux-sun-jdk12|java/linux-sun-jdk16|2007-12-11|Obsolete version|
+x11-wm/ion-3||2007-12-12|Removed by insistence of software author|
==== //depot/projects/dtrace/src/include/nsswitch.h#5 (text+ko) ====
@@ -1,5 +1,5 @@
/* $NetBSD: nsswitch.h,v 1.6 1999/01/26 01:04:07 lukem Exp $ */
-/* $FreeBSD: src/include/nsswitch.h,v 1.4 2006/04/28 12:03:34 ume Exp $ */
+/* $FreeBSD: src/include/nsswitch.h,v 1.5 2007/12/12 10:08:02 bushman Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -68,7 +68,8 @@
#define NSSRC_DNS "dns" /* DNS; IN for hosts, HS for others */
#define NSSRC_NIS "nis" /* YP/NIS */
#define NSSRC_COMPAT "compat" /* passwd,group in YP compat mode */
-#define NSSRC_CACHE "cache" /* cache daemon */
+#define NSSRC_CACHE "cache" /* nscd daemon */
+#define NSSRC_FALLBACK "__fallback" /* internal fallback source */
/*
* currently implemented databases
@@ -132,6 +133,7 @@
*/
#define NS_FILES_CB(F,C) { NSSRC_FILES, F, C },
#define NS_COMPAT_CB(F,C) { NSSRC_COMPAT, F, C },
+#define NS_FALLBACK_CB(F) { NSSRC_FALLBACK, F, NULL },
#ifdef HESIOD
# define NS_DNS_CB(F,C) { NSSRC_DNS, F, C },
==== //depot/projects/dtrace/src/lib/Makefile#18 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.227 2007/12/10 19:09:24 dougb Exp $
+# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $
.include <bsd.own.mk>
@@ -62,12 +62,8 @@
_libsdp= libsdp
.endif
-.if ${MK_KERBEROS} != "no"
+.if ${MK_GSSAPI} != "no"
_libgssapi= libgssapi
-.else
-.if ${MK_GSSAPI} == "yes"
-_libgssapi= libgssapi
-.endif
.endif
.if ${MK_IPX} != "no"
==== //depot/projects/dtrace/src/lib/libc/gen/getgrent.c#7 (text+ko) ====
@@ -31,7 +31,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.36 2006/09/18 09:34:48 maxim Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.37 2007/12/12 10:08:02 bushman Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -40,6 +40,7 @@
#include <rpcsvc/yp_prot.h>
#include <rpcsvc/ypclnt.h>
#endif
+#include <assert.h>
#include <ctype.h>
#include <errno.h>
#ifdef HESIOD
@@ -143,6 +144,9 @@
static int compat_setgrent(void *, void *, va_list);
static int compat_group(void *, void *, va_list);
+static int gr_addgid(gid_t, gid_t *, int, int *);
+static int getgroupmembership_fallback(void *, void *, va_list);
+
#ifdef NS_CACHING
static int grp_id_func(char *, size_t *, va_list, void *);
static int grp_marshal_func(char *, size_t *, void *, va_list, void *);
@@ -361,89 +365,195 @@
NSS_MP_CACHE_HANDLING(group);
#endif /* NS_CACHING */
-
-/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */
-int
-setgrent(void)
-{
#ifdef NS_CACHING
- static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
- group, (void *)nss_lt_all,
- NULL, NULL);
+static const nss_cache_info setgrent_cache_info = NS_MP_CACHE_INFO_INITIALIZER(
+ group, (void *)nss_lt_all,
+ NULL, NULL);
#endif
- static const ns_dtab dtab[] = {
- { NSSRC_FILES, files_setgrent, (void *)SETGRENT },
+static const ns_dtab setgrent_dtab[] = {
+ { NSSRC_FILES, files_setgrent, (void *)SETGRENT },
#ifdef HESIOD
- { NSSRC_DNS, dns_setgrent, (void *)SETGRENT },
+ { NSSRC_DNS, dns_setgrent, (void *)SETGRENT },
#endif
#ifdef YP
- { NSSRC_NIS, nis_setgrent, (void *)SETGRENT },
+ { NSSRC_NIS, nis_setgrent, (void *)SETGRENT },
#endif
- { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT },
+ { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT },
#ifdef NS_CACHING
- NS_CACHE_CB(&cache_info)
+ NS_CACHE_CB(&setgrent_cache_info)
#endif
- { NULL, NULL, NULL }
- };
- (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "setgrent", defaultsrc, 0);
- return (1);
-}
-
+ { NULL, NULL, NULL }
+};
-int
-setgroupent(int stayopen)
-{
#ifdef NS_CACHING
- static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
- group, (void *)nss_lt_all,
- NULL, NULL);
+static const nss_cache_info endgrent_cache_info = NS_MP_CACHE_INFO_INITIALIZER(
+ group, (void *)nss_lt_all,
+ NULL, NULL);
#endif
- static const ns_dtab dtab[] = {
- { NSSRC_FILES, files_setgrent, (void *)SETGRENT },
+static const ns_dtab endgrent_dtab[] = {
+ { NSSRC_FILES, files_setgrent, (void *)ENDGRENT },
#ifdef HESIOD
- { NSSRC_DNS, dns_setgrent, (void *)SETGRENT },
+ { NSSRC_DNS, dns_setgrent, (void *)ENDGRENT },
#endif
#ifdef YP
- { NSSRC_NIS, nis_setgrent, (void *)SETGRENT },
+ { NSSRC_NIS, nis_setgrent, (void *)ENDGRENT },
#endif
- { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT },
+ { NSSRC_COMPAT, compat_setgrent, (void *)ENDGRENT },
#ifdef NS_CACHING
- NS_CACHE_CB(&cache_info)
+ NS_CACHE_CB(&endgrent_cache_info)
#endif
- { NULL, NULL, NULL }
- };
- (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "setgrent", defaultsrc,
- stayopen);
- return (1);
-}
-
+ { NULL, NULL, NULL }
+};
-void
-endgrent(void)
-{
#ifdef NS_CACHING
- static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
- group, (void *)nss_lt_all,
- NULL, NULL);
+static const nss_cache_info getgrent_r_cache_info = NS_MP_CACHE_INFO_INITIALIZER(
+ group, (void *)nss_lt_all,
+ grp_marshal_func, grp_unmarshal_func);
#endif
- static const ns_dtab dtab[] = {
- { NSSRC_FILES, files_setgrent, (void *)ENDGRENT },
+static const ns_dtab getgrent_r_dtab[] = {
+ { NSSRC_FILES, files_group, (void *)nss_lt_all },
#ifdef HESIOD
- { NSSRC_DNS, dns_setgrent, (void *)ENDGRENT },
+ { NSSRC_DNS, dns_group, (void *)nss_lt_all },
#endif
#ifdef YP
- { NSSRC_NIS, nis_setgrent, (void *)ENDGRENT },
+ { NSSRC_NIS, nis_group, (void *)nss_lt_all },
#endif
- { NSSRC_COMPAT, compat_setgrent, (void *)ENDGRENT },
+ { NSSRC_COMPAT, compat_group, (void *)nss_lt_all },
#ifdef NS_CACHING
- NS_CACHE_CB(&cache_info)
+ NS_CACHE_CB(&getgrent_r_cache_info)
#endif
- { NULL, NULL, NULL }
+ { NULL, NULL, NULL }
+};
+
+static int
+gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *grpcnt)
+{
+ int ret, dupc;
+
+ for (dupc = 0; dupc < MIN(maxgrp, *grpcnt); dupc++) {
+ if (groups[dupc] == gid)
+ return 1;
+ }
+
+ ret = 1;
+ if (*grpcnt < maxgrp)
+ groups[*grpcnt] = gid;
+ else
+ ret = 0;
+
+ (*grpcnt)++;
+
+ return ret;
+}
+
+static int
+getgroupmembership_fallback(void *retval, void *mdata, va_list ap)
+{
+ const ns_src src[] = {
+ { mdata, NS_SUCCESS },
+ { NULL, 0}
};
- (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "endgrent", defaultsrc);
+ struct group grp;
+ struct group *grp_p;
+ char *buf;
+ size_t bufsize;
+ const char *uname;
+ gid_t *groups;
+ gid_t agroup;
+ int maxgrp, *grpcnt;
+ int i, rv, ret_errno;
+
+ /*
+ * As this is a fallback method, only provided src
+ * list will be respected during methods search.
+ */
+ assert(src[0].name != NULL);
+
+ uname = va_arg(ap, const char *);
+ agroup = va_arg(ap, gid_t);
+ groups = va_arg(ap, gid_t *);
+ maxgrp = va_arg(ap, int);
+ grpcnt = va_arg(ap, int *);
+
+ rv = NS_UNAVAIL;
+
+ buf = malloc(GRP_STORAGE_INITIAL);
+ if (buf == NULL)
+ goto out;
+
+ bufsize = GRP_STORAGE_INITIAL;
+
+ gr_addgid(agroup, groups, maxgrp, grpcnt);
+
+ _nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", src, 0);
+ for (;;) {
+ do {
+ ret_errno = 0;
+ grp_p = NULL;
+ rv = _nsdispatch(&grp_p, getgrent_r_dtab, NSDB_GROUP,
+ "getgrent_r", src, &grp, buf, bufsize, &ret_errno);
+
+ if (grp_p == NULL && ret_errno == ERANGE) {
+ free(buf);
+ if ((bufsize << 1) > GRP_STORAGE_MAX) {
+ buf = NULL;
+ errno = ERANGE;
+ goto out;
+ }
+
+ bufsize <<= 1;
+ buf = malloc(bufsize);
+ if (buf == NULL) {
+ goto out;
+ }
+ }
+ } while (grp_p == NULL && ret_errno == ERANGE);
+
+ if (ret_errno != 0) {
+ errno = ret_errno;
+ goto out;
+ }
+
+ if (grp_p == NULL)
+ break;
+
+ for (i = 0; grp.gr_mem[i]; i++) {
+ if (strcmp(grp.gr_mem[i], uname) == 0)
+ gr_addgid(grp.gr_gid, groups, maxgrp, grpcnt);
+ }
+ }
+
+ _nsdispatch(NULL, endgrent_dtab, NSDB_GROUP, "endgrent", src);
+out:
+ free(buf);
+ return (rv);
+}
+
+/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */
+int
+setgrent(void)
+{
+ (void)_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", defaultsrc, 0);
+ return (1);
+}
+
+
+int
+setgroupent(int stayopen)
+{
+ (void)_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", defaultsrc,
+ stayopen);
+ return (1);
+}
+
+
+void
+endgrent(void)
+{
+ (void)_nsdispatch(NULL, endgrent_dtab, NSDB_GROUP, "endgrent", defaultsrc);
}
@@ -451,31 +561,11 @@
getgrent_r(struct group *grp, char *buffer, size_t bufsize,
struct group **result)
{
-#ifdef NS_CACHING
- static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
- group, (void *)nss_lt_all,
- grp_marshal_func, grp_unmarshal_func);
-#endif
-
- static const ns_dtab dtab[] = {
- { NSSRC_FILES, files_group, (void *)nss_lt_all },
-#ifdef HESIOD
- { NSSRC_DNS, dns_group, (void *)nss_lt_all },
-#endif
-#ifdef YP
- { NSSRC_NIS, nis_group, (void *)nss_lt_all },
-#endif
- { NSSRC_COMPAT, compat_group, (void *)nss_lt_all },
-#ifdef NS_CACHING
- NS_CACHE_CB(&cache_info)
-#endif
- { NULL, NULL, NULL }
- };
int rv, ret_errno;
ret_errno = 0;
*result = NULL;
- rv = _nsdispatch(result, dtab, NSDB_GROUP, "getgrent_r", defaultsrc,
+ rv = _nsdispatch(result, getgrent_r_dtab, NSDB_GROUP, "getgrent_r", defaultsrc,
grp, buffer, bufsize, &ret_errno);
if (rv == NS_SUCCESS)
return (0);
@@ -560,6 +650,30 @@
}
+
+int
+__getgroupmembership(const char *uname, gid_t agroup, gid_t *groups,
+ int maxgrp, int *grpcnt)
+{
+ static const ns_dtab dtab[] = {
+ NS_FALLBACK_CB(getgroupmembership_fallback)
+ { NULL, NULL, NULL }
+ };
+ int rv;
+
+ assert(uname != NULL);
+ /* groups may be NULL if just sizing when invoked with maxgrp = 0 */
+ assert(grpcnt != NULL);
+
+ *grpcnt = 0;
+ rv = _nsdispatch(NULL, dtab, NSDB_GROUP, "getgroupmembership",
+ defaultsrc, uname, agroup, groups, maxgrp, grpcnt);
+
+ /* too many groups found? */
+ return (*grpcnt > maxgrp ? -1 : 0);
+}
+
+
static struct group grp;
static char *grp_storage;
static size_t grp_storage_size;
@@ -1436,3 +1550,5 @@
return (NS_RETURN);
}
}
+
+
==== //depot/projects/dtrace/src/lib/libc/gen/getgrouplist.c#5 (text+ko) ====
@@ -31,7 +31,7 @@
static char sccsid[] = "@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.15 2007/01/09 00:27:53 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.16 2007/12/12 10:08:02 bushman Exp $");
/*
* get credential
@@ -42,46 +42,11 @@
#include <string.h>
#include <unistd.h>
+extern int __getgroupmembership(const char *, gid_t, gid_t *, int, int *);
+
int
getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
{
- const struct group *grp;
- int i, maxgroups, ngroups, ret;
+ return __getgroupmembership(uname, agroup, groups, *grpcnt, grpcnt);
+}
- ret = 0;
- ngroups = 0;
- maxgroups = *grpcnt;
- /*
- * When installing primary group, duplicate it;
- * the first element of groups is the effective gid
- * and will be overwritten when a setgid file is executed.
- */
- groups[ngroups++] = agroup;
- if (maxgroups > 1)
- groups[ngroups++] = agroup;
- /*
- * Scan the group file to find additional groups.
- */
- setgrent();
- while ((grp = getgrent()) != NULL) {
- for (i = 0; i < ngroups; i++) {
- if (grp->gr_gid == groups[i])
- goto skip;
- }
- for (i = 0; grp->gr_mem[i]; i++) {
- if (!strcmp(grp->gr_mem[i], uname)) {
- if (ngroups >= maxgroups) {
- ret = -1;
- break;
- }
- groups[ngroups++] = grp->gr_gid;
- break;
- }
- }
-skip:
- ;
- }
- endgrent();
- *grpcnt = ngroups;
- return (ret);
-}
==== //depot/projects/dtrace/src/lib/libc/locale/localeconv.c#4 (text+ko) ====
@@ -11,10 +11,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -36,7 +32,7 @@
static char sccsid[] = "@(#)localeconv.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.13 2003/06/26 10:46:16 phantom Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.14 2007/12/12 07:43:23 phantom Exp $");
#include <locale.h>
==== //depot/projects/dtrace/src/lib/libc/net/nsdispatch.c#6 (text+ko) ====
@@ -68,7 +68,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/nsdispatch.c,v 1.14 2007/05/17 03:33:23 jon Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/nsdispatch.c,v 1.15 2007/12/12 10:08:03 bushman Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -136,6 +136,15 @@
#endif
/*
+ * When this is set to 1, nsdispatch won't use nsswitch.conf
+ * but will consult the 'defaults' source list only.
+ * NOTE: nested fallbacks (when nsdispatch calls fallback functions,
+ * which in turn calls nsdispatch, which should call fallback
+ * function) are not supported
+ */
+static int fallback_dispatch = 0;
+
+/*
* Attempt to spew relatively uniform messages to syslog.
*/
#define nss_log(level, fmt, ...) \
@@ -600,7 +609,7 @@
va_list ap;
const ns_dbt *dbt;
const ns_src *srclist;
- nss_method method;
+ nss_method method, fb_method;
void *mdata;
int isthreaded, serrno, i, result, srclistsize;
@@ -609,6 +618,9 @@
nss_cache_data *cache_data_p;
int cache_flag;
#endif
+
+ dbt = NULL;
+ fb_method = NULL;
isthreaded = __isthreaded;
serrno = errno;
@@ -624,8 +636,13 @@
result = NS_UNAVAIL;
goto fin;
}
- dbt = vector_search(&database, _nsmap, _nsmapsize, sizeof(*_nsmap),
- string_compare);
+ if (fallback_dispatch == 0) {
+ dbt = vector_search(&database, _nsmap, _nsmapsize, sizeof(*_nsmap),
+ string_compare);
+ fb_method = nss_method_lookup(NSSRC_FALLBACK, database,
+ method_name, disp_tab, &mdata);
+ }
+
if (dbt != NULL) {
srclist = dbt->srclist;
srclistsize = dbt->srclistsize;
@@ -684,6 +701,12 @@
if (result & (srclist[i].flags))
break;
+ } else if (fb_method != NULL) {
+ fallback_dispatch = 1;
+ va_start(ap, defaults);
+ result = fb_method(retval, (void *)srclist[i].name, ap);
+ va_end(ap);
+ fallback_dispatch = 0;
}
}
==== //depot/projects/dtrace/src/lib/libc/string/strtok.3#4 (text+ko) ====
@@ -22,12 +22,6 @@
.\" disclaimer in the documentation and/or other materials provided
.\" with the distribution.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list