Date: Tue, 29 Sep 2009 21:37:20 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 169035 for review Message-ID: <200909292137.n8TLbKLh040859@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=169035 Change 169035 by rene@rene_self on 2009/09/29 21:36:24 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#13 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#13 integrate .. //depot/projects/docproj_nl/share/pgpkeys/gahr.key#2 integrate .. //depot/projects/docproj_nl/www/en/cgi/query-pr.cgi#3 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#7 (text+ko) ==== @@ -1,6 +1,6 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.74 2008/11/24 16:37:58 rene Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.75 2009/09/29 14:20:43 bcr Exp $ --> <chapter id="mac"> @@ -700,7 +700,7 @@ implement the labeling feature, including the Biba, Lomac, <acronym>MLS</acronym> and <acronym>SEBSD</acronym> policies.</para> - + <para>In many cases, the <option>multilabel</option> may not need to be set at all. Consider the following situation and security model:</para> @@ -1547,7 +1547,7 @@ to.</para> <para>The &man.mac.biba.4; security policy module permits an - administrator to address which files and programs a user or + administrator to address which files and programs a user or users may see and invoke while assuring that the programs and files are free from threats and trusted by the system for that user, or group of users.</para> @@ -1565,7 +1565,7 @@ utilities. While other users would be grouped into other categories such as testers, designers, or just ordinary users and would only be permitted read access.</para> - + <para>With its natural security control, a lower integrity subject is unable to write to a higher integrity subject; a higher integrity subject cannot observe or read a lower integrity @@ -1728,7 +1728,7 @@ <username>www</username> users into the insecure class:</para> <screen>&prompt.root; <userinput>pw usermod nagios -L insecure</userinput></screen> - <screen>&prompt.root; <userinput>pw usermod www -L insecure</userinput></screen> + <screen>&prompt.root; <userinput>pw usermod www -L insecure</userinput></screen> </sect2> <sect2> @@ -1885,7 +1885,7 @@ <para>Begin by adding the following line to <filename>/boot/loader.conf</filename>:</para> - <programlisting>mac_seeotheruids_enabled="YES"</programlisting> + <programlisting>mac_seeotheruids_load="YES"</programlisting> <para>The &man.mac.bsdextended.4; security policy module may be activated through the use of the following rc.conf ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.134 2009/08/14 07:30:07 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.135 2009/09/29 15:06:13 bcr Exp $ --> <chapter id="multimedia"> @@ -1537,7 +1537,7 @@ either <filename>/dev/ugen0.2</filename> or <filename>/dev/uscanner0</filename> as device node according to the &os; version we run. For this example, a - &epson.perfection; 1650 USB scanner was used.</para> + &epson.perfection; 1650 USB scanner was used.</para> </sect3> <sect3> @@ -1646,7 +1646,7 @@ device 'epson2:libusb:/dev/usb:/dev/ugen0.2' is a Epson GT-8200 flatbed scanner</screen> <para>This output comes from a &os; 8.X system, the - <literal>`epson2:libusb:/dev/usb:/dev/ugen0.2'</literal> item + <literal>'epson2:libusb:/dev/usb:/dev/ugen0.2'</literal> item gives us the backend name (<literal>epson2</literal>) and the device node (<literal>/dev/ugen0.2</literal>) used by our scanner.</para> @@ -1658,7 +1658,7 @@ the backend configuration file and define the scanner device used. The <filename class="directory">/usr/local/etc/sane.d/</filename> directory - contains all backends configuration files. This + contains all backend configuration files. This identification problem does appear with certain USB scanners.</para> @@ -1685,7 +1685,7 @@ <para>Since the scanner is not identified, we will need to edit the <filename>/usr/local/etc/sane.d/epson2.conf</filename> - file. The scanner model used was the &epson.perfection; 1650, + file. The scanner model used was the &epson.perfection; 1650, so we know the scanner will use the <literal>epson2</literal> backend. Be sure to read the help comments in the backends configuration files. Line changes are quite simple: comment @@ -1746,7 +1746,7 @@ <filename>/dev/ugen0.2</filename> which is in fact just a symlink to the real device node called <filename>/dev/usb/0.2.0</filename> (a quick look at the - contain of the <filename class="directory">/dev</filename> + contents of the <filename class="directory">/dev</filename> directory will confirm it). Both, the symlink and the device node, are owned respectively by the <groupname>wheel</groupname> and the @@ -1770,7 +1770,7 @@ <para>Then we have to make the <filename>/dev/ugen0.2</filename> symlink and the <filename>/dev/usb/0.2.0</filename> device node accessible to the <groupname>usb</groupname> group with the correct write permissions (<literal>0660</literal> or - <literal>0664</literal>), cause by default only the owner of + <literal>0664</literal>), because by default only the owner of these files (<username>root</username>) can write to them. All of this is done by adding the following lines to the <filename>/etc/devfs.rules</filename> file:</para> @@ -1779,9 +1779,8 @@ add path ugen0.2 mode 0660 group usb add path usb/0.2.0 mode 0666 group usb</programlisting> - <para>For the &os; 7.X users, the following lines with the - correct device node, most of time - <filename>/dev/uscanner0</filename>, are needed:</para> + <para>&os; 7.X users will probably need the following lines with the + correct device node <filename>/dev/uscanner0</filename>:</para> <programlisting>[system=5] add path uscanner0 mode 660 group usb</programlisting> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Dutch Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.13 2009/08/03 14:10:16 rene Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.14 2009/09/25 19:25:40 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/disks/chapter.sgml %SRCID% 1.292 ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Dutch Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.15 2009/05/17 17:12:22 rene Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.16 2009/09/25 19:25:40 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml %SRCID% 1.193 ==== //depot/projects/docproj_nl/share/pgpkeys/gahr.key#2 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/share/pgpkeys/gahr.key,v 1.1 2008/02/21 17:22:12 gahr Exp $ --> +<!-- $FreeBSD: doc/share/pgpkeys/gahr.key,v 1.2 2009/09/29 19:27:07 gahr Exp $ --> <!-- sh addkey.sh gahr 9571F78E; --> @@ -21,30 +21,30 @@ 4eDMA/4najs55j1kz8khhLiAX0SUJj92XpjmpSFLvFB8D4JpeNtWKGx/wt9uwYBr GqnFpP7JHUFowTgg4LjgM3r+W+s1TyUZ5cBlgTgp1Qh6y0h98X6Pbppu1GEhTvWP 9FlvKNK1+bYNKKvUFHc5nLRK+0M7e0IP6yws2O9RN6rkb6UU8rQdUGlldHJvIENl -cnV0dGkgPGdhaHJAZ2Foci5jaD6IeAQTEQIAOAIbIwYLCQgHAwIEFQIIAwQWAgMB -Ah4BAheAAhkBFBhodHRwOi8vcGdwLm1pdC5lZHV0BQJFzyOoAAoJEMDCapiVcfeO -U+oAoIPxcczSTL9IAJnRBUaRvjL8dJNgAJ9wh1Gh1+HpbxqtXsTcEr68ZXKfUYhp -BBMRAgApAhsjBQkJZgGABgsJCAcDAgQVAggDBBYCAwECHgECF4AFAkUULcYCGQEA -CgkQwMJqmJVx944wAQCggfm9PIqoj6KZAih/TjByBR7kcAgAnRqnqUHf95IzrsGn -6d7b+IhfvKh7iH4EExECAD4CGyMFCQlmAYAGCwkIBwMCBBUCCAMEFgIDAQIeAQIX -gAIZAQUCRc3QKxQYaHR0cDovL3BncC5taXQuZWR1dAAKCRDAwmqYlXH3jswNAJ9K -qPCEaiTKejBDeI+ZjLemDPYFogCgvC7oKdYHCRU/i9jgcsiycL3wuce0N1BpZXRy -byBDZXJ1dHRpIChUaGUgRnJlZUJTRCBQcm9qZWN0KSA8Z2FockBGcmVlQlNELm9y -Zz6IYAQTEQIAIAUCR7xw2AIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEMDC -apiVcfeOw5AAoMjUQZiqAGONGzJtT3RI1sHhl/p8AJ9ytrTA/gwo66j9K+qNDxQ9 -kUXqubkCDQREauOLEAgAv+OK9YPB4r5+9aZ9/tV6ItolxheP3skoV9ISg4T0ltZM -8jLtBLqPY5qWlGRrAbh3ZHkOvrrfY/bfGxPg/qlOe+ewqTnAA7IQcBXObENVfrq2 -gm35aluNcHbFutYGrkAThuFst1qJbPowBBmQgR7RH5/lWbn3Qnisthsm6J5Jldjg -cfXth9usyXsGXCP1zZ10Sj2Q090SuSEEC/PfBpSbgkEMtTEJfirmVKTp0gPfIdUn -/HhT3ed4kkZXkQJvvI/t3Glyp7RY5nMYPr219vJ+bYP6yxm9gdfLey6A4gEprtnc -F/7MTUpib3MvgBpmPRq9yV4LHbhiDbXHaoXG1uZVvwADBQf/TkvaVZK55GKm527F -enxU4hf0fWG3orqKAI/p3AhPj7l/T1nLGWHMku22j61zx9N5xPElMLFdcs4+BX/l -tzZdhFS67k+Ya/CLy0G3we8KQSqoUTzlP7Mr1aJtXiNXUbadNrkSX1DlRV5RP6ro -73vvaFXPwHTxSmRRHg/UgE0B5+tJkuNmK2whTDRR6rfpEcdIS1Tms8IUnva0ZI0Q -SnhzUcxv+YrV8TX11/NC0FlmhxTzncM1pa6w0yGC/E48uG3NuElPenqM1h05xe9B -ntWbBPjB1TYa80jYNbLA/KdKEZlK1klP2PnNoAX3HoKOm/1rkYEywGfxXuJezX4f -YLrdxYhPBBgRAgAPBQJEauOLAhsMBQkJZgGAAAoJEMDCapiVcfeOsdgAnAhRFj8Q -7p39kg5LmO/zsDXCD8wOAKCDV7iQR8Dblj7cX+WKPwwhnrNq0Q== -=fVQ7 +cnV0dGkgPGdhaHJAZ2Foci5jaD6IYwQTEQIAIwIbIwYLCQgHAwIEFQIIAwQWAgMB +Ah4BAheAAhkBBQJKwl4hAAoJEMDCapiVcfeOp+oAnR9QXvf5u9vyeU3vnAo7CiyW +LE6GAJ9Pip8AO5c9BvjTjsRhVH9O+447qohpBBMRAgApAhsjBQkJZgGABgsJCAcD +AgQVAggDBBYCAwECHgECF4AFAkUULcYCGQEACgkQwMJqmJVx944wAQCggfm9PIqo +j6KZAih/TjByBR7kcAgAnRqnqUHf95IzrsGn6d7b+IhfvKh7iH4EExECAD4CGyMF +CQlmAYAGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAIZAQUCRc3QKxQYaHR0cDovL3Bn +cC5taXQuZWR1dAAKCRDAwmqYlXH3jswNAJ9KqPCEaiTKejBDeI+ZjLemDPYFogCg +vC7oKdYHCRU/i9jgcsiycL3wuce0N1BpZXRybyBDZXJ1dHRpIChUaGUgRnJlZUJT +RCBQcm9qZWN0KSA8Z2FockBGcmVlQlNELm9yZz6IYAQTEQIAIAUCR7xw2AIbIwYL +CQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEMDCapiVcfeOw5AAoMjUQZiqAGONGzJt +T3RI1sHhl/p8AJ9ytrTA/gwo66j9K+qNDxQ9kUXqubkCDQREauOLEAgAv+OK9YPB +4r5+9aZ9/tV6ItolxheP3skoV9ISg4T0ltZM8jLtBLqPY5qWlGRrAbh3ZHkOvrrf +Y/bfGxPg/qlOe+ewqTnAA7IQcBXObENVfrq2gm35aluNcHbFutYGrkAThuFst1qJ +bPowBBmQgR7RH5/lWbn3Qnisthsm6J5JldjgcfXth9usyXsGXCP1zZ10Sj2Q090S +uSEEC/PfBpSbgkEMtTEJfirmVKTp0gPfIdUn/HhT3ed4kkZXkQJvvI/t3Glyp7RY +5nMYPr219vJ+bYP6yxm9gdfLey6A4gEprtncF/7MTUpib3MvgBpmPRq9yV4LHbhi +DbXHaoXG1uZVvwADBQf/TkvaVZK55GKm527FenxU4hf0fWG3orqKAI/p3AhPj7l/ +T1nLGWHMku22j61zx9N5xPElMLFdcs4+BX/ltzZdhFS67k+Ya/CLy0G3we8KQSqo +UTzlP7Mr1aJtXiNXUbadNrkSX1DlRV5RP6ro73vvaFXPwHTxSmRRHg/UgE0B5+tJ +kuNmK2whTDRR6rfpEcdIS1Tms8IUnva0ZI0QSnhzUcxv+YrV8TX11/NC0FlmhxTz +ncM1pa6w0yGC/E48uG3NuElPenqM1h05xe9BntWbBPjB1TYa80jYNbLA/KdKEZlK +1klP2PnNoAX3HoKOm/1rkYEywGfxXuJezX4fYLrdxYhPBBgRAgAPBQJEauOLAhsM +BQkJZgGAAAoJEMDCapiVcfeOsdgAnAhRFj8Q7p39kg5LmO/zsDXCD8wOAKCDV7iQ +R8Dblj7cX+WKPwwhnrNq0Q== +=UXRy -----END PGP PUBLIC KEY BLOCK----- ]]></programlisting> ==== //depot/projects/docproj_nl/www/en/cgi/query-pr.cgi#3 (text+ko) ==== @@ -26,7 +26,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.65 2008/09/22 19:13:42 wosch Exp $ +# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.66 2009/09/29 19:45:37 simon Exp $ # # @@ -302,6 +302,8 @@ $PR = int $PR; $PR = quotemeta $PR; +# Note: query-pr.web is just a anti DoS wrapper around query-pr which +# make sure we do not run too many query-pr instances at once. if ($category) { $category = quotemeta $category; @query = split /\n/, qx(query-pr.web --full --category=${category} ${PR} 2>&1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909292137.n8TLbKLh040859>