From 3582b295f628cdb3181cf60583b340f87477ae71 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 17 Aug 2004 21:16:59 +0000 Subject: Couple of typo fixes (This used to be commit 1e49c292c8444ebbbede1dbc6625d097c8cfc2eb) --- docs/Samba-Guide/Chap04-SecureOfficeServer.xml | 8 +++++--- docs/Samba-Guide/Chap05-500UserNetwork.xml | 3 +-- docs/Samba-Guide/Chap06-MakingHappyUsers.xml | 2 +- docs/Samba-Guide/Chap07-2000UserNetwork.xml | 4 ++-- docs/Samba-Guide/Chap09-AddingUNIXClients.xml | 13 ++++++++++++- docs/smbdotconf/security/security.xml | 3 +++ docs/xslt/pretty-format.xsl | 15 +++++++++++++++ 7 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 docs/xslt/pretty-format.xsl (limited to 'docs') diff --git a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml index 7f8366c08a..5ccea8c636 100644 --- a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml +++ b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml @@ -790,7 +790,9 @@ done # Allow DNS(udp) $IPTABLES -A INPUT -i $EXTIF -p udp -dport 53 -j ACCEPT echo "Allow all connections OUT and only existing and specified ones IN" -$IPTABLES -A FORWARD -i $EXTIF -o $INTIF -m state \ +$IPTABLES -A FORWARD -i $EXTIF -o $INTIFA -m state \ + --state ESTABLISHED,RELATED -j ACCEPT +$IPTABLES -A FORWARD -i $EXTIF -o $INTIFB -m state \ --state ESTABLISHED,RELATED -j ACCEPT $IPTABLES -A FORWARD -i $INTIFA -o $EXTIF -j ACCEPT $IPTABLES -A FORWARD -i $INTIFB -o $EXTIF -j ACCEPT @@ -1503,7 +1505,7 @@ abmas.biz IN SOA sleeth1.abmas.biz. root.abmas.biz. ( 38400 ; minimum (10 hours 40 minutes) ) NS dns.abmas.biz. - MX 10 sleeth1.abmas.biz. + MX 10 mail.abmas.biz. $ORIGIN abmas.biz. sleeth1 A 192.168.1.1 sleeth2 A 192.168.2.1 @@ -1531,7 +1533,7 @@ abmas.us IN SOA server.abmas.us. root.abmas.us. ( ) NS dns.abmas.us. NS dns2.abmas.us. - MX 10 server.abmas.us. + MX 10 mail.abmas.us. $ORIGIN abmas.us. server A 123.45.67.66 dns2 A 123.45.54.32 diff --git a/docs/Samba-Guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/Chap05-500UserNetwork.xml index 5375eb99a3..640dc69dab 100644 --- a/docs/Samba-Guide/Chap05-500UserNetwork.xml +++ b/docs/Samba-Guide/Chap05-500UserNetwork.xml @@ -1059,7 +1059,6 @@ hosts: files dns wins path/apps admin usersbjordan read onlyNo -include @@ -1376,7 +1375,7 @@ abmas.us IN SOA server.abmas.us. root.abmas.us. ( ) NS dns.abmas.us. NS dns2.abmas.us. - MX 10 server.abmas.us. + MX 10 mail.abmas.us. $ORIGIN abmas.us. server A 123.45.67.66 dns2 A 123.45.54.32 diff --git a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml index 75acc22f3d..26ab2925d9 100644 --- a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml +++ b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml @@ -3729,7 +3729,7 @@ HKEY_LOCAL_MACHINE\Default\Software\Microsoft\Windows\ No. You can use any type of printer and must use the interfacing protocol supported by the printer. Many networks use LPR/LPD print servers to which are attached PCL printers, InkJet printers, plotters, and so on. At home I use a USB attached - Inject printer. Use the appropriate device URI (Universal Resource Interface) + Inkjet printer. Use the appropriate device URI (Universal Resource Interface) argument to the lpadmin -v option that is right for your printer. diff --git a/docs/Samba-Guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/Chap07-2000UserNetwork.xml index 6ad6c6e8bf..bb78494657 100644 --- a/docs/Samba-Guide/Chap07-2000UserNetwork.xml +++ b/docs/Samba-Guide/Chap07-2000UserNetwork.xml @@ -991,7 +991,7 @@ added: "cn=PIOps,ou=Groups,dc=abmas,dc=biz" (00000013) &rootprompt; rcldap start &rootprompt; chkconfig ldap on -&rootprompt; slurpd start +&rootprompt; rcslurpd start &rootprompt; chkconfig slurpd on @@ -1003,7 +1003,7 @@ added: "cn=PIOps,ou=Groups,dc=abmas,dc=biz" (00000013) smbldap-useradd.pl - On the master slave server you may now add an account to validate that replication + On the master ldap server you may now add an account to validate that replication is working. Assuming the configuration shown in Chapter 6, execute: &rootprompt; /var/lib/samba/sbin/smbldap-useradd.pl -a fruitloop diff --git a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml index 2efdde6539..dee2d9507e 100644 --- a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml +++ b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml @@ -656,12 +656,23 @@ ou: idmap The system is ready to join the Domain. Execute the following: -net rpc join -U root%not24et +&rootprompt; net rpc join -U root%not24et Joined domain MEGANET2. This indicates that the Domain join succeeded. + + wbinfo + Just joining the Domain is not quite enough, you must now provide a privilidged set + of credentials through which winbindd can interact with the ADS + Domain servers. Execute the following to implant the necessary credentials: + +&rootprompt; wbinfo --set-auth-user=Administrator%not24get + +- The configuration is now ready to obtain ADS Domain user and group information. + + You may now start Samba in the usual manner and your Samba Domain Member server is ready for use. Just add shares as required. diff --git a/docs/smbdotconf/security/security.xml b/docs/smbdotconf/security/security.xml index b029c0fa67..181bf1f028 100644 --- a/docs/smbdotconf/security/security.xml +++ b/docs/smbdotconf/security/security.xml @@ -3,6 +3,9 @@ type="enum" basic="1" advanced="1" wizard="1" developer="1" xmlns:samba="http://samba.org/common"> + + /(yes|true)/ + This option affects how clients respond to Samba and is one of the most important settings in the diff --git a/docs/xslt/pretty-format.xsl b/docs/xslt/pretty-format.xsl new file mode 100644 index 0000000000..193737dc2a --- /dev/null +++ b/docs/xslt/pretty-format.xsl @@ -0,0 +1,15 @@ + + + + + + + + + + + + + -- cgit