Attachment 21407 Details for Bug 37532 – file.diff

[patch] file.diff

file.diff (text/plain), 22.73 KB, created by Martin Heinen on 2002-04-28 16:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Heinen

Created: 2002-04-28 16:20:01 UTC

Size: 22.73 KB

patch

obsolete

>Index: faq/book.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/faq/book.sgml,v
>retrieving revision 1.430
>diff -u -r1.430 book.sgml
>--- faq/book.sgml	17 Apr 2002 04:18:27 -0000	1.430
>+++ faq/book.sgml	28 Apr 2002 15:05:53 -0000
>@@ -6273,7 +6273,7 @@
>       <qandaentry>
> 	<question id="su-wheel-group">
> 	  <para>Why do I get the error, <errorname>you are not in the correct
>-	    group to su root</errorname> when I try to su to root?</para>
>+	    group to su root</errorname> when I try to su to <username>root</username>?</para>
> 	</question>
> 
> 	<answer>
>@@ -6736,7 +6736,7 @@
> 
>       <qandaentry>
>         <question id="forgot-root-pw">
>-          <para>I have forgotten the root password!  What do I do?</para>
>+          <para>I have forgotten the <username>root</username> password!  What do I do?</para>
>         </question><answer>
> 
>           <para>Do not Panic!  Simply restart the system, type
>@@ -6747,7 +6747,7 @@
>             <command>mount -u /</command> to remount your root filesystem
>             read/write, then run <command>mount -a</command> to remount all
>             the filesystems. Run <command>passwd root</command> to change
>-            the root password then run &man.exit.1; to continue
>+            the <username>root</username> password then run &man.exit.1; to continue
>             booting.</para>
>         </answer>
>       </qandaentry>
>@@ -6975,7 +6975,7 @@
> 
>                 <para>Take the <literal>ntalk</literal> service, for
>                   example (see /etc/inetd.conf). This service used to run
>-                  as userid root. Now it runs as userid tty. The tty user
>+                  as userid <username>root</username>. Now it runs as userid <username>tty</username>. The <username>tty</username> user
>                   is a sandbox designed to make it more difficult for
>                   someone who has successfully hacked into the system via
>                   ntalk from being able to hack beyond that user id.</para>
>@@ -7262,7 +7262,7 @@
> 	  <para>The reason why <filename>.shosts</filename>
> 	    authentication does not work by default in more recent
> 	    versions of FreeBSD is because &man.ssh.1; 
>-	    is not installed suid root by default.  To
>+	    is not installed suid <username>root</username> by default.  To
> 	    <quote>fix</quote> this, you can do one of the
> 	    following:</para>
> 
>@@ -7900,7 +7900,7 @@
>             Newer versions of XFree86 do not install the servers setuid to
>             <username>root</username> for just this reason.</para>
> 
>-          <para>Obviously, running an X server as the root user is not
>+          <para>Obviously, running an X server as the <username>root</username> user is not
>             acceptable, nor a good idea security-wise.  There are two ways
>             to be able to use X as a regular user.  The first is to use
>             <command>xdm</command> or another display manager
>@@ -9029,7 +9029,7 @@
>             you will be prompted for the path to a shell).</para>
> 
>           <para>Some people use <username>toor</username> for
>-            day-to-day root tasks with a non-standard shell, leaving
>+            day-to-day <username>root</username> tasks with a non-standard shell, leaving
>             <username>root</username>, with a standard shell, for
>             single user mode or emergencies. By default you cannot log
>             in using <username>toor</username> as it does not have a
>@@ -10447,7 +10447,7 @@
>             <filename>/etc/gettytab</filename>, see &man.gettytab.5;).
>             The terminal type for this port is <literal>dialup</literal>.
>             The port is <literal>on</literal> and is
>-            <literal>insecure</literal>---meaning root logins on the port
>+            <literal>insecure</literal>---meaning <username>root</username> logins on the port
>             are not allowed. For dialin ports like this one, use the
>             <devicename>ttyd<replaceable>X</replaceable></devicename> entry.</para>
> 
>@@ -10455,7 +10455,7 @@
>             the terminal type. Many users set up in their <filename>.profile</filename> or
>             <filename>.login</filename> files a prompt for the actual terminal type if the
>             starting type is dialup. The example shows the port as
>-            insecure. To become root on this port, you have to login as a
>+            insecure. To become <username>root</username> on this port, you have to login as a
>             regular user, then &man.su.1; to become
>             <username>root</username>. If you use <literal>secure</literal>
>             then <username>root</username> can login in directly.</para>
>Index: handbook/advanced-networking/chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v
>retrieving revision 1.133
>diff -u -r1.133 chapter.sgml
>--- handbook/advanced-networking/chapter.sgml	7 Apr 2002 11:32:07 -0000	1.133
>+++ handbook/advanced-networking/chapter.sgml	28 Apr 2002 13:33:20 -0000
>@@ -2386,7 +2386,7 @@
>             <filename>/etc</filename> directory of the NIS master, with one
>             exception: the <filename>/etc/master.passwd</filename> file.
>             This is for a good reason; you do not want to propagate
>-            passwords to your root and other administrative accounts to
>+            passwords to your <username>root</username> and other administrative accounts to
>             all the servers in the NIS domain.  Therefore, before we
>             initialize the NIS maps, you should:</para>
> 
>@@ -2398,7 +2398,7 @@
>             (<username>bin</username>, <username>tty</username>, <username>kmem</username>, 
> 	      <username>games</username>, etc), as well as any accounts that you
>             do not want to be propagated to the NIS clients (for example
>-            root and any other UID 0 (superuser) accounts).</para>
>+            <username>root</username> and any other UID 0 (superuser) accounts).</para>
> 
>           <note><para>Make sure the
>             <filename>/var/yp/master.passwd</filename> is neither group
>@@ -3413,7 +3413,7 @@
> 	        you should be warned that <devicename>bpf</devicename>
> 		is also the device that allows packet sniffers to work
> 		correctly (although they still have to be run as
>-		root).  <devicename>bpf</devicename>
>+		<username>root</username>).  <devicename>bpf</devicename>
> 		<emphasis>is</emphasis> required to use DHCP, but if
> 		you are very sensitive about security, you probably
> 		should not add <devicename>bpf</devicename> to your
>@@ -4478,7 +4478,7 @@
> 	following checklist, it is assumed that the path to the sandbox
> 	is <filename>/etc/namedb</filename> and that you have made no
> 	prior modifications to the contents of this directory. Perform
>-	the following steps as root.</para>
>+	the following steps as <username>root</username>.</para>
> 
>       <itemizedlist>
> 	<listitem>
>@@ -5832,7 +5832,7 @@
> 	both computers.</para>
> 
>       <para>Configure the network interface parameters for lp0 on both
>-	sites as root. For example, if you want connect the host host1
>+	sites as <username>root</username>. For example, if you want connect the host host1
> 	with host2</para>
> 
>       <programlisting>                 host1 &lt;-----&gt; host2
>Index: handbook/backups/chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/backups/chapter.sgml,v
>retrieving revision 1.46
>diff -u -r1.46 chapter.sgml
>--- handbook/backups/chapter.sgml	1 Apr 2002 14:39:09 -0000	1.46
>+++ handbook/backups/chapter.sgml	28 Apr 2002 13:35:15 -0000
>@@ -793,7 +793,7 @@
> 	floppies.</para>
> 
>       <para>To backup all the files in the current directory and sub-directory
>-	use this (as root):</para>
>+	use this (as <username>root</username>):</para>
> 
>       <screen>&prompt.root; <userinput>tar Mcvf /dev/fd0 *</userinput></screen>
> 
>Index: handbook/boot/chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml,v
>retrieving revision 1.33
>diff -u -r1.33 chapter.sgml
>--- handbook/boot/chapter.sgml	28 Feb 2002 10:09:52 -0000	1.33
>+++ handbook/boot/chapter.sgml	28 Apr 2002 13:38:36 -0000
>@@ -607,7 +607,7 @@
>       <para>If the system <literal>console</literal> is set
> 	to <literal>insecure</literal> in
> 	<filename>/etc/ttys</filename>, then the system prompts for
>-	the root password before initiating single-user mode.</para>
>+	the <username>root</username> password before initiating single-user mode.</para>
> 
>       <example id="boot-insecure-console">
> 	<title>An Insecure Console in /etc/ttys</title>
>@@ -623,7 +623,7 @@
> 	<para>An <literal>insecure</literal> console means that you
> 	  consider your physical security to the console to be
> 	  insecure, and want to make sure only someone who knows the
>-	  root password may use single-user mode, and it does not
>+	  <username>root</username> password may use single-user mode, and it does not
> 	  mean that you want to run your console insecurely.  Thus,
> 	  if you want security, choose <literal>insecure</literal>,
> 	  not <literal>secure</literal>.</para>
>Index: handbook/config/chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v
>retrieving revision 1.48
>diff -u -r1.48 chapter.sgml
>--- handbook/config/chapter.sgml	23 Apr 2002 02:15:00 -0000	1.48
>+++ handbook/config/chapter.sgml	28 Apr 2002 13:26:01 -0000
>@@ -381,7 +381,7 @@
> 
>     <para>The startup scripts of FreeBSD will look in
>       <filename>/usr/local/etc/rc.d</filename> for scripts that have an
>-      <literal>.sh</literal> extension and are executable by root.  Those
>+      <literal>.sh</literal> extension and are executable by <username>root</username>.  Those
>       scripts that are found are called with an option <option>start</option>
>       at startup, and <option>stop</option> at shutdown to allow them to carry
>       out their purpose.  So if you wanted the above sample script to be
>Index: handbook/cutting-edge/chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v
>retrieving revision 1.118
>diff -u -r1.118 chapter.sgml
>--- handbook/cutting-edge/chapter.sgml	7 Apr 2002 23:52:36 -0000	1.118
>+++ handbook/cutting-edge/chapter.sgml	28 Apr 2002 13:40:08 -0000
>@@ -1786,7 +1786,7 @@
> 	then set up <filename>/etc/make.conf</filename> properly to share
> 	distfiles.  You should set <makevar>DISTDIR</makevar> to a
> 	common shared directory that is writable by whichever user
>-	root is mapped to by your NFS mounts.  Each
>+	<username>root</username> is mapped to by your NFS mounts.  Each
> 	machine should set <makevar>WRKDIRPREFIX</makevar> to a
> 	local build directory.  Finally, if you are going to be
> 	building and distributing packages, you should set
>Index: handbook/install/chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v
>retrieving revision 1.148
>diff -u -r1.148 chapter.sgml
>--- handbook/install/chapter.sgml	1 Apr 2002 14:48:10 -0000	1.148
>+++ handbook/install/chapter.sgml	28 Apr 2002 13:46:31 -0000
>@@ -4096,9 +4096,9 @@
>       <title>Add User/Groups</title>
> 
>       <para>You should add at least one user during the installation so
>-	that you can use the system without being logged in as root.  The
>+	that you can use the system without being logged in as <username>root</username>.  The
> 	root partition is generally small and running applications as
>-	root can quickly fill it.  A bigger danger is noted below:</para>
>+	<username>root</username> can quickly fill it.  A bigger danger is noted below:</para>
> 
>       <screen>                     User Confirmation Requested
>  Would you like to add any initial user accounts to the system? Adding
>@@ -4218,7 +4218,7 @@
> 	login.</para>
> 
>       <para>The user was also added to the group <groupname>wheel</groupname> to be able to
>-	become a superuser with root privileges.</para>
>+	become a superuser with <username>root</username> privileges.</para>
> 
>       <para>When you are satisfied, press &gui.ok; and
> 	the User and Group Management menu will redisplay.</para>
>@@ -4254,7 +4254,7 @@
> 
>                [ Press enter to continue ]</screen>
> 
>-      <para>Press <keycap>Enter</keycap> to set the root password.</para>
>+      <para>Press <keycap>Enter</keycap> to set the <username>root</username> password.</para>
> 
>       <para>The password will need to be typed in twice
> 	correctly. Needless to say, make sure you have a way of finding
>@@ -4332,7 +4332,7 @@
> 	<command>dmesg</command> at the prompt.</para>
> 
>       <para>Login using the username/password you set during installation
>-	(rpratt, in this example).  Avoid logging in as root except when
>+	(rpratt, in this example).  Avoid logging in as <username>root</username> except when
> 	necessary.</para>
> 
>       <para>Typical boot messages:</para>
>@@ -4506,8 +4506,8 @@
>       <para>It is important to properly shutdown the operating
> 	system.  Do not just turn off power.  First, become a superuser by
> 	typing <command>su</command> at the command line and entering the
>-	root password.  This will work only if the user is a member of the
>-	group wheel. Otherwise, login as root and use
>+	<username>root</username> password.  This will work only if the user is a member of the
>+	group wheel. Otherwise, login as <username>root</username> and use
> 	<command>shutdown -h now</command>.</para>
> 
>       <screen>The operating system has halted. 
>Index: handbook/linuxemu/chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v
>retrieving revision 1.66
>diff -u -r1.66 chapter.sgml
>--- handbook/linuxemu/chapter.sgml	27 Mar 2002 01:16:54 -0000	1.66
>+++ handbook/linuxemu/chapter.sgml	28 Apr 2002 13:48:17 -0000
>@@ -209,7 +209,7 @@
> 	  libraries?  How do you know which shared libraries Linux
> 	  binaries need, and where to get them?  Basically, there are 2
> 	  possibilities (when following these instructions you will need
>-	  to be root on your FreeBSD system).</para>
>+	  to be <username>root</username> on your FreeBSD system).</para>
> 
> 	<para>If you have access to a Linux system, see what shared
> 	  libraries the application needs, and copy them to your FreeBSD
>@@ -1261,7 +1261,7 @@
>         <title><command>make world</command> and a New Kernel</title>
> 
>         <para>The first thing to do is to install the sources.
>-          As user root, do the following:</para>
>+          As user <username>root</username>, do the following:</para>
> 
>         <screen>&prompt.root; <userinput>cd /usr/src</userinput>
> &prompt.root; <userinput>make world</userinput> </screen>
>@@ -1314,7 +1314,7 @@
> 
>       <sect3 id="installinglinuxbase-system">
>         <title>Installing Linux Base-system</title>
>-        <para>First the Linux base-system needs to be installed (as root):
>+        <para>First the Linux base-system needs to be installed (as <username>root</username>):
>         <screen>&prompt.root; <userinput>cd /usr/ports/emulators/linux_base</userinput>
> &prompt.root; <userinput>make package</userinput> </screen></para>
>       </sect3>
>@@ -1706,7 +1706,7 @@
> 
>         <screen>&prompt.root; <userinput>export LD_LIBRARY_PATH=/oracle/IDS/lib:/sapmnt/IDS/exe:/oracle/805_32/lib</userinput> </screen>
> 
>-        <para>Start R3SETUP as user root from installation
>+        <para>Start R3SETUP as user <username>root</username> from installation
>         directory:</para>
> 
>         <screen>&prompt.root; <userinput>cd /oracle/IDS/sapreorg/install</userinput>
>Index: handbook/mail/chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml,v
>retrieving revision 1.44
>diff -u -r1.44 chapter.sgml
>--- handbook/mail/chapter.sgml	25 Apr 2002 22:34:48 -0000	1.44
>+++ handbook/mail/chapter.sgml	28 Apr 2002 13:50:33 -0000
>@@ -599,7 +599,7 @@
> 	<para>Add a script to
> 	  <filename>/usr/local/etc/rc.d/</filename> that
> 	  ends in <filename>.sh</filename> and is executable by
>-	  root.  The script should also accept the parameters 'start'
>+	  <username>root</username>.  The script should also accept the parameters 'start'
> 	  or 'stop'.  So that you could, for example, execute
> 	  <filename>/usr/local/etc/rc.d/supermailer.sh start</filename>
> 	  or <filename>/usr/local/etc/rc.d/supermailer.sh stop</filename>.
>Index: handbook/mirrors/chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v
>retrieving revision 1.211
>diff -u -r1.211 chapter.sgml
>--- handbook/mirrors/chapter.sgml	25 Apr 2002 05:18:15 -0000	1.211
>+++ handbook/mirrors/chapter.sgml	28 Apr 2002 13:50:47 -0000
>@@ -2125,7 +2125,7 @@
> 	directory status files untouched when run this way.  The new
> 	versions of those files will be written into the specified
> 	directory.  As long as you have read access to
>-	<filename>/usr/src</filename>, you do not even need to be root
>+	<filename>/usr/src</filename>, you do not even need to be <username>root</username>
> 	to perform this kind of trial run.</para>
>       
>       <para>If you are not running X11 or if you just do not like GUIs,
>Index: handbook/ppp-and-slip/chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml,v
>retrieving revision 1.71
>diff -u -r1.71 chapter.sgml
>--- handbook/ppp-and-slip/chapter.sgml	13 Apr 2002 00:40:12 -0000	1.71
>+++ handbook/ppp-and-slip/chapter.sgml	28 Apr 2002 14:19:44 -0000
>@@ -2003,7 +2003,7 @@
>     <sect2>
>       <title>Running <application>PPP</application></title>
> 
>-      <para>As root, you can run:</para>
>+      <para>As <username>root</username>, you can run:</para>
> 
>       <screen>&prompt.root; <userinput>ppp -ddial name_of_service_provider</userinput></screen>
> 
>@@ -2378,7 +2378,7 @@
> 	      <keycombo>
> 		<keycap>Ctrl</keycap>
> 		<keycap>z</keycap>
>-	      </keycombo>) and as root, type:</para>
>+	      </keycombo>) and as <username>root</username>, type:</para>
> 
> 	    <screen>&prompt.root; <userinput>slattach -h -c -s 115200 /dev/modem</userinput></screen>
> 
>Index: handbook/printing/chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v
>retrieving revision 1.55
>diff -u -r1.55 chapter.sgml
>--- handbook/printing/chapter.sgml	24 Mar 2002 03:09:02 -0000	1.55
>+++ handbook/printing/chapter.sgml	28 Apr 2002 13:56:40 -0000
>@@ -514,8 +514,8 @@
> 
> 	<procedure>
> 	  <step>
>-	    <para>Become root with the &man.su.1; command.  Enter the
>-	      root password when prompted.</para>
>+	    <para>Become <username>root</username> with the &man.su.1; command.  Enter the
>+	      <username>root</username> password when prompted.</para>
> 	  </step>
> 
> 	  <step>
>@@ -706,7 +706,7 @@
> 
> 	    <procedure>
> 	      <step>
>-		<para>Become root with  &man.su.1;.</para>
>+		<para>Become <username>root</username> with  &man.su.1;.</para>
> 	      </step>
> 
> 	      <step>
>@@ -771,7 +771,7 @@
> 
> 	    <procedure>
> 	      <step>
>-		<para>Become root with &man.su.1;.</para>
>+		<para>Become <username>root</username> with &man.su.1;.</para>
> 	      </step>
> 
> 	      <step>
>@@ -3293,7 +3293,7 @@
>           to have access to a printer in a certain group, and then name that
>           group in the <literal>rg</literal> capability.</para>
>             
>-        <para>Users outside the group (including root) will be greeted with
>+        <para>Users outside the group (including <username>root</username>) will be greeted with
>           
>           <errorname>lpr: Not a member of the restricted group</errorname>
>           
>@@ -4378,14 +4378,14 @@
> 	printer is <emphasis>started</emphasis> or the queue is
> 	cleared.</para>
> 	  
>-      <para>If a queue is <emphasis>disabled</emphasis>, no user (except root)
>+      <para>If a queue is <emphasis>disabled</emphasis>, no user (except <username>root</username>)
> 	can submit jobs for the printer.  An <emphasis>enabled</emphasis>
> 	queue allows jobs to be submitted.  A printer can be
> 	<emphasis>started</emphasis> for a disabled queue, in which case it
> 	will continue to print jobs in the queue until the queue is
> 	empty.</para>
> 	  
>-      <para>In general, you have to have root privileges to use the
>+      <para>In general, you have to have <username>root</username> privileges to use the
> 	  &man.lpc.8; command.  Ordinary users can use the &man.lpc.8; command
> 	to get printer status and to restart a hung printer only.</para>
> 
>@@ -4428,12 +4428,12 @@
> 	  <listitem>
> 	    <para>Disable queuing of new jobs.  If the printer is running, it
> 	      will continue to print any jobs remaining in the queue.  The
>-	      superuser (root) can always submit jobs, even to a disabled
>+	      superuser (<username>root</username>) can always submit jobs, even to a disabled
> 	      queue.</para>
> 		  
> 	    <para>This command is useful while you are testing a new printer
> 	      or filter installation: disable the queue and submit jobs as
>-	      root.  Other users will not be able to submit jobs until you
>+	      <username>root</username>.  Other users will not be able to submit jobs until you
> 	      complete your testing and re-enable the queue with the
> 	      <command>enable</command> command.</para>
> 	  </listitem>
>Index: handbook/serialcomms/chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml,v
>retrieving revision 1.57
>diff -u -r1.57 chapter.sgml
>--- handbook/serialcomms/chapter.sgml	2 Apr 2002 21:39:00 -0000	1.57
>+++ handbook/serialcomms/chapter.sgml	28 Apr 2002 13:57:02 -0000
>@@ -1642,7 +1642,7 @@
>       <screen>&prompt.root; <userinput>cd /dev</userinput>
> &prompt.root; <userinput>sh MAKEDEV cuaa0</userinput></screen>
> 		  
>-      <para>Or use <command>cu</command> as root with the following 
>+      <para>Or use <command>cu</command> as <username>root</username> with the following 
> 	command:</para>
>       
>       <screen>&prompt.root; <userinput>cu -l<replaceable>line</replaceable> -s<replaceable>speed</replaceable></userinput></screen>
>Index: handbook/sound/chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/sound/chapter.sgml,v
>retrieving revision 1.29
>diff -u -r1.29 chapter.sgml
>--- handbook/sound/chapter.sgml	12 Mar 2002 12:43:52 -0000	1.29
>+++ handbook/sound/chapter.sgml	28 Apr 2002 13:57:33 -0000
>@@ -236,7 +236,7 @@
> 
>     <para>If the previous command returned
>       <devicename>pcm0</devicename>, you will have to run the
>-      following as root:</para>
>+      following as <username>root</username>:</para>
> 
>     <screen>&prompt.root; cd /dev
> &prompt.root; sh MAKEDEV snd0</screen>

Actions: View | Diff

Attachments on bug 37532: 21407