diff options
Diffstat (limited to 'docs/docbook')
| -rw-r--r-- | docs/docbook/Makefile.in | 87 | ||||
| -rw-r--r-- | docs/docbook/devdoc/dev-doc.sgml | 4 | ||||
| -rw-r--r-- | docs/docbook/faq/README.NOW | 2 | ||||
| -rw-r--r-- | docs/docbook/faq/errors.sgml | 162 | ||||
| -rw-r--r-- | docs/docbook/faq/sambafaq.sgml | 35 | ||||
| -rw-r--r-- | docs/docbook/manpages/net.8.sgml | 287 | ||||
| -rw-r--r-- | docs/docbook/manpages/smb.conf.5.sgml | 269 | ||||
| -rw-r--r-- | docs/docbook/projdoc/Diagnosis.sgml | 8 | ||||
| -rw-r--r-- | docs/docbook/projdoc/Portability.sgml | 23 | ||||
| -rw-r--r-- | docs/docbook/projdoc/samba-doc.sgml | 2 | ||||
| -rw-r--r-- | docs/docbook/samba.dsl | 2 |
11 files changed, 195 insertions, 686 deletions
diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in index 1ac71e452b..c79c9008ff 100644 --- a/docs/docbook/Makefile.in +++ b/docs/docbook/Makefile.in @@ -38,15 +38,9 @@ HTMLDOC = @HTMLDOC@ SRCDIR = @srcdir@ MANDIR=../manpages HTMLDIR=../htmldocs -MANPROJDOC = manpages/ -PROJDOC = projdoc/ -DEVDOC = devdoc/ +MANSGMLDIR = manpages/ +SGMLDIR = projdoc/ PERL = @PERL@ -PSDIR = .. -PDFDIR = .. -TXTDIR = ../textdocs -FAQPROJDOC = faq/ -FAQDIR = ../faq MANPAGES=$(patsubst %,$(MANDIR)/%,$(MANPAGES_NAMES)) MANPAGES_HTML=$(patsubst %,$(HTMLDIR)/%.html,$(MANPAGES_NAMES)) @@ -61,70 +55,55 @@ all: @echo "html - Build HTML version of HOWTO Collection" @echo "htmlman - Build html version of manpages" @echo "txt - Build plain text version of HOWTO Collection" - @echo "htmlfaq - Build html version of the FAQ" - @echo "everything - Build all of the above" - -everything: manpages ps pdf html-single html htmlman txt htmlfaq - -# Global rules manpages: $(MANPAGES) -pdf: $(PDFDIR)/Samba-HOWTO-Collection.pdf ../Samba-Developers-Guide.pdf -ps: $(PSDIR)/Samba-HOWTO-Collection.ps ../Samba-Developers-Guide.ps -txt: $(TXTDIR)/Samba-HOWTO-Collection.txt $(TXTDIR)/Samba-Developers-Guide.txt +pdf: ../Samba-HOWTO-Collection.pdf ../Samba-Developers-Guide.pdf +ps: ../Samba-HOWTO-Collection.ps ../Samba-Developers-Guide.ps +txt: ../textdocs/Samba-HOWTO-Collection.txt ../textdocs/Samba-Developers-Guide.txt htmlman: $(MANPAGES_HTML) -htmlfaq: - $(DOCBOOK2HTML) -d samba.dsl -o $(FAQDIR) $(FAQPROJDOC)/sambafaq.sgml -html-single: $(HTMLDIR)/Samba-HOWTO-Collection.html $(HTMLDIR)/Samba-Developers-Guide.html +html-single: ../$(HTMLDIR)/Samba-HOWTO-Collection.html ../$(HTMLDIR)/Samba-Developers-Guide.html html: - $(DOCBOOK2HTML) -d samba.dsl -o $(HTMLDIR) $(PROJDOC)/samba-doc.sgml - -# Text files + $(DOCBOOK2HTML) -d samba.dsl -o $(HTMLDIR) projdoc/samba-doc.sgml -$(TXTDIR)/Samba-HOWTO-Collection.txt: $(PROJDOC)/samba-doc.sgml - $(DOCBOOK2TXT) -o . $< - mv ./samba-doc.txt $@ +../Samba-HOWTO-Collection.txt: $(SGMLDIR)/samba-doc.sgml + $(DOCBOOK2TXT) -o .. $< + mv ../samba-doc.txt $@ -$(TXTDIR)/Samba-Developers-Guide.txt: $(PROJDOC)/samba-doc.sgml - $(DOCBOOK2TXT) -o . $< - mv ./samba-doc.txt $@ +../Samba-Developers-Guide.txt: $(SGMLDIR)/samba-doc.sgml + $(DOCBOOK2TXT) -o .. $< + mv ../samba-doc.txt $@ -# PostScript +../Samba-HOWTO-Collection.ps: $(SGMLDIR)/samba-doc.sgml + $(DOCBOOK2PS) -o .. $< + mv ../samba-doc.ps $@ -$(PSDIR)/Samba-HOWTO-Collection.ps: $(PROJDOC)/samba-doc.sgml - $(DOCBOOK2PS) -o . $< - mv ./samba-doc.ps $@ +../Samba-Developers-Guide.ps: $(SGMLDIR)/samba-doc.sgml + $(DOCBOOK2PS) -o .. $< + mv ../samba-doc.ps $@ -$(PSDIR)/Samba-Developers-Guide.ps: $(PROJDOC)/samba-doc.sgml - $(DOCBOOK2PS) -o . $< - mv ./samba-doc.ps $@ - -# Adobe PDF files - -$(PDFDIR)/Samba-HOWTO-Collection.pdf: $(HTMLDIR)/Samba-HOWTO-Collection.html +../Samba-HOWTO-Collection.pdf: ../$(HTMLDIR)/Samba-HOWTO-Collection.html $(HTMLDOC) --book --color --links -f $@ $< -$(PDFDIR)/Samba-Developers-Guide.pdf: $(HTMLDIR)/Samba-Developers-Guide.html +../Samba-Developers-Guide.pdf: ../$(HTMLDIR)/Samba-Developers-Guide.html $(HTMLDOC) --book --color --links -f $@ $< -# Single large HTML files - -$(HTMLDIR)/Samba-HOWTO-Collection.html: $(PROJDOC)/samba-doc.sgml - $(DOCBOOK2HTML) -u -o . $< - mv ./samba-doc.html $@ +../$(HTMLDIR)/Samba-HOWTO-Collection.html: $(SGMLDIR)/samba-doc.sgml + $(DOCBOOK2HTML) -u -o .. $< + mv ../samba-doc.html $@ -$(HTMLDIR)/Samba-Developers-Guide.html: $(DEVDOC)/dev-doc.sgml - $(DOCBOOK2HTML) -u -o . $< - mv ./dev-doc.html $@ +../$(HTMLDIR)/Samba-Developers-Guide.html: devdoc/dev-doc.sgml + $(DOCBOOK2HTML) -u -o .. $< + mv ../dev-doc.html $@ -$(HTMLDIR)/%.html: $(MANPROJDOC)/%.sgml - $(DOCBOOK2HTML) -u -o $(HTMLDIR) $< +$(HTMLDIR)/%.html: $(MANSGMLDIR)/%.sgml + $(DOCBOOK2HTML) -o $(HTMLDIR) $< + mv $(HTMLDIR)/index.html $@ -$(MANDIR)/%: $(MANPROJDOC)/%.sgml - $(DOCBOOK2MAN) -o $(MANDIR) $< || rm $@ +$(MANDIR)/%: $(MANSGMLDIR)/%.sgml + $(DOCBOOK2MAN) -o $(MANDIR) $< $(PERL) scripts/strip-links.pl < $@ > $@.temp mv $@.temp $@ clean: - rm -f $(MANPAGES) $(MANPAGES_HTML) $(HTMLDIR)/*.html $(TXTDIR)/*.txt $(PSDIR)/*.ps $(PDFDIR)/*.pdf + rm -f $(MANPAGES) $(MANPAGES_HTML) ../$(HTMLDIR)/*.html ../Samba-HOWTO-Collection.p* ../Samba-Developers-Guide.p* diff --git a/docs/docbook/devdoc/dev-doc.sgml b/docs/docbook/devdoc/dev-doc.sgml index adc25e83bd..5191ddcb93 100644 --- a/docs/docbook/devdoc/dev-doc.sgml +++ b/docs/docbook/devdoc/dev-doc.sgml @@ -10,10 +10,9 @@ <!ENTITY cifsntdomain SYSTEM "cifsntdomain.sgml"> <!ENTITY printing SYSTEM "printing.sgml"> <!ENTITY wins SYSTEM "wins.sgml"> -<!ENTITY sam SYSTEM "sam.sgml"> ]> -<book id="Samba-Developers-Guide"> +<book id="Samba-Developer-Documentation"> <title>SAMBA Developers Guide</title> @@ -63,6 +62,5 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u &cifsntdomain; &printing; &wins; -&sam; </book> diff --git a/docs/docbook/faq/README.NOW b/docs/docbook/faq/README.NOW new file mode 100644 index 0000000000..77f1659a89 --- /dev/null +++ b/docs/docbook/faq/README.NOW @@ -0,0 +1,2 @@ +The files previously in this directory have been incorporated +into the Samba-HOWTO-Collection diff --git a/docs/docbook/faq/errors.sgml b/docs/docbook/faq/errors.sgml deleted file mode 100644 index 0a40011fbb..0000000000 --- a/docs/docbook/faq/errors.sgml +++ /dev/null @@ -1,162 +0,0 @@ -<chapter id="errors"> - -<title>Common errors</title> - -<sect1> -<title>Not listening for calling name</title> - -<para> -<programlisting> -Session request failed (131,129) with myname=HOBBES destname=CALVIN -Not listening for calling name -</programlisting> -</para> - -<para> -If you get this when talking to a Samba box then it means that your -global "hosts allow" or "hosts deny" settings are causing the Samba -server to refuse the connection. -</para> - -<para> -Look carefully at your "hosts allow" and "hosts deny" lines in the -global section of smb.conf. -</para> - -<para> -It can also be a problem with reverse DNS lookups not functioning -correctly, leading to the remote host identity not being able to -be confirmed, but that is less likely. -</para> -</sect1> - -<sect1> -<title>System Error 1240</title> - -<para> -System error 1240 means that the client is refusing to talk -to a non-encrypting server. Microsoft changed WinNT in service -pack 3 to refuse to connect to servers that do not support -SMB password encryption. -</para> - -<para>There are two main solutions: -<simplelist> -<member>enable SMB password encryption in Samba. See the encryption part of -the samba HOWTO Collection</member> - -<member>disable this new behaviour in NT. See the section about -Windows NT in the chapter "Portability" of the samba HOWTO collection -</member> -</simplelist> - -</sect1> - -<sect1> -<title>smbclient ignores -N !</title> - -<para> -<quote>When getting the list of shares available on a host using the command -<command>smbclient -N -L</command> -the program always prompts for the password if the server is a Samba server. -It also ignores the "-N" argument when querying some (but not all) of our -NT servers. -</quote> - -<para> -No, it does not ignore -N, it is just that your server rejected the -null password in the connection, so smbclient prompts for a password -to try again. -</para> - -<para> -To get the behaviour that you probably want use <command>smbclient -L host -U%</command> -</para> - -<para> -This will set both the username and password to null, which is -an anonymous login for SMB. Using -N would only set the password -to null, and this is not accepted as an anonymous login for most -SMB servers. -</para> - -</sect1> - -<sect1> -<title>The data on the CD-Drive I've shared seems to be corrupted!</title> - -<para> -Some OSes (notably Linux) default to auto detection of file type on -cdroms and do cr/lf translation. This is a very bad idea when use with -Samba. It causes all sorts of stuff ups. -</para> - -<para> -To overcome this problem use conv=binary when mounting the cdrom -before exporting it with Samba. -</para> - -</sect1> - -<sect1> -<title>Why can users access home directories of other users?</title> - -<para> -<quote> -We are unable to keep individual users from mapping to any other user's -home directory once they have supplied a valid password! They only need -to enter their own password. I have not found *any* method that I can -use to configure samba to enforce that only a user may map their own -home directory. -</quote> -</para> - -<para><quote> -User xyzzy can map his home directory. Once mapped user xyzzy can also map -*anyone* elses home directory! -</quote></para> - -<para> -This is not a security flaw, it is by design. Samba allows -users to have *exactly* the same access to the UNIX filesystem -as they would if they were logged onto the UNIX box, except -that it only allows such views onto the file system as are -allowed by the defined shares. -</para> - -<para> -This means that if your UNIX home directories are set up -such that one user can happily cd into another users -directory and do an ls, the UNIX security solution is to -change the UNIX file permissions on the users home directories -such that the cd and ls would be denied. -</para> - -<para> -Samba tries very hard not to second guess the UNIX administrators -security policies, and trusts the UNIX admin to set -the policies and permissions he or she desires. -</para> - -<para> -Samba does allow the setup you require when you have set the -"only user = yes" option on the share, is that you have not set the -valid users list for the share. -</para> - -<para> -Note that only user works in conjunction with the users= list, -so to get the behavior you require, add the line : -<programlisting> -users = %S -</programlisting> -this is equivalent to: -<programlisting> -valid users = %S -</programlisting> -to the definition of the [homes] share, as recommended in -the smb.conf man page. -</para> - -</sect1> -</chapter> diff --git a/docs/docbook/faq/sambafaq.sgml b/docs/docbook/faq/sambafaq.sgml deleted file mode 100644 index 0e5e146b5a..0000000000 --- a/docs/docbook/faq/sambafaq.sgml +++ /dev/null @@ -1,35 +0,0 @@ -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -<!ENTITY general SYSTEM "general.sgml"> -<!ENTITY install SYSTEM "install.sgml"> -<!ENTITY errors SYSTEM "errors.sgml"> -<!ENTITY clientapp SYSTEM "clientapp.sgml"> -<!ENTITY features SYSTEM "features.sgml"> -]> - -<book id="Samba-FAQ"> -<title>Samba FAQ</title> - -<bookinfo> - <author><surname>Samba Team</surname></author> - <pubdate>October 2002</pubdate> -</bookinfo> - -<dedication> -<para> -This is the Frequently Asked Questions (FAQ) document for -Samba, the free and very popular SMB server product. An SMB server -allows file and printer connections from clients such as Windows, -OS/2, Linux and others. Current to version 3.0. Please send any -corrections to the samba documentation mailinglist at -<ulink url="mailto:samba-doc@samba.org">samba-doc@samba.org</ulink>. -This FAQ was based on the old Samba FAQ by Dan Shearer and Paul Blackman, -and the old samba text documents which were mostly written by John Terpstra. -</para> -</dedication> - -&general; -&install; -&clientapp; -&errors; -&features; -</book> diff --git a/docs/docbook/manpages/net.8.sgml b/docs/docbook/manpages/net.8.sgml index aab9032f14..5b822ccfe6 100644 --- a/docs/docbook/manpages/net.8.sgml +++ b/docs/docbook/manpages/net.8.sgml @@ -17,25 +17,6 @@ <cmdsynopsis> <command>net</command> <arg choice="req"><ads|rap|rpc></arg> - <arg choice="opt">-h</arg> - <arg choice="opt">-w workgroup</arg> - <arg choice="opt">-W myworkgroup</arg> - <arg choice="opt">-U user</arg> - <arg choice="opt">-I ip-address</arg> - <arg choice="opt">-p port</arg> - <arg choice="opt">-n myname</arg> - <arg choice="opt">-s conffile</arg> - <arg choice="opt">-S server</arg> - <arg choice="opt">-C comment</arg> - <arg choice="opt">-M maxusers</arg> - <arg choice="opt">-F flags</arg> - <arg choice="opt">-j jobid</arg> - <arg choice="opt">-l</arg> - <arg choice="opt">-r</arg> - <arg choice="opt">-f</arg> - <arg choice="opt">-t timeout</arg> - <arg choice="opt">-P</arg> - <arg choice="opt">-D debuglevel</arg> </cmdsynopsis> </refsynopsisdiv> @@ -45,283 +26,23 @@ <para>This tool is part of the <ulink url="samba.7.html"> Samba</ulink> suite.</para> - <para>The samba net utility is meant to work just like the net utility - available for windows and DOS.</para> - </refsect1> + <refsect1> <title>OPTIONS</title> - <variablelist> - <varlistentry> - <term>-h</term> - <listitem><para> - Display summary of all available options. - - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-w target-workgroup</term> - <listitem><para> - Sets target workgroup or domain. You have to specify either this option or the IP address or the name of a server. - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-W workgroup</term> - <listitem><para> - Sets client workgroup or domain - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-U user</term> - <listitem><para> - User name to use - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-I ip-address</term> - <listitem><para> - IP address of target server to use. You have to specify either this option or a target workgroup or a target server. - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-p port</term> - <listitem><para> - Port on the target server to connect to. - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-n myname</term> - <listitem><para> - Sets name of the client. - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-s conffile</term> - <listitem><para> - Specify alternative configuration file that should be loaded. - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-S server</term> - <listitem><para> - Name of target server. You should specify either this option or a target workgroup or a target IP address. - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-C comment</term> - <listitem><para> - FIXME - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-M maxusers</term> - <listitem><para> - FIXME - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-F flags</term> - <listitem><para> - FIXME - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-j jobid</term> - <listitem><para> - FIXME - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-l</term> - <listitem><para> - FIXME - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-r</term> - <listitem><para> - FIXME - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-f</term> - <listitem><para> - FIXME - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-t timeout</term> - <listitem><para> - FIXME - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-P</term> - <listitem><para> - Make queries to the external server using the machine account of the local server. - </para></listitem> - </varlistentry> + <para></para> - <varlistentry> - <term>-D debuglevel</term> - <listitem><para>set the debuglevel. Debug level 0 is the lowest - and 100 being the highest. This should be set to 100 if you are - planning on submitting a bug report to the Samba team (see - <filename>BUGS.txt</filename>). - </para></listitem> - </varlistentry> - </variablelist> </refsect1> <refsect1> - <title>TIME</title> - - <para>The <command>NET TIME</command> command allows you to view the time on a remote server - or synchronise the time on the local server with the time on the remote server.</para> - - <variablelist> - <varlistentry> - <term></term> - <listitem><para> - Without any options, the <command>NET TIME</command> command - displays the time on the remote server. - </para></listitem> - </varlistentry> - - <varlistentry> - <term>SYSTEM</term> - <listitem><para> - Displays the time on the remote server in a format ready for /bin/date - </para></listitem> - </varlistentry> - - <varlistentry> - <term>SET</term> - <listitem><para> - Tries to set the date and time of the local server to that on - the remote server using /bin/date. - </para></listitem> - </varlistentry> - - <varlistentry> - <term>ZONE</term> - <listitem><para> - Displays the timezone in hours from GMT on the remote computer. - </para></listitem> - </varlistentry> - </variablelist> -</refsect1> - -<refsect1> - <title>RPC</title> - - <para>The <command>NET RPC</command> command allows you to do various - NT4 operations.</para> - - <variablelist> - <varlistentry> - <term>JOIN -U username[%password] [options]</term> - <listitem><para> - Join a domain with specified username and password. Password - will be prompted if none is specified.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term>JOIN [options except -U]</term> - <listitem><para> - to join a domain created in server manager - </para></listitem> - </varlistentry> - - <varlistentry> - <term>USER [misc. options] [targets]</term> - <listitem><para> - List users - </para></listitem> - </varlistentry> - - <varlistentry> - <term>USER DELETE <name> [misc options]</term> - <listitem><para> - delete specified user - </para></listitem> - </varlistentry> - - <varlistentry> - <term>USER INFO <name> [misc options]</term> - <listitem><para> - list the domain groups of the specified user - </para></listitem> - </varlistentry> - - <varlistentry> - <term>USER ADD <name> [password] [-F user flags] [misc. options</term> - <listitem><para> - Add specified user - </para></listitem> - </varlistentry> - - <varlistentry> - <term>GROUP [misc options] [targets]</term> - <listitem><para> - List user groups - </para></listitem> - </varlistentry> - - <varlistentry> - <term>GROUP DELETE <name> [misc. options] [targets]</term> - <listitem><para> - Delete specified group - </para></listitem> - </varlistentry> - - <varlistentry> - <term>GROUP ADD <name> [-C comment]</term> - <listitem><para> - Create specified group - </para></listitem> - </varlistentry> + <title>COMMANDS</title> - <varlistentry> - <term>SHARE [misc. options] [targets]</term> - <listitem><para> - enumerates all exported resources (network shares) on target server - </para></listitem> - </varlistentry> - <varlistentry> - <term>SHARE ADD <name=serverpath> [misc. options] [targets]</term> - <listitem><para> - Adds a share from a server (makes the export active) - </para></listitem> - </varlistentry> + <para></para> - <varlistentry> - <term>SHARE DELETE <sharenam</term> - <listitem><para></para></listitem> - </varlistentry> - </variablelist> </refsect1> <refsect1> diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml index 5ce8691076..c0893f1005 100644 --- a/docs/docbook/manpages/smb.conf.5.sgml +++ b/docs/docbook/manpages/smb.conf.5.sgml @@ -109,7 +109,7 @@ <computeroutput> [foo] path = /home/bar - read only = no + writeable = true </computeroutput> </screen> @@ -124,9 +124,9 @@ <computeroutput> [aprinter] path = /usr/spool/public - read only = yes - printable = yes - guest ok = yes + writeable = false + printable = true + guest ok = true </computeroutput> </screen> </refsect1> @@ -195,7 +195,7 @@ <screen> <computeroutput> [homes] - read only = no + writeable = yes </computeroutput> </screen> @@ -630,6 +630,8 @@ <listitem><para><link linkend="DISABLESPOOLSS"><parameter>disable spoolss</parameter></link></para></listitem> <listitem><para><link linkend="DISPLAYCHARSET"><parameter>display charset</parameter></link></para></listitem> <listitem><para><link linkend="DNSPROXY"><parameter>dns proxy</parameter></link></para></listitem> + <listitem><para><link linkend="DOMAINADMINGROUP"><parameter>domain admin group</parameter></link></para></listitem> + <listitem><para><link linkend="DOMAINGUESTGROUP"><parameter>domain guest group</parameter></link></para></listitem> <listitem><para><link linkend="DOMAINLOGONS"><parameter>domain logons</parameter></link></para></listitem> <listitem><para><link linkend="DOMAINMASTER"><parameter>domain master</parameter></link></para></listitem> <listitem><para><link linkend="DOSCHARSET"><parameter>dos charset</parameter></link></para></listitem> @@ -640,7 +642,6 @@ <listitem><para><link linkend="HIDELOCALUSERS"><parameter>hide local users</parameter></link></para></listitem> <listitem><para><link linkend="HIDEUNREADABLE"><parameter>hide unreadable</parameter></link></para></listitem> <listitem><para><link linkend="HIDEUNWRITEABLEFILES"><parameter>hide unwriteable files</parameter></link></para></listitem> - <listitem><para><link linkend="HIDESPECIALFILES"><parameter>hide special files</parameter></link></para></listitem> <listitem><para><link linkend="HOMEDIRMAP"><parameter>homedir map</parameter></link></para></listitem> <listitem><para><link linkend="HOSTMSDFS"><parameter>host msdfs</parameter></link></para></listitem> <listitem><para><link linkend="HOSTNAMELOOKUPS"><parameter>hostname lookups</parameter></link></para></listitem> @@ -762,7 +763,6 @@ <listitem><para><link linkend="UPDATEENCRYPTED"><parameter>update encrypted</parameter></link></para></listitem> <listitem><para><link linkend="USEMMAP"><parameter>use mmap</parameter></link></para></listitem> <listitem><para><link linkend="USERHOSTS"><parameter>use rhosts</parameter></link></para></listitem> - <listitem><para><link linkend="USESENDFILE"><parameter>use sendfile</parameter></link></para></listitem> <listitem><para><link linkend="USERNAMELEVEL"><parameter>username level</parameter></link></para></listitem> <listitem><para><link linkend="USERNAMEMAP"><parameter>username map</parameter></link></para></listitem> <listitem><para><link linkend="UTMP"><parameter>utmp</parameter></link></para></listitem> @@ -897,6 +897,7 @@ <listitem><para><link linkend="SETDIRECTORY"><parameter>set directory</parameter></link></para></listitem> <listitem><para><link linkend="SHAREMODES"><parameter>share modes</parameter></link></para></listitem> <listitem><para><link linkend="SHORTPRESERVECASE"><parameter>short preserve case</parameter></link></para></listitem> + <listitem><para><link linkend="STATUS"><parameter>status</parameter></link></para></listitem> <listitem><para><link linkend="STRICTALLOCATE"><parameter>strict allocate</parameter></link></para></listitem> <listitem><para><link linkend="STRICTLOCKING"><parameter>strict locking</parameter></link></para></listitem> <listitem><para><link linkend="STRICTSYNC"><parameter>strict sync</parameter></link></para></listitem> @@ -1397,7 +1398,7 @@ queue the lock request, and periodically attempt to obtain the lock until the timeout period expires.</para> - <para>If this parameter is set to <constant>no</constant>, then + <para>If this parameter is set to <constant>false</constant>, then Samba 2.2 will behave as previous versions of Samba would and will fail the lock request immediately if the lock range cannot be obtained.</para> @@ -1446,7 +1447,7 @@ <listitem><para>This controls whether <ulink url="smbd.8.html"> <command>smbd(8)</command></ulink> will serve a browse list to a client doing a <command>NetServerEnum</command> call. Normally - set to <constant>yes</constant>. You should never need to change + set to <constant>true</constant>. You should never need to change this.</para> <para>Default: <command>browse list = yes</command></para></listitem> @@ -2030,11 +2031,11 @@ <listitem><para>This option is used when Samba is attempting to delete a directory that contains one or more vetoed directories (see the <link linkend="VETOFILES"><parameter>veto files</parameter></link> - option). If this option is set to <constant>no</constant> (the default) then if a vetoed + option). If this option is set to <constant>false</constant> (the default) then if a vetoed directory contains any non-vetoed files or directories then the directory delete will fail. This is usually what you want.</para> - <para>If this option is set to <constant>yes</constant>, then Samba + <para>If this option is set to <constant>true</constant>, then Samba will attempt to recursively delete any files and directories within the vetoed directory. This can be useful for integration with file serving systems such as NetAtalk which create meta-files within @@ -2290,9 +2291,56 @@ </varlistentry> + + <varlistentry> + <term><anchor id="DOMAINADMINGROUP">domain admin group (G)</term> + <listitem><para>This parameter is intended as a temporary solution + to enable users to be a member of the "Domain Admins" group when + a Samba host is acting as a PDC. A complete solution will be provided + by a system for mapping Windows NT/2000 groups onto UNIX groups. + Please note that this parameter has a somewhat confusing name. It + accepts a list of usernames and of group names in standard + <filename>smb.conf</filename> notation. + </para> + + <para>See also <link linkend="DOMAINGUESTGROUP"><parameter>domain + guest group</parameter></link>, <link linkend="DOMAINLOGONS"><parameter>domain + logons</parameter></link> + </para> + + <para>Default: <emphasis>no domain administrators</emphasis></para> + <para>Example: <command>domain admin group = root @wheel</command></para> + </listitem> + </varlistentry> + + + + + <varlistentry> + <term><anchor id="DOMAINGUESTGROUP">domain guest group (G)</term> + <listitem><para>This parameter is intended as a temporary solution + to enable users to be a member of the "Domain Guests" group when + a Samba host is acting as a PDC. A complete solution will be provided + by a system for mapping Windows NT/2000 groups onto UNIX groups. + Please note that this parameter has a somewhat confusing name. It + accepts a list of usernames and of group names in standard + <filename>smb.conf</filename> notation. + </para> + + <para>See also <link linkend="DOMAINADMINGROUP"><parameter>domain + admin group</parameter></link>, <link linkend="DOMAINLOGONS"><parameter>domain + logons</parameter></link> + </para> + + <para>Default: <emphasis>no domain guests</emphasis></para> + <para>Example: <command>domain guest group = nobody @guest</command></para> + </listitem> + </varlistentry> + + <varlistentry> <term><anchor id="DOMAINLOGONS">domain logons (G)</term> - <listitem><para>If set to <constant>yes</constant>, the Samba server will serve + <listitem><para>If set to <constant>true</constant>, the Samba server will serve Windows 95/98 Domain logons for the <link linkend="WORKGROUP"> <parameter>workgroup</parameter></link> it is in. Samba 2.2 also has limited capability to act as a domain controller for Windows @@ -2430,7 +2478,7 @@ default, Samba runs with POSIX semantics and refuses to change the timestamp on a file if the user <command>smbd</command> is acting on behalf of is not the file owner. Setting this option to <constant> - yes</constant> allows DOS semantics and <ulink url="smbd.8.html">smbd</ulink> will change the file + true</constant> allows DOS semantics and <ulink url="smbd.8.html">smbd</ulink> will change the file timestamp as DOS requires.</para> <para>Default: <command>dos filetimes = no</command></para></listitem> @@ -2822,7 +2870,7 @@ caching algorithm will be used to reduce the time taken for getwd() calls. This can have a significant impact on performance, especially when the <link linkend="WIDELINKS"><parameter>wide links</parameter> - </link>parameter is set to <constant>no</constant>.</para> + </link>parameter is set to <constant>false</constant>.</para> <para>Default: <command>getwd cache = yes</command></para> </listitem> @@ -2979,20 +3027,9 @@ </varlistentry> <varlistentry> - <term><anchor id="HIDESPECIALFILES">hide special files (G)</term> - <listitem><para>This parameter prevents clients from seeing - special files such as sockets, devices and fifo's in directory - listings. - </para> - - <para>Default: <command>hide special files = no</command></para> - </listitem> - </varlistentry> - - <varlistentry> <term><anchor id="HOMEDIRMAP">homedir map (G)</term> <listitem><para>If<link linkend="NISHOMEDIR"><parameter>nis homedir - </parameter></link> is <constant>yes</constant>, and <ulink + </parameter></link> is <constant>true</constant>, and <ulink url="smbd.8.html"><command>smbd(8)</command></ulink> is also acting as a Win95/98 <parameter>logon server</parameter> then this parameter specifies the NIS (or YP) map from which the server for the user's @@ -3566,7 +3603,7 @@ oplocks</parameter></link> are supported then level2 oplocks are not granted (even if this parameter is set to <constant>yes</constant>). Note also, the <link linkend="OPLOCKS"><parameter>oplocks</parameter> - </link> parameter must be set to <constant>yes</constant> on this share in order for + </link> parameter must be set to <constant>true</constant> on this share in order for this parameter to have any effect.</para> <para>See also the <link linkend="OPLOCKS"><parameter>oplocks</parameter> @@ -3587,10 +3624,10 @@ <command>nmbd(8)</command></ulink> will produce Lanman announce broadcasts that are needed by OS/2 clients in order for them to see the Samba server in their browse list. This parameter can have three - values, <constant>yes</constant>, <constant>no</constant>, or + values, <constant>true</constant>, <constant>false</constant>, or <constant>auto</constant>. The default is <constant>auto</constant>. - If set to <constant>no</constant> Samba will never produce these - broadcasts. If set to <constant>yes</constant> Samba will produce + If set to <constant>false</constant> Samba will never produce these + broadcasts. If set to <constant>true</constant> Samba will produce Lanman announce broadcasts at a frequency set by the parameter <parameter>lm interval</parameter>. If set to <constant>auto</constant> Samba will not send Lanman announce broadcasts by default but will @@ -3645,15 +3682,15 @@ <term><anchor id="LOCALMASTER">local master (G)</term> <listitem><para>This option allows <ulink url="nmbd.8.html"><command> nmbd(8)</command></ulink> to try and become a local master browser - on a subnet. If set to <constant>no</constant> then <command> + on a subnet. If set to <constant>false</constant> then <command> nmbd</command> will not attempt to become a local master browser on a subnet and will also lose in all browsing elections. By - default this value is set to <constant>yes</constant>. Setting this value to <constant>yes</constant> doesn't + default this value is set to <constant>true</constant>. Setting this value to <constant>true</constant> doesn't mean that Samba will <emphasis>become</emphasis> the local master browser on a subnet, just that <command>nmbd</command> will <emphasis> participate</emphasis> in elections for local master browser.</para> - <para>Setting this value to <constant>no</constant> will cause <command>nmbd</command> + <para>Setting this value to <constant>false</constant> will cause <command>nmbd</command> <emphasis>never</emphasis> to become a local master browser.</para> <para>Default: <command>local master = yes</command></para> @@ -5417,7 +5454,7 @@ if the expect string is a full stop then no string is expected.</para> <para>If the <link linkend="PAMPASSWORDCHANGE"><parameter>pam - password change</parameter></link> parameter is set to <constant>yes</constant>, the chat pairs + password change</parameter></link> parameter is set to true, the chat pairs may be matched in any order, and success is determined by the PAM result, not any particular output. The \n macro is ignored for PAM conversions. </para> @@ -5479,7 +5516,7 @@ it.</para> <para><emphasis>Note</emphasis> that if the <parameter>unix - password sync</parameter> parameter is set to <constant>yes + password sync</parameter> parameter is set to <constant>true </constant> then this program is called <emphasis>AS ROOT</emphasis> before the SMB password in the <ulink url="smbpasswd.5.html">smbpasswd(5) </ulink> file is changed. If this UNIX password change fails, then @@ -5490,7 +5527,7 @@ is set this parameter <emphasis>MUST USE ABSOLUTE PATHS</emphasis> for <emphasis>ALL</emphasis> programs called, and must be examined for security implications. Note that by default <parameter>unix - password sync</parameter> is set to <constant>no</constant>.</para> + password sync</parameter> is set to <constant>false</constant>.</para> <para>See also <link linkend="UNIXPASSWORDSYNC"><parameter>unix password sync</parameter></link>.</para> @@ -5779,7 +5816,7 @@ url="nmbd.8.html">nmbd(8)</ulink> is a preferred master browser for its workgroup.</para> - <para>If this is set to <constant>yes</constant>, on startup, <command>nmbd</command> + <para>If this is set to <constant>true</constant>, on startup, <command>nmbd</command> will force an election, and it will have a slight advantage in winning the election. It is recommended that this parameter is used in conjunction with <command><link linkend="DOMAINMASTER"><parameter> @@ -5812,7 +5849,7 @@ <varlistentry> - <term><anchor id="PRELOAD">preload (G)</term> + <term><anchor id="PRELOAD">preload</term> <listitem><para>This is a list of services that you want to be automatically added to the browse lists. This is most useful for homes and printers services that would otherwise not be @@ -5953,7 +5990,7 @@ <para>Note that a printable service will ALWAYS allow writing to the service path (user privileges permitting) via the spooling - of print data. The <link linkend="READONLY"><parameter>read only + of print data. The <link linkend="WRITEABLE"><parameter>writeable </parameter></link> parameter controls only non-printing access to the resource.</para> @@ -6319,7 +6356,7 @@ <listitem><para>This is a list of users that are given read-only access to a service. If the connecting user is in this list then they will not be given write access, no matter what the <link - linkend="READONLY"><parameter>read only</parameter></link> + linkend="WRITEABLE"><parameter>writeable</parameter></link> option is set to. The list can include group names using the syntax described in the <link linkend="INVALIDUSERS"><parameter> invalid users</parameter></link> parameter.</para> @@ -6338,18 +6375,8 @@ <varlistentry> <term><anchor id="READONLY">read only (S)</term> - <listitem><para>An inverted synonym is <link linkend="WRITEABLE"> - <parameter>writeable</parameter></link>.</para> - - <para>If this parameter is <constant>yes</constant>, then users - of a service may not create or modify files in the service's - directory.</para> - - <para>Note that a printable service (<command>printable = yes</command>) - will <emphasis>ALWAYS</emphasis> allow writing to the directory - (user privileges permitting), but only via spooling operations.</para> - - <para>Default: <command>read only = yes</command></para> + <listitem><para>Note that this is an inverted synonym for <link + linkend="WRITEABLE"><parameter>writeable</parameter></link>.</para> </listitem> </varlistentry> @@ -6494,10 +6521,10 @@ <varlistentry> <term><anchor id="RESTRICTANONYMOUS">restrict anonymous (G)</term> - <listitem><para>This is a boolean parameter. If it is <constant>yes</constant>, then + <listitem><para>This is a boolean parameter. If it is <constant>true</constant>, then anonymous access to the server will be restricted, namely in the case where the server is expecting the client to send a username, - but it doesn't. Setting it to <constant>yes</constant> will force these anonymous + but it doesn't. Setting it to <constant>true</constant> will force these anonymous connections to be denied, and the client will be required to always supply a username and password when connecting. Use of this parameter is only recommended for homogeneous NT client environments.</para> @@ -6507,7 +6534,7 @@ likes to use anonymous connections when refreshing the share list, and this is a way to work around that.</para> - <para>When restrict anonymous is <constant>yes</constant>, all anonymous connections + <para>When restrict anonymous is <constant>true</constant>, all anonymous connections are denied no matter what they are for. This can effect the ability of a machine to access the Samba Primary Domain Controller to revalidate its machine account after someone else has logged on the client @@ -6811,7 +6838,7 @@ url="smbpasswd.8.html">smbpasswd(8)</ulink> has been used to add this machine into a Windows NT Domain. It expects the <link linkend="ENCRYPTPASSWORDS"><parameter>encrypted passwords</parameter> - </link> parameter to be set to <constant>yes</constant>. In this + </link> parameter to be set to <constant>true</constant>. In this mode Samba will try to validate the username/password by passing it to a Windows NT Primary or Backup Domain Controller, in exactly the same way that a Windows NT Server would do.</para> @@ -7231,6 +7258,22 @@ <varlistentry> + <term><anchor id="STATUS">status (G)</term> + <listitem><para>This enables or disables logging of connections + to a status file that <ulink url="smbstatus.1.html">smbstatus(1)</ulink> + can read.</para> + + <para>With this disabled <command>smbstatus</command> won't be able + to tell you what connections are active. You should never need to + change this parameter.</para> + + <para>Default: <command>status = yes</command></para> + </listitem> + </varlistentry> + + + + <varlistentry> <term><anchor id="STRICTALLOCATE">strict allocate (S)</term> <listitem><para>This is a boolean that controls the handling of disk space allocation in the server. When this is set to <constant>yes</constant> @@ -7314,10 +7357,10 @@ <term><anchor id="SYNCALWAYS">sync always (S)</term> <listitem><para>This is a boolean parameter that controls whether writes will always be written to stable storage before - the write call returns. If this is <constant>no</constant> then the server will be + the write call returns. If this is <constant>false</constant> then the server will be guided by the client's request in each write call (clients can set a bit indicating that a particular write should be synchronous). - If this is <constant>yes</constant> then every write will be followed by a <command>fsync() + If this is <constant>true</constant> then every write will be followed by a <command>fsync() </command> call to ensure the data is written to disk. Note that the <parameter>strict sync</parameter> parameter must be set to <constant>yes</constant> in order for this parameter to have @@ -7489,7 +7532,7 @@ <listitem><para>This boolean parameter controls whether Samba attempts to synchronize the UNIX password with the SMB password when the encrypted SMB password in the smbpasswd file is changed. - If this is set to <constant>yes</constant> the program specified in the <parameter>passwd + If this is set to <constant>true</constant> the program specified in the <parameter>passwd program</parameter>parameter is called <emphasis>AS ROOT</emphasis> - to allow the new UNIX password to be set without access to the old UNIX password (as the SMB password change code has no @@ -7579,7 +7622,7 @@ <listitem><para>This global parameter determines if the tdb internals of Samba can depend on mmap working correctly on the running system. Samba requires a coherent mmap/read-write system memory cache. Currently only HPUX does not have such a - coherent cache, and so this parameter is set to <constant>no</constant> by + coherent cache, and so this parameter is set to <constant>false</constant> by default on HPUX. On all other systems this parameter should be left alone. This parameter is provided to help the Samba developers track down problems with the tdb internal code. @@ -7594,7 +7637,7 @@ <varlistentry> <term><anchor id="USERHOSTS">use rhosts (G)</term> - <listitem><para>If this global parameter is <constant>yes</constant>, it specifies + <listitem><para>If this global parameter is <constant>true</constant>, it specifies that the UNIX user's <filename>.rhosts</filename> file in their home directory will be read to find the names of hosts and users who will be allowed access without specifying a password.</para> @@ -7743,28 +7786,28 @@ <para>If any line begins with a '#' or a ';' then it is ignored</para> - <para>If any line begins with an '!' then the processing - will stop after that line if a mapping was done by the line. - Otherwise mapping continues with every line being processed. - Using '!' is most useful when you have a wildcard mapping line + <para>If any line begins with an '!' then the processing + will stop after that line if a mapping was done by the line. + Otherwise mapping continues with every line being processed. + Using '!' is most useful when you have a wildcard mapping line later in the file.</para> - - <para>For example to map from the name <constant>admin</constant> + + <para>For example to map from the name <constant>admin</constant> or <constant>administrator</constant> to the UNIX name <constant> root</constant> you would use:</para> <para><command>root = admin administrator</command></para> - <para>Or to map anyone in the UNIX group <constant>system</constant> + <para>Or to map anyone in the UNIX group <constant>system</constant> to the UNIX name <constant>sys</constant> you would use:</para> <para><command>sys = @system</command></para> - <para>You can have as many mappings as you like in a username + <para>You can have as many mappings as you like in a username map file.</para> - - - <para>If your system supports the NIS NETGROUP option then + + + <para>If your system supports the NIS NETGROUP option then the netgroup database is checked before the <filename>/etc/group </filename> database for matching groups.</para> @@ -7773,12 +7816,12 @@ <para><command>tridge = "Andrew Tridgell"</command></para> - <para>would map the windows username "Andrew Tridgell" to the + <para>would map the windows username "Andrew Tridgell" to the unix username "tridge".</para> - <para>The following example would map mary and fred to the - unix user sys, and map the rest to guest. Note the use of the - '!' to tell Samba to stop processing if it gets a match on + <para>The following example would map mary and fred to the + unix user sys, and map the rest to guest. Note the use of the + '!' to tell Samba to stop processing if it gets a match on that line.</para> <para><programlisting> @@ -7786,20 +7829,20 @@ guest = * </programlisting></para> - <para>Note that the remapping is applied to all occurrences + <para>Note that the remapping is applied to all occurrences of usernames. Thus if you connect to \\server\fred and <constant> - fred</constant> is remapped to <constant>mary</constant> then you - will actually be connecting to \\server\mary and will need to - supply a password suitable for <constant>mary</constant> not - <constant>fred</constant>. The only exception to this is the + fred</constant> is remapped to <constant>mary</constant> then you + will actually be connecting to \\server\mary and will need to + supply a password suitable for <constant>mary</constant> not + <constant>fred</constant>. The only exception to this is the username passed to the <link linkend="PASSWORDSERVER"><parameter> - password server</parameter></link> (if you have one). The password - server will receive whatever username the client supplies without + password server</parameter></link> (if you have one). The password + server will receive whatever username the client supplies without modification.</para> - <para>Also note that no reverse mapping is done. The main effect - this has is with printing. Users who have been mapped may have - trouble deleting print jobs as PrintManager under WfWg will think + <para>Also note that no reverse mapping is done. The main effect + this has is with printing. Users who have been mapped may have + trouble deleting print jobs as PrintManager under WfWg will think they don't own the print job.</para> <para>Default: <emphasis>no username map</emphasis></para> @@ -7808,29 +7851,13 @@ </listitem> </varlistentry> - - <varlistentry> - <term><anchor id="USESENDFILE">use sendfile (S)</term> - <listitem><para>If this parameter is <constant>yes</constant>, and Samba - was built with the --with-sendfile-support option, and the underlying operating - system supports sendfile system call, then some SMB read calls (mainly ReadAndX - and ReadRaw) will use the more efficient sendfile system call for files that - are exclusively oplocked. This may make more efficient use of the system CPU's - and cause Samba to be faster. This is off by default as it's effects are unknown - as yet. - </para> - - <para>Default: <command>use sendfile = no</command></para> - </listitem> - </varlistentry> - <varlistentry> <term><anchor id="UTMP">utmp (G)</term> - <listitem><para>This boolean parameter is only available if + <listitem><para>This boolean parameter is only available if Samba has been configured and compiled with the option <command> - --with-utmp</command>. If set to <constant>yes</constant> then Samba will attempt + --with-utmp</command>. If set to <constant>true</constant> then Samba will attempt to add utmp or utmpx records (depending on the UNIX system) whenever a connection is made to a Samba server. Sites may use this to record the user connecting to a Samba share.</para> @@ -8082,7 +8109,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/ <command>getpwent()</command> and <command>endpwent()</command> group of system calls. If the <parameter>winbind enum users</parameter> parameter is - <constant>no</constant>, calls to the <command>getpwent</command> system call + false, calls to the <command>getpwent</command> system call will not return any data. </para> <para><emphasis>Warning:</emphasis> Turning off user @@ -8104,7 +8131,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/ <command>getgrent()</command> and <command>endgrent()</command> group of system calls. If the <parameter>winbind enum groups</parameter> parameter is - <constant>no</constant>, calls to the <command>getgrent()</command> system + false, calls to the <command>getgrent()</command> system call will not return any data. </para> <para><emphasis>Warning:</emphasis> Turning off group @@ -8172,7 +8199,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/ <varlistentry> <term>winbind use default domain</term> - <term><anchor id="WINBINDUSEDEFAULTDOMAIN">winbind use default domain (G)</term> + <term><anchor id="WINBINDUSEDEFAULTDOMAIN">winbind use default domain</term> <listitem><para>This parameter specifies whether the <ulink url="winbindd.8.html"> winbindd(8)</ulink> daemon should operate on users without domain component in their username. @@ -8180,9 +8207,9 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/ own domain. While this does not benifit Windows users, it makes SSH, FTP and e-mail function in a way much closer to the way they would in a native unix system.</para> - <para>Default: <command>winbind use default domain = <no> + <para>Default: <command>winbind use default domain = <falseg> </command></para> - <para>Example: <command>winbind use default domain = yes</command></para> + <para>Example: <command>winbind use default domain = true</command></para> </listitem> </varlistentry> @@ -8277,9 +8304,9 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/ <term><anchor id="WINSSUPPORT">wins support (G)</term> <listitem><para>This boolean controls if the <ulink url="nmbd.8.html"> nmbd(8)</ulink> process in Samba will act as a WINS server. You should - not set this to <constant>yes</constant> unless you have a multi-subnetted network and + not set this to <constant>true</constant> unless you have a multi-subnetted network and you wish a particular <command>nmbd</command> to be your WINS server. - Note that you should <emphasis>NEVER</emphasis> set this to <constant>yes</constant> + Note that you should <emphasis>NEVER</emphasis> set this to <constant>true</constant> on more than one machine in your network.</para> <para>Default: <command>wins support = no</command></para> @@ -8350,7 +8377,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/ <listitem><para>This is a list of users that are given read-write access to a service. If the connecting user is in this list then they will be given write access, no matter what the <link - linkend="READONLY"><parameter>read only</parameter></link> + linkend="WRITEABLE"><parameter>writeable</parameter></link> option is set to. The list can include group names using the @group syntax.</para> @@ -8388,8 +8415,8 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/ <varlistentry> <term><anchor id="WRITEOK">write ok (S)</term> - <listitem><para>Inverted synonym for <link linkend="READONLY"><parameter> - read only</parameter></link>.</para> + <listitem><para>Synonym for <link linkend="WRITEABLE"><parameter> + writeable</parameter></link>.</para> </listitem> </varlistentry> @@ -8409,8 +8436,18 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/ <varlistentry> <term><anchor id="WRITEABLE">writeable (S)</term> - <listitem><para>Inverted synonym for <link linkend="READONLY"><parameter> - read only</parameter></link>.</para> + <listitem><para>An inverted synonym is <link linkend="READONLY"> + <parameter>read only</parameter></link>.</para> + + <para>If this parameter is <constant>no</constant>, then users + of a service may not create or modify files in the service's + directory.</para> + + <para>Note that a printable service (<command>printable = yes</command>) + will <emphasis>ALWAYS</emphasis> allow writing to the directory + (user privileges permitting), but only via spooling operations.</para> + + <para>Default: <command>writeable = no</command></para> </listitem> </varlistentry> diff --git a/docs/docbook/projdoc/Diagnosis.sgml b/docs/docbook/projdoc/Diagnosis.sgml index 3cc0bab5d5..20b2ccee08 100644 --- a/docs/docbook/projdoc/Diagnosis.sgml +++ b/docs/docbook/projdoc/Diagnosis.sgml @@ -443,13 +443,7 @@ It's also possible that the server can't work out what user name to connect you as. To see if this is the problem add the line "user = USERNAME" to the [tmp] section of smb.conf where "USERNAME" is the username corresponding to the password you typed. If you find this -fixes things you may need the username mapping option. -</para> - -<para> -It might also be the case that your client only sends encrypted passwords -and you have <command>encrypt passwords = no</command> in <filename>smb.conf</filename>. -Turn it back on to fix. +fixes things you may need the username mapping option. </para> </sect2> diff --git a/docs/docbook/projdoc/Portability.sgml b/docs/docbook/projdoc/Portability.sgml index 88527cbe62..f2fe66b9dd 100644 --- a/docs/docbook/projdoc/Portability.sgml +++ b/docs/docbook/projdoc/Portability.sgml @@ -145,27 +145,4 @@ You should then remove the line: <para>from the DNIX section of <filename>includes.h</filename></para> </sect1> - -<sect1> -<title>RedHat Linux Rembrandt-II</title> - -<para> -By default RedHat Rembrandt-II during installation adds an -entry to /etc/hosts as follows: -<programlisting> - 127.0.0.1 loopback "hostname"."domainname" -</programlisting> -</para> - -<para> -This causes Samba to loop back onto the loopback interface. -The result is that Samba fails to communicate correctly with -the world and therefor may fail to correctly negotiate who -is the master browse list holder and who is the master browser. -</para> - -<para> -Corrective Action: Delete the entry after the word loopback - in the line starting 127.0.0.1 -</para> </chapter> diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml index 6fb77750e7..75c5c379d3 100644 --- a/docs/docbook/projdoc/samba-doc.sgml +++ b/docs/docbook/projdoc/samba-doc.sgml @@ -21,7 +21,6 @@ <!ENTITY GROUP-MAPPING-HOWTO SYSTEM "GROUP-MAPPING-HOWTO.sgml"> <!ENTITY Portability SYSTEM "Portability.sgml"> <!ENTITY Other-Clients SYSTEM "Other-Clients.sgml"> -<!ENTITY ADS-HOWTO SYSTEM "ADS-HOWTO.sgml"> ]> <book id="Samba-Project-Documentation"> @@ -79,7 +78,6 @@ Cheers, jerry &Samba-PDC-HOWTO; &Samba-BDC-HOWTO; &Samba-LDAP; -&ADS-HOWTO; &BROWSING; &SPEED; &Other-Clients; diff --git a/docs/docbook/samba.dsl b/docs/docbook/samba.dsl index 7c530ce424..80197dfa77 100644 --- a/docs/docbook/samba.dsl +++ b/docs/docbook/samba.dsl @@ -34,7 +34,6 @@ (normalize "reference") (normalize "refentry") (normalize "part") -; We would like to split up in chapters, not in sect1's... ; (normalize "sect1") (normalize "section") (normalize "book") ;; just in case nothing else matches... @@ -45,6 +44,7 @@ (define %section-autolabel% #t) (define (toc-depth nd) 3) +(define %root-filename% "Samba-HOWTO") ;; name for the root html file (define %html-ext% ".html") ;; default extension for html output files (define %html-prefix% "") ;; prefix for all filenames generated (except root) (define %use-id-as-filename% #t) |