svn commit: samba-docs r355 - in trunk: Samba-Guide Samba-HOWTO-Collection smbdotconf/logon

jht at samba.org jht at samba.org
Wed Feb 9 21:06:50 GMT 2005


Author: jht
Date: 2005-02-09 21:06:50 +0000 (Wed, 09 Feb 2005)
New Revision: 355

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=355

Log:
Commiting Lars Mueller's patch.
Modified:
   trunk/Samba-Guide/Chap03-TheSmallOffice.xml
   trunk/Samba-Guide/Chap04-SecureOfficeServer.xml
   trunk/Samba-Guide/Chap05-500UserNetwork.xml
   trunk/Samba-HOWTO-Collection/DomainMember.xml
   trunk/Samba-HOWTO-Collection/FastStart.xml
   trunk/smbdotconf/logon/addmachinescript.xml


Changeset:
Modified: trunk/Samba-Guide/Chap03-TheSmallOffice.xml
===================================================================
--- trunk/Samba-Guide/Chap03-TheSmallOffice.xml	2005-02-07 17:54:11 UTC (rev 354)
+++ trunk/Samba-Guide/Chap03-TheSmallOffice.xml	2005-02-09 21:06:50 UTC (rev 355)
@@ -665,7 +665,7 @@
 <smbconfoption><name>delete group script</name><value>/usr/sbin/groupdel '%g'</value></smbconfoption>
 <smbconfoption><name>add user to group script</name><value>/usr/sbin/usermod -G '%g' '%u'</value></smbconfoption>
 <smbconfoption><name>add machine script</name><value>/usr/sbin/useradd \</value></smbconfoption>
-<member><parameter>-s /bin/false -d /dev/null '%u'</parameter></member>
+<member><parameter>-s /bin/false -d /var/lib/nobody '%u'</parameter></member>
 <smbconfoption><name>logon script</name><value>scripts\login.bat</value></smbconfoption>
 <smbconfoption><name>logon path</name><value> </value></smbconfoption>
 <smbconfoption><name>logon drive</name><value>X:</value></smbconfoption>
@@ -751,7 +751,7 @@
         delete group script = /usr/sbin/groupdel '%g'
         add user to group script = /usr/sbin/usermod -G '%g' '%u'
         add machine script = /usr/sbin/useradd 
-				-s /bin/false -d /dev/null '%u'
+				-s /bin/false -d /var/lib/nobody '%u'
         logon script = scripts\logon.bat
         logon path =
         logon drive = X:

Modified: trunk/Samba-Guide/Chap04-SecureOfficeServer.xml
===================================================================
--- trunk/Samba-Guide/Chap04-SecureOfficeServer.xml	2005-02-07 17:54:11 UTC (rev 354)
+++ trunk/Samba-Guide/Chap04-SecureOfficeServer.xml	2005-02-09 21:06:50 UTC (rev 355)
@@ -1924,7 +1924,7 @@
         delete group script = /usr/sbin/groupdel %g
         add user to group script = /usr/sbin/usermod -G %g %u
         add machine script = /usr/sbin/useradd \
-				-s /bin/false -d /dev/null %u
+				-s /bin/false -d /var/lib/nobody %u
         shutdown script = /var/lib/samba/scripts/shutdown.sh
         abort shutdown script = /sbin/shutdown -c
         logon script = scripts\logon.bat

Modified: trunk/Samba-Guide/Chap05-500UserNetwork.xml
===================================================================
--- trunk/Samba-Guide/Chap05-500UserNetwork.xml	2005-02-07 17:54:11 UTC (rev 354)
+++ trunk/Samba-Guide/Chap05-500UserNetwork.xml	2005-02-09 21:06:50 UTC (rev 355)
@@ -957,7 +957,7 @@
 <smbconfoption><name>add group script</name><value>/usr/sbin/groupadd '%g'</value></smbconfoption>
 <smbconfoption><name>delete group script</name><value>/usr/sbin/groupdel '%g'</value></smbconfoption>
 <smbconfoption><name>add user to group script</name><value>/usr/sbin/usermod -G '%g' '%u'</value></smbconfoption>
-<smbconfoption><name>add machine script</name><value>/usr/sbin/useradd -s /bin/false -d /dev/null '%u'</value></smbconfoption>
+<smbconfoption><name>add machine script</name><value>/usr/sbin/useradd -s /bin/false -d /var/lib/nobody '%u'</value></smbconfoption>
 <smbconfoption><name>preferred master</name><value>Yes</value></smbconfoption>
 <smbconfoption><name>wins support</name><value>Yes</value></smbconfoption>
 <smbconfoption><name>include</name><value>/etc/samba/dc-common.conf</value></smbconfoption>

Modified: trunk/Samba-HOWTO-Collection/DomainMember.xml
===================================================================
--- trunk/Samba-HOWTO-Collection/DomainMember.xml	2005-02-07 17:54:11 UTC (rev 354)
+++ trunk/Samba-HOWTO-Collection/DomainMember.xml	2005-02-09 21:06:50 UTC (rev 355)
@@ -200,7 +200,7 @@
 <indexterm><primary>useradd</primary></indexterm>
 <indexterm><primary>vipw</primary></indexterm>
 <screen>
-&rootprompt;<userinput>/usr/sbin/useradd -g machines -d /dev/null -c <replaceable>"machine nickname"</replaceable> \
+&rootprompt;<userinput>/usr/sbin/useradd -g machines -d /var/lib/nobody -c <replaceable>"machine nickname"</replaceable> \
    -s /bin/false <replaceable>machine_name</replaceable>$ </userinput>
 
 &rootprompt;<userinput>passwd -l <replaceable>machine_name</replaceable>$</userinput>
@@ -378,7 +378,7 @@
 <para><smbconfblock>
 <smbconfsection>[global]</smbconfsection>
 <smbconfcomment>&lt;...remainder of parameters...&gt;</smbconfcomment>
-<smbconfoption><name>add machine script</name><value>/usr/sbin/useradd -d /dev/null -g 100 \</value></smbconfoption>
+<smbconfoption><name>add machine script</name><value>/usr/sbin/useradd -d /var/lib/nobody -g 100 \</value></smbconfoption>
 <member><parameter>  -s /bin/false -M %u</parameter></member>
 </smbconfblock></para>
 

Modified: trunk/Samba-HOWTO-Collection/FastStart.xml
===================================================================
--- trunk/Samba-HOWTO-Collection/FastStart.xml	2005-02-07 17:54:11 UTC (rev 354)
+++ trunk/Samba-HOWTO-Collection/FastStart.xml	2005-02-09 21:06:50 UTC (rev 355)
@@ -890,7 +890,7 @@
 <smbconfoption><name>delete group script</name><value>/usr/sbin/groupdel %g</value></smbconfoption>
 <smbconfoption><name>add user to group script</name><value>/usr/sbin/usermod -G %g %u</value></smbconfoption>
 <smbconfoption><name>add machine script</name><value>/usr/sbin/useradd -s /bin/false \</value></smbconfoption>
-<member><parameter>        -d /dev/null %u</parameter></member>
+<member><parameter>        -d /var/lib/nobody %u</parameter></member>
 <smbconfcomment>Note: The following specifies the default logon script.</smbconfcomment>
 <smbconfcomment>Per user logon scripts can be specified in the user account using pdbedit </smbconfcomment>
 <smbconfoption><name>logon script</name><value>scripts\logon.bat</value></smbconfoption>

Modified: trunk/smbdotconf/logon/addmachinescript.xml
===================================================================
--- trunk/smbdotconf/logon/addmachinescript.xml	2005-02-07 17:54:11 UTC (rev 354)
+++ trunk/smbdotconf/logon/addmachinescript.xml	2005-02-09 21:06:50 UTC (rev 355)
@@ -16,5 +16,5 @@
 </description>
 
 <value type="default"/>
-<value type="example">/usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u</value>
+<value type="example">/usr/sbin/adduser -n -g machines -c Machine -d /var/lib/nobody -s /bin/false %u</value>
 </samba:parameter>



More information about the samba-cvs mailing list