diff options
Diffstat (limited to 'docs/htmldocs')
| -rw-r--r-- | docs/htmldocs/nmbd.8.html | 27 | ||||
| -rw-r--r-- | docs/htmldocs/smb.conf.5.html | 44 | ||||
| -rw-r--r-- | docs/htmldocs/smbclient.1.html | 8 | ||||
| -rw-r--r-- | docs/htmldocs/smbd.8.html | 43 |
4 files changed, 76 insertions, 46 deletions
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 |