diff options
| author | Gerald Carter <jerry@samba.org> | 2002-01-05 03:52:39 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-01-05 03:52:39 +0000 |
| commit | 7d3cc61d26a7787c73397f940796c9aae93da096 (patch) | |
| tree | d251be0ff2ba7d3a7b44cfc981515747197bb463 | |
| parent | 69d6c9fe1af2d85036cfbebbf3788128c6d7c5ff (diff) | |
| download | samba-7d3cc61d26a7787c73397f940796c9aae93da096.tar.gz samba-7d3cc61d26a7787c73397f940796c9aae93da096.tar.bz2 samba-7d3cc61d26a7787c73397f940796c9aae93da096.zip | |
merge from 2.2 and regenerate docs
(This used to be commit f7d900873c3553dde88d42d903b74dc49c9a6c71)
35 files changed, 182 insertions, 119 deletions
diff --git a/docs/Samba-HOWTO-Collection.pdf b/docs/Samba-HOWTO-Collection.pdf index 511edd4ed1..e68e259243 100644 --- a/docs/Samba-HOWTO-Collection.pdf +++ b/docs/Samba-HOWTO-Collection.pdf @@ -1,6 +1,6 @@ %PDF-1.2 %âãÏÓ -1 0 obj<</Producer(htmldoc 1.8.11 Copyright 1997-2001 Easy Software Products, All Rights Reserved.)/CreationDate(D:20011206071218Z)/Title(SAMBA Project Documentation)/Creator(Modular DocBook HTML Stylesheet Version 1.57)>>endobj +1 0 obj<</Producer(htmldoc 1.8.11 Copyright 1997-2001 Easy Software Products, All Rights Reserved.)/CreationDate(D:20020105033916Z)/Title(SAMBA Project Documentation)/Creator(Modular DocBook HTML Stylesheet Version 1.57)>>endobj 2 0 obj<</Type/Encoding/Differences[ 32/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quotesingle/parenleft/parenright/asterisk/plus/comma/minus/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore/grave/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde 128/Euro 130/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron/guilsinglleft/OE 145/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron/guilsinglright/oe 159/Ydieresis/space/exclamdown/cent/sterling/currency/yen/brokenbar/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]>>endobj 3 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier/Encoding 2 0 R>>endobj 4 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier-Bold/Encoding 2 0 R>>endobj @@ -2889,7 +2889,7 @@ xref 0000202565 00000 n 0000202658 00000 n trailer -<</Size 886/Root 885 0 R/Info 1 0 R/ID[<063ee28ad25d00a6b7ea666000182d51><063ee28ad25d00a6b7ea666000182d51>]>> +<</Size 886/Root 885 0 R/Info 1 0 R/ID[<71955562bbbbfce752847baaa5e75306><71955562bbbbfce752847baaa5e75306>]>> startxref 202872 %%EOF diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in index b0d445852c..83b9920535 100644 --- a/docs/docbook/Makefile.in +++ b/docs/docbook/Makefile.in @@ -34,7 +34,7 @@ MANPAGES=$(MANDIR)/findsmb.1 $(MANDIR)/smbclient.1 \ $(MANDIR)/smbmount.8 $(MANDIR)/swat.8 $(MANDIR)/rpcclient.1 \ $(MANDIR)/smbpasswd.5 $(MANDIR)/testparm.1 $(MANDIR)/samba.7 \ $(MANDIR)/smbpasswd.8 $(MANDIR)/testprns.1 \ - $(MANDIR)/smb.conf.5 $(MANDIR)/wbinfo.1 \ + $(MANDIR)/smb.conf.5 $(MANDIR)/wbinfo.1 $(MANDIR)/pdbedit.8 \ $(MANDIR)/smbcacls.1 $(MANDIR)/smbsh.1 $(MANDIR)/winbindd.8 \ $(MANDIR)/make_unicodemap.1 @@ -48,7 +48,7 @@ SGMLMANSRC=manpages/findsmb.1.sgml manpages/smbclient.1.sgml \ manpages/rpcclient.1.sgml manpages/smbpasswd.5.sgml \ manpages/testparm.1.sgml manpages/samba.7.sgml \ manpages/smbpasswd.8.sgml manpages/testprns.1.sgml \ - manpages/smb.conf.5.sgml \ + manpages/smb.conf.5.sgml manpages/pdbedit.8.sgml \ manpages/wbinfo.1.sgml manpages/smbcacls.1.sgml \ manpages/smbsh.1.sgml manpages/winbindd.8.sgml \ manpages/make_unicodemap.1.sgml @@ -58,29 +58,33 @@ HOWTOSRC=projdoc/DOMAIN_MEMBER.sgml projdoc/NT_Security.sgml \ projdoc/UNIX_INSTALL.sgml projdoc/winbind.sgml projdoc/OS2-Client-HOWTO.sgml \ projdoc/Samba-PDC-HOWTO.sgml projdoc/ENCRYPTION.sgml \ projdoc/CVS-Access.sgml projdoc/Integrating-with-Windows.sgml \ - projdoc/PAM-Authentication-And-Samba.sgml - -FAQSRC=faq/samba-pdc-faq.sgml + projdoc/PAM-Authentication-And-Samba.sgml projdoc/Samba-LDAP-HOWTO.sgml ###################################################################### # Make instructions ###################################################################### -all: HOWTO proj-doc man-all man-html-all - -man: $(MANPAGES) - -FAQ: $(FAQSRC) - @echo Building SAMBA PDC FAQ... +all: + @echo "Possible options to the Makefile include:" + @echo " all-docs - Force a rebuild of all documentation" + @echo " HOWTO - Build all individual HOWTOs in html format" + @echo " proj-doc - Build the Samba-HOWTO-Collection.[pdf|html] file" + @echo " man - Rebuild html and nroff versions of man pages as necessary" + @echo " syntax - Check the SGML/DocBook syntax of all source files" + +all-docs: HOWTO proj-doc man-all man-html-all + +syntax: $(SGMLMANSRC) projdoc/samba-doc.sgml + @echo Checking syntax of all SGML/DocBook source files... @(for i in $?; do \ - htmlfile=`echo $$i | sed 's,.*/,,' | sed "s/\.sgml/\.html/g"`; \ - echo "Making $$htmlfile"; \ - $(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl \ - -f /tmp/jade.log $$i > ../htmldocs/$$htmlfile; \ - cat /tmp/jade.log | grep -v DTDDECL; \ - /bin/rm -f /tmp/jade.log; \ + echo "$$i..."; \ + $(NSGMLS) -sv $$i 2>&1 | grep -v "DTDDECL catalog entries are not supported" ; \ done) + + + +man: $(MANPAGES) HOWTO: $(HOWTOSRC) @echo Building HOWTO pages... @@ -112,9 +116,6 @@ proj-doc: @/bin/mv -f samba-doc.html ../htmldocs/Samba-HOWTO-Collection.html - - - ## generate all HTML man pages man-html-all: $(SGMLMANSRC) @echo Building HTML formatted man pages... @@ -363,6 +364,15 @@ $(MANDIR)/winbindd.8: manpages/winbindd.8.sgml @$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"` +$(MANDIR)/pdbedit.8: manpages/pdbedit.8.sgml + @echo "Making $@" + @$(NSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl + @cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `echo $@ | sed 's,.*/,,'` + @echo "Making HTML version of $@" + @$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"` + + ## Clean Rule clean: /bin/rm -f manpage.* diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml index a7328e7cf6..9e719e1f2a 100644 --- a/docs/docbook/manpages/smb.conf.5.sgml +++ b/docs/docbook/manpages/smb.conf.5.sgml @@ -2493,7 +2493,7 @@ causes <command>smbd</command> to authenticate against another server.</para> - <para>Default: <command>encrypt passwords = no</command></para></listitem> + <para>Default: <command>encrypt passwords = yes</command></para></listitem> </varlistentry> @@ -3451,10 +3451,13 @@ <para> This option is used to control the tcp port number used to contact the <link linkend="LDAPSERVER"><parameter>ldap server</parameter></link>. - The default is to use the stand LDAP port 389. + The default is to use the stand LDAPS port 636. </para> - <para>Default : <command>ldap port = 389</command></para> + <para>See Also: <link linkend="LDAPSSL">ldap ssl</link> + </para> + + <para>Default : <command>ldap port = 636</command></para> </listitem> </varlistentry> @@ -3502,15 +3505,15 @@ <para> The <parameter>ldap ssl</parameter> can be set to one of three values: - (a) <command>on</command> - Always use SSL when contacting the - <parameter>ldap server</parameter>, (b) <command>off</command> - - Never use SSL when querying the directory, or (c) <command>start - tls</command> - Use the LDAPv3 StartTLS extended operation + (a) <constant>on</constant> - Always use SSL when contacting the + <parameter>ldap server</parameter>, (b) <constant>off</constant> - + Never use SSL when querying the directory, or (c) <constant>start_tls</constant> + - Use the LDAPv3 StartTLS extended operation (RFC2830) for communicating with the directory server. </para> - <para>Default : <command>ldap ssl = off</command></para> + <para>Default : <command>ldap ssl = on</command></para> </listitem> </varlistentry> diff --git a/docs/docbook/manpages/smbclient.1.sgml b/docs/docbook/manpages/smbclient.1.sgml index 6cc7be654a..4f36de1576 100644 --- a/docs/docbook/manpages/smbclient.1.sgml +++ b/docs/docbook/manpages/smbclient.1.sgml @@ -357,7 +357,7 @@ to read the password. </para> <para>A third option is to use a credentials file which - contains the plaintext of the username and password. This + contains the plaintext of the domain name, username and password. This option is mainly provided for scripts where the admin doesn't wish to pass the credentials on the command line or via environment variables. If this method is used, make certain that the permissions @@ -375,17 +375,19 @@ <varlistentry> <term>-A filename</term><listitem><para>This option allows - you to specify a file from which to read the username and + you to specify a file from which to read the username, domain name, and password used in the connection. The format of the file is </para> <para><programlisting> username = <value> password = <value> +domain = <value> </programlisting></para> - <para>Make certain that the permissions on the file restrict + <para>If the domain parameter is missing the current workgroup name + is used instead. Make certain that the permissions on the file restrict access from unwanted users. </para></listitem> </varlistentry> diff --git a/docs/htmldocs/nmbd.8.html b/docs/htmldocs/nmbd.8.html index ad8c7c61ab..f926e46a75 100644 --- a/docs/htmldocs/nmbd.8.html +++ b/docs/htmldocs/nmbd.8.html @@ -37,12 +37,12 @@ NAME="AEN8" ><B CLASS="COMMAND" >nmbd</B -> [-D] [-a] [-o] [-P] [-h] [-V] [-d <debug level>] [-H <lmhosts file>] [-l <log directory>] [-n <primary netbios name>] [-p <port number>] [-s <configuration file>]</P +> [-D] [-a] [-i] [-o] [-P] [-h] [-V] [-d <debug level>] [-H <lmhosts file>] [-l <log directory>] [-n <primary netbios name>] [-p <port number>] [-s <configuration file>]</P ></DIV ><DIV CLASS="REFSECT1" ><A -NAME="AEN23" +NAME="AEN24" ></A ><H2 >DESCRIPTION</H2 @@ -112,7 +112,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN40" +NAME="AEN41" ></A ><H2 >OPTIONS</H2 @@ -152,6 +152,17 @@ CLASS="COMMAND" This is the default.</P ></DD ><DT +>-i</DT +><DD +><P +>If this parameter is specified it causes the + server to run "interactively", not as a daemon, even if the + server is executed on the command line of a shell. Setting this + parameter negates the implicit deamon mode when run from the + command line. + </P +></DD +><DT >-o</DT ><DD ><P @@ -366,7 +377,7 @@ CLASS="FILENAME" ><DIV CLASS="REFSECT1" ><A -NAME="AEN125" +NAME="AEN130" ></A ><H2 >FILES</H2 @@ -513,7 +524,7 @@ CLASS="FILENAME" ><DIV CLASS="REFSECT1" ><A -NAME="AEN171" +NAME="AEN176" ></A ><H2 >SIGNALS</H2 @@ -574,7 +585,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN187" +NAME="AEN192" ></A ><H2 >VERSION</H2 @@ -585,7 +596,7 @@ NAME="AEN187" ><DIV CLASS="REFSECT1" ><A -NAME="AEN190" +NAME="AEN195" ></A ><H2 >SEE ALSO</H2 @@ -650,7 +661,7 @@ TARGET="_top" ><DIV CLASS="REFSECT1" ><A -NAME="AEN207" +NAME="AEN212" ></A ><H2 >AUTHOR</H2 diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html index f60cd595cf..3d7e0b992b 100644 --- a/docs/htmldocs/smb.conf.5.html +++ b/docs/htmldocs/smb.conf.5.html @@ -7935,7 +7935,7 @@ CLASS="COMMAND" ><P >Default: <B CLASS="COMMAND" ->encrypt passwords = no</B +>encrypt passwords = yes</B ></P ></DD ><DT @@ -9778,12 +9778,18 @@ CLASS="PARAMETER" ></TT ></A >. - The default is to use the stand LDAP port 389. + The default is to use the stand LDAPS port 636. + </P +><P +>See Also: <A +HREF="#LDAPSSL" +>ldap ssl</A +> </P ><P >Default : <B CLASS="COMMAND" ->ldap port = 389</B +>ldap port = 636</B ></P ></DD ><DT @@ -9865,30 +9871,30 @@ CLASS="PARAMETER" >ldap ssl</I ></TT > can be set to one of three values: - (a) <B -CLASS="COMMAND" ->on</B + (a) <TT +CLASS="CONSTANT" +>on</TT > - Always use SSL when contacting the <TT CLASS="PARAMETER" ><I >ldap server</I ></TT ->, (b) <B -CLASS="COMMAND" ->off</B +>, (b) <TT +CLASS="CONSTANT" +>off</TT > - - Never use SSL when querying the directory, or (c) <B -CLASS="COMMAND" ->start - tls</B -> - Use the LDAPv3 StartTLS extended operation + Never use SSL when querying the directory, or (c) <TT +CLASS="CONSTANT" +>start_tls</TT +> + - Use the LDAPv3 StartTLS extended operation (RFC2830) for communicating with the directory server. </P ><P >Default : <B CLASS="COMMAND" ->ldap ssl = off</B +>ldap ssl = on</B ></P ></DD ><DT @@ -19187,7 +19193,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN6052" +NAME="AEN6054" ></A ><H2 >WARNINGS</H2 @@ -19217,7 +19223,7 @@ TARGET="_top" ><DIV CLASS="REFSECT1" ><A -NAME="AEN6058" +NAME="AEN6060" ></A ><H2 >VERSION</H2 @@ -19228,7 +19234,7 @@ NAME="AEN6058" ><DIV CLASS="REFSECT1" ><A -NAME="AEN6061" +NAME="AEN6063" ></A ><H2 >SEE ALSO</H2 @@ -19307,7 +19313,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN6081" +NAME="AEN6083" ></A ><H2 >AUTHOR</H2 diff --git a/docs/htmldocs/smbclient.1.html b/docs/htmldocs/smbclient.1.html index 16fc134405..6c15873787 100644 --- a/docs/htmldocs/smbclient.1.html +++ b/docs/htmldocs/smbclient.1.html @@ -556,7 +556,7 @@ CLASS="ENVAR" to read the password. </P ><P >A third option is to use a credentials file which - contains the plaintext of the username and password. This + contains the plaintext of the domain name, username and password. This option is mainly provided for scripts where the admin doesn't wish to pass the credentials on the command line or via environment variables. If this method is used, make certain that the permissions @@ -589,7 +589,7 @@ CLASS="COMMAND" ><DD ><P >This option allows - you to specify a file from which to read the username and + you to specify a file from which to read the username, domain name, and password used in the connection. The format of the file is </P ><P @@ -603,13 +603,15 @@ WIDTH="90%" CLASS="PROGRAMLISTING" >username = <value> password = <value> +domain = <value> </PRE ></TD ></TR ></TABLE ></P ><P ->Make certain that the permissions on the file restrict +>If the domain parameter is missing the current workgroup name + is used instead. Make certain that the permissions on the file restrict access from unwanted users. </P ></DD ><DT diff --git a/docs/htmldocs/smbd.8.html b/docs/htmldocs/smbd.8.html index ba7116704d..bfd3440d7b 100644 --- a/docs/htmldocs/smbd.8.html +++ b/docs/htmldocs/smbd.8.html @@ -36,12 +36,12 @@ NAME="AEN8" ><B CLASS="COMMAND" >smbd</B -> [-D] [-a] [-o] [-P] [-h] [-V] [-b] [-d <debug level>] [-l <log directory>] [-p <port number>] [-O <socket option>] [-s <configuration file>]</P +> [-D] [-a] [-i] [-o] [-P] [-h] [-V] [-b] [-d <debug level>] [-l <log directory>] [-p <port number>] [-O <socket option>] [-s <configuration file>]</P ></DIV ><DIV CLASS="REFSECT1" ><A -NAME="AEN23" +NAME="AEN24" ></A ><H2 >DESCRIPTION</H2 @@ -106,7 +106,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN37" +NAME="AEN38" ></A ><H2 >OPTIONS</H2 @@ -144,6 +144,17 @@ CLASS="COMMAND" This is the default.</P ></DD ><DT +>-i</DT +><DD +><P +>If this parameter is specified it causes the + server to run "interactively", not as a daemon, even if the + server is executed on the command line of a shell. Setting this + parameter negates the implicit deamon mode when run from the + command line. + </P +></DD +><DT >-o</DT ><DD ><P @@ -343,7 +354,7 @@ CLASS="FILENAME" ><DIV CLASS="REFSECT1" ><A -NAME="AEN115" +NAME="AEN120" ></A ><H2 >FILES</H2 @@ -441,7 +452,7 @@ CLASS="FILENAME" ><DIV CLASS="REFSECT1" ><A -NAME="AEN148" +NAME="AEN153" ></A ><H2 >LIMITATIONS</H2 @@ -460,7 +471,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN152" +NAME="AEN157" ></A ><H2 >ENVIRONMENT VARIABLES</H2 @@ -491,7 +502,7 @@ CLASS="CONSTANT" ><DIV CLASS="REFSECT1" ><A -NAME="AEN161" +NAME="AEN166" ></A ><H2 >INSTALLATION</H2 @@ -613,7 +624,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN194" +NAME="AEN199" ></A ><H2 >RUNNING THE SERVER AS A DAEMON</H2 @@ -668,7 +679,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN207" +NAME="AEN212" ></A ><H2 >RUNNING THE SERVER ON REQUEST</H2 @@ -804,7 +815,7 @@ CLASS="COMPUTEROUTPUT" ><DIV CLASS="REFSECT1" ><A -NAME="AEN239" +NAME="AEN244" ></A ><H2 >PAM INTERACTION</H2 @@ -849,7 +860,7 @@ TARGET="_top" ><DIV CLASS="REFSECT1" ><A -NAME="AEN250" +NAME="AEN255" ></A ><H2 >TESTING THE INSTALLATION</H2 @@ -907,7 +918,7 @@ CLASS="FILENAME" ><DIV CLASS="REFSECT1" ><A -NAME="AEN264" +NAME="AEN269" ></A ><H2 >VERSION</H2 @@ -918,7 +929,7 @@ NAME="AEN264" ><DIV CLASS="REFSECT1" ><A -NAME="AEN267" +NAME="AEN272" ></A ><H2 >DIAGNOSTICS</H2 @@ -941,7 +952,7 @@ NAME="AEN267" ><DIV CLASS="REFSECT1" ><A -NAME="AEN272" +NAME="AEN277" ></A ><H2 >SIGNALS</H2 @@ -1006,7 +1017,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN289" +NAME="AEN294" ></A ><H2 >SEE ALSO</H2 @@ -1072,7 +1083,7 @@ TARGET="_top" ><DIV CLASS="REFSECT1" ><A -NAME="AEN306" +NAME="AEN311" ></A ><H2 >AUTHOR</H2 diff --git a/docs/manpages/findsmb.1 b/docs/manpages/findsmb.1 index 23a51a353d..634e051d30 100644 --- a/docs/manpages/findsmb.1 +++ b/docs/manpages/findsmb.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "FINDSMB" "1" "06 December 2001" "" "" +.TH "FINDSMB" "1" "04 January 2002" "" "" .SH NAME findsmb \- list info about machines that respond to SMB name queries on a subnet .SH SYNOPSIS diff --git a/docs/manpages/lmhosts.5 b/docs/manpages/lmhosts.5 index eb55aa3104..2b9ea91961 100644 --- a/docs/manpages/lmhosts.5 +++ b/docs/manpages/lmhosts.5 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "LMHOSTS" "5" "06 December 2001" "" "" +.TH "LMHOSTS" "5" "04 January 2002" "" "" .SH NAME lmhosts \- The Samba NetBIOS hosts file .SH SYNOPSIS diff --git a/docs/manpages/make_smbcodepage.1 b/docs/manpages/make_smbcodepage.1 index bb53aeb02d..dd1483f288 100644 --- a/docs/manpages/make_smbcodepage.1 +++ b/docs/manpages/make_smbcodepage.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "MAKE_SMBCODEPAGE" "1" "06 December 2001" "" "" +.TH "MAKE_SMBCODEPAGE" "1" "04 January 2002" "" "" .SH NAME make_smbcodepage \- construct a codepage file for Samba .SH SYNOPSIS diff --git a/docs/manpages/make_unicodemap.1 b/docs/manpages/make_unicodemap.1 index 93683c2708..fd96e89711 100644 --- a/docs/manpages/make_unicodemap.1 +++ b/docs/manpages/make_unicodemap.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "MAKE_UNICODEMAP" "1" "06 December 2001" "" "" +.TH "MAKE_UNICODEMAP" "1" "04 January 2002" "" "" .SH NAME make_unicodemap \- construct a unicode map file for Samba .SH SYNOPSIS diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8 index e7786549a1..928cfce6e5 100644 --- a/docs/manpages/nmbd.8 +++ b/docs/manpages/nmbd.8 @@ -3,12 +3,12 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "NMBD" "8" "06 December 2001" "" "" +.TH "NMBD" "8" "04 January 2002" "" "" .SH NAME nmbd \- NetBIOS name server to provide NetBIOS over IP naming services to clients .SH SYNOPSIS .sp -\fBnmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-o\fR ] [ \fB-P\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-d <debug level>\fR ] [ \fB-H <lmhosts file>\fR ] [ \fB-l <log directory>\fR ] [ \fB-n <primary netbios name>\fR ] [ \fB-p <port number>\fR ] [ \fB-s <configuration file>\fR ] +\fBnmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-i\fR ] [ \fB-o\fR ] [ \fB-P\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-d <debug level>\fR ] [ \fB-H <lmhosts file>\fR ] [ \fB-l <log directory>\fR ] [ \fB-n <primary netbios name>\fR ] [ \fB-p <port number>\fR ] [ \fB-s <configuration file>\fR ] .SH "DESCRIPTION" .PP This program is part of the Samba suite. @@ -61,6 +61,13 @@ If this parameter is specified, each new connection will append log messages to the log file. This is the default. .TP +\fB-i\fR +If this parameter is specified it causes the +server to run "interactively", not as a daemon, even if the +server is executed on the command line of a shell. Setting this +parameter negates the implicit deamon mode when run from the +command line. +.TP \fB-o\fR If this parameter is specified, the log files will be overwritten when opened. By default, diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1 index c607a4a72d..0913f841a6 100644 --- a/docs/manpages/nmblookup.1 +++ b/docs/manpages/nmblookup.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "NMBLOOKUP" "1" "06 December 2001" "" "" +.TH "NMBLOOKUP" "1" "04 January 2002" "" "" .SH NAME nmblookup \- NetBIOS over TCP/IP client used to lookup NetBIOS names .SH SYNOPSIS diff --git a/docs/manpages/rpcclient.1 b/docs/manpages/rpcclient.1 index a29dbe2844..3db53bc751 100644 --- a/docs/manpages/rpcclient.1 +++ b/docs/manpages/rpcclient.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "RPCCLIENT" "1" "06 December 2001" "" "" +.TH "RPCCLIENT" "1" "04 January 2002" "" "" .SH NAME rpcclient \- tool for executing client side MS-RPC functions .SH SYNOPSIS diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7 index ff16ff7c91..883452243f 100644 --- a/docs/manpages/samba.7 +++ b/docs/manpages/samba.7 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SAMBA" "7" "06 December 2001" "" "" +.TH "SAMBA" "7" "04 January 2002" "" "" .SH NAME SAMBA \- A Windows SMB/CIFS fileserver for UNIX .SH SYNOPSIS diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5 index 9d88615f3f..92ad1158f5 100644 --- a/docs/manpages/smb.conf.5 +++ b/docs/manpages/smb.conf.5 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMB.CONF" "5" "06 December 2001" "" "" +.TH "SMB.CONF" "5" "04 January 2002" "" "" .SH NAME smb.conf \- The configuration file for the Samba suite .SH "SYNOPSIS" @@ -2682,7 +2682,7 @@ and maintain this file), or set the security = [server|domain] parameter which causes \fBsmbd\fR to authenticate against another server. -Default: \fBencrypt passwords = no\fR +Default: \fBencrypt passwords = yes\fR .TP \fBenhanced browsing (G)\fR This option enables a couple of enhancements to @@ -3428,9 +3428,11 @@ under active development. This option is used to control the tcp port number used to contact the \fIldap server\fR. -The default is to use the stand LDAP port 389. +The default is to use the stand LDAPS port 636. -Default : \fBldap port = 389\fR +See Also: ldap ssl + +Default : \fBldap port = 636\fR .TP \fBldap server (G)\fR This parameter is only available if Samba has been @@ -3457,13 +3459,13 @@ Samba SSL support which is enabled by specifying the script (see \fIssl\fR). The \fIldap ssl\fR can be set to one of three values: -(a) \fBon\fR - Always use SSL when contacting the -\fIldap server\fR, (b) \fBoff\fR - -Never use SSL when querying the directory, or (c) \fBstart -tls\fR - Use the LDAPv3 StartTLS extended operation +(a) on - Always use SSL when contacting the +\fIldap server\fR, (b) off - +Never use SSL when querying the directory, or (c) start_tls +- Use the LDAPv3 StartTLS extended operation (RFC2830) for communicating with the directory server. -Default : \fBldap ssl = off\fR +Default : \fBldap ssl = on\fR .TP \fBldap suffix (G)\fR This parameter is only available if Samba has been diff --git a/docs/manpages/smbcacls.1 b/docs/manpages/smbcacls.1 index d2da694a26..022485bdcb 100644 --- a/docs/manpages/smbcacls.1 +++ b/docs/manpages/smbcacls.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMBCACLS" "1" "06 December 2001" "" "" +.TH "SMBCACLS" "1" "04 January 2002" "" "" .SH NAME smbcacls \- Set or get ACLs on an NT file or directory names .SH SYNOPSIS diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1 index 4c5ef0b3e4..5278887f0a 100644 --- a/docs/manpages/smbclient.1 +++ b/docs/manpages/smbclient.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMBCLIENT" "1" "06 December 2001" "" "" +.TH "SMBCLIENT" "1" "04 January 2002" "" "" .SH NAME smbclient \- ftp-like client to access SMB/CIFS resources on servers .SH SYNOPSIS @@ -267,7 +267,7 @@ a \fBPASSWD\fR environment variable from which to read the password. A third option is to use a credentials file which -contains the plaintext of the username and password. This +contains the plaintext of the domain name, username and password. This option is mainly provided for scripts where the admin doesn't wish to pass the credentials on the command line or via environment variables. If this method is used, make certain that the permissions @@ -283,18 +283,20 @@ it in directly. .TP \fB-A filename\fR This option allows -you to specify a file from which to read the username and +you to specify a file from which to read the username, domain name, and password used in the connection. The format of the file is .sp .nf username = <value> password = <value> +domain = <value> .sp .fi -Make certain that the permissions on the file restrict +If the domain parameter is missing the current workgroup name +is used instead. Make certain that the permissions on the file restrict access from unwanted users. .TP \fB-L\fR diff --git a/docs/manpages/smbcontrol.1 b/docs/manpages/smbcontrol.1 index 4b27119673..673c839d80 100644 --- a/docs/manpages/smbcontrol.1 +++ b/docs/manpages/smbcontrol.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMBCONTROL" "1" "06 December 2001" "" "" +.TH "SMBCONTROL" "1" "04 January 2002" "" "" .SH NAME smbcontrol \- send messages to smbd or nmbd processes .SH SYNOPSIS diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8 index a01a239e5e..9554bba6d5 100644 --- a/docs/manpages/smbd.8 +++ b/docs/manpages/smbd.8 @@ -3,12 +3,12 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMBD" "8" "20 December 2001" "" "" +.TH "SMBD" "8" "04 January 2002" "" "" .SH NAME smbd \- server to provide SMB/CIFS services to clients .SH SYNOPSIS .sp -\fBsmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-o\fR ] [ \fB-P\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-b\fR ] [ \fB-d <debug level>\fR ] [ \fB-l <log directory>\fR ] [ \fB-p <port number>\fR ] [ \fB-O <socket option>\fR ] [ \fB-s <configuration file>\fR ] +\fBsmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-i\fR ] [ \fB-o\fR ] [ \fB-P\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-b\fR ] [ \fB-d <debug level>\fR ] [ \fB-l <log directory>\fR ] [ \fB-p <port number>\fR ] [ \fB-O <socket option>\fR ] [ \fB-s <configuration file>\fR ] .SH "DESCRIPTION" .PP This program is part of the Samba suite. @@ -64,6 +64,13 @@ If this parameter is specified, each new connection will append log messages to the log file. This is the default. .TP +\fB-i\fR +If this parameter is specified it causes the +server to run "interactively", not as a daemon, even if the +server is executed on the command line of a shell. Setting this +parameter negates the implicit deamon mode when run from the +command line. +.TP \fB-o\fR If this parameter is specified, the log files will be overwritten when opened. By default, diff --git a/docs/manpages/smbmnt.8 b/docs/manpages/smbmnt.8 index bab134ef54..34c1970137 100644 --- a/docs/manpages/smbmnt.8 +++ b/docs/manpages/smbmnt.8 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMBMNT" "8" "06 December 2001" "" "" +.TH "SMBMNT" "8" "04 January 2002" "" "" .SH NAME smbmnt \- helper utility for mounting SMB filesystems .SH SYNOPSIS diff --git a/docs/manpages/smbmount.8 b/docs/manpages/smbmount.8 index 70a0911887..dcfe11e4b4 100644 --- a/docs/manpages/smbmount.8 +++ b/docs/manpages/smbmount.8 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMBMOUNT" "8" "06 December 2001" "" "" +.TH "SMBMOUNT" "8" "04 January 2002" "" "" .SH NAME smbmount \- mount an smbfs filesystem .SH SYNOPSIS diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5 index b1adf080e7..9fa964c9bb 100644 --- a/docs/manpages/smbpasswd.5 +++ b/docs/manpages/smbpasswd.5 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMBPASSWD" "5" "06 December 2001" "" "" +.TH "SMBPASSWD" "5" "04 January 2002" "" "" .SH NAME smbpasswd \- The Samba encrypted password file .SH SYNOPSIS diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8 index 8e5be46e31..151a3270ff 100644 --- a/docs/manpages/smbpasswd.8 +++ b/docs/manpages/smbpasswd.8 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMBPASSWD" "8" "06 December 2001" "" "" +.TH "SMBPASSWD" "8" "04 January 2002" "" "" .SH NAME smbpasswd \- change a user's SMB password .SH SYNOPSIS diff --git a/docs/manpages/smbsh.1 b/docs/manpages/smbsh.1 index 349853bbc7..598da181d1 100644 --- a/docs/manpages/smbsh.1 +++ b/docs/manpages/smbsh.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMBSH" "1" "06 December 2001" "" "" +.TH "SMBSH" "1" "04 January 2002" "" "" .SH NAME smbsh \- Allows access to Windows NT filesystem using UNIX commands .SH SYNOPSIS diff --git a/docs/manpages/smbspool.8 b/docs/manpages/smbspool.8 index 864ea348f2..d18f48b5ca 100644 --- a/docs/manpages/smbspool.8 +++ b/docs/manpages/smbspool.8 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMBSPOOL" "8" "06 December 2001" "" "" +.TH "SMBSPOOL" "8" "04 January 2002" "" "" .SH NAME smbspool \- send print file to an SMB printer .SH SYNOPSIS diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1 index 17c1df25e5..9147ad98e7 100644 --- a/docs/manpages/smbstatus.1 +++ b/docs/manpages/smbstatus.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMBSTATUS" "1" "06 December 2001" "" "" +.TH "SMBSTATUS" "1" "04 January 2002" "" "" .SH NAME smbstatus \- report on current Samba connections .SH SYNOPSIS diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1 index 8e70d75fd8..eb4a8b0319 100644 --- a/docs/manpages/smbtar.1 +++ b/docs/manpages/smbtar.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMBTAR" "1" "06 December 2001" "" "" +.TH "SMBTAR" "1" "04 January 2002" "" "" .SH NAME smbtar \- shell script for backing up SMB/CIFS shares directly to UNIX tape drives .SH SYNOPSIS diff --git a/docs/manpages/smbumount.8 b/docs/manpages/smbumount.8 index d20826950a..dff1dbca36 100644 --- a/docs/manpages/smbumount.8 +++ b/docs/manpages/smbumount.8 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMBUMOUNT" "8" "06 December 2001" "" "" +.TH "SMBUMOUNT" "8" "04 January 2002" "" "" .SH NAME smbumount \- smbfs umount for normal users .SH SYNOPSIS diff --git a/docs/manpages/swat.8 b/docs/manpages/swat.8 index 5e19f8705c..419eccf23a 100644 --- a/docs/manpages/swat.8 +++ b/docs/manpages/swat.8 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SWAT" "8" "06 December 2001" "" "" +.TH "SWAT" "8" "04 January 2002" "" "" .SH NAME swat \- Samba Web Administration Tool .SH SYNOPSIS diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1 index d9515eddf4..23bbe1d0c6 100644 --- a/docs/manpages/testparm.1 +++ b/docs/manpages/testparm.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "TESTPARM" "1" "06 December 2001" "" "" +.TH "TESTPARM" "1" "04 January 2002" "" "" .SH NAME testparm \- check an smb.conf configuration file for internal correctness .SH SYNOPSIS diff --git a/docs/manpages/testprns.1 b/docs/manpages/testprns.1 index fd62ed8386..8fbb41affa 100644 --- a/docs/manpages/testprns.1 +++ b/docs/manpages/testprns.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "TESTPRNS" "1" "06 December 2001" "" "" +.TH "TESTPRNS" "1" "04 January 2002" "" "" .SH NAME testprns \- check printer name for validity with smbd .SH SYNOPSIS diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1 index 63795899c8..a42a9ca31e 100644 --- a/docs/manpages/wbinfo.1 +++ b/docs/manpages/wbinfo.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "WBINFO" "1" "06 December 2001" "" "" +.TH "WBINFO" "1" "04 January 2002" "" "" .SH NAME wbinfo \- Query information from winbind daemon .SH SYNOPSIS diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8 index cfd4fa2fb2..da5988811a 100644 --- a/docs/manpages/winbindd.8 +++ b/docs/manpages/winbindd.8 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "WINBINDD" "8" "06 December 2001" "" "" +.TH "WINBINDD" "8" "04 January 2002" "" "" .SH NAME winbindd \- Name Service Switch daemon for resolving names from NT servers .SH SYNOPSIS |