diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2002-11-13 15:34:49 +0000 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2002-11-13 15:34:49 +0000 |
commit | 2e2a5d50eb0fcbfdab14e56d6150a1bd35d57f28 (patch) | |
tree | 1177f0fadeb24ccdcba740dc50523ef97d573100 /docs/docbook | |
parent | 994b3dbba2f35ddeac24b0d030eee02319b8ec40 (diff) | |
download | samba-2e2a5d50eb0fcbfdab14e56d6150a1bd35d57f28.tar.gz samba-2e2a5d50eb0fcbfdab14e56d6150a1bd35d57f28.tar.bz2 samba-2e2a5d50eb0fcbfdab14e56d6150a1bd35d57f28.zip |
Some more doc updates:
- make
- update status of docs document
- move security_level to 'type of installation' part
(This used to be commit 11ad39398e077c3901e63f31bcc6efb223854357)
Diffstat (limited to 'docs/docbook')
-rw-r--r-- | docs/docbook/projdoc/samba-doc.sgml | 22 | ||||
-rw-r--r-- | docs/docbook/projdoc/security_level.sgml | 46 |
2 files changed, 23 insertions, 45 deletions
diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml index 52fb0e7bfa..ce16405d54 100644 --- a/docs/docbook/projdoc/samba-doc.sgml +++ b/docs/docbook/projdoc/samba-doc.sgml @@ -43,7 +43,7 @@ <title>Abstract</title> <para> -<emphasis>Last Update</emphasis> : Thu Aug 15 12:48:45 CDT 2002 +<emphasis>Last Update</emphasis> : $Date: 2002/11/13 15:34:49 $ </para> <para> @@ -52,7 +52,8 @@ I try to ensure that all are current, but sometimes the is a larger job than one person can maintain. The most recent version of this document can be found at <ulink url="http://www.samba.org/">http://www.samba.org/</ulink> on the "Documentation" page. Please send updates to <ulink -url="mailto:jerry@samba.org">jerry@samba.org</ulink>. +url="mailto:jerry@samba.org">jerry@samba.org</ulink> or +<ulink url="mailto:jelmer@samba.org">jelmer@samba.org</ulink>. </para> <para> @@ -69,7 +70,7 @@ Cheers, jerry </dedication> <!-- Chapters --> -<part> +<part id="introduction"> <title>General installation</title> <partintro> <title>Introduction</title> @@ -84,21 +85,23 @@ PLEASE read this.</para> &ENCRYPTION; </part> -<part> +<part id="type"> <title>Type of installation</title> <partintro> <title>Introduction</title> -<para>This part contains information on using samba in a (NT 4 or ADS) domain. -If you wish to run samba as a domain member or DC, read the appropriate chapter in -this part.</para> +<para> +Samba can operate in various SMB networks. This part contains information on configuring samba +for various environments. +</para> </partintro> +&SECURITY-LEVEL; &Samba-PDC-HOWTO; &Samba-BDC-HOWTO; &ADS-HOWTO; &DOMAIN-MEMBER; </part> -<part> +<part id="optional"> <title>Optional configuration</title> <partintro> <title>Introduction</title> @@ -110,7 +113,6 @@ part each cover one specific feature.</para> &Samba-PAM; &MS-Dfs-Setup; &PRINTER-DRIVER2; -&SECURITY-LEVEL; &WINBIND; &pdb-mysql; &pdb-xml; @@ -121,7 +123,7 @@ part each cover one specific feature.</para> &SPEED; </part> -<part> +<part id="Appendixes"> <title>Appendixes</title> &Portability; &Other-Clients; diff --git a/docs/docbook/projdoc/security_level.sgml b/docs/docbook/projdoc/security_level.sgml index 2f9a92d872..e2d9cfbbaa 100644 --- a/docs/docbook/projdoc/security_level.sgml +++ b/docs/docbook/projdoc/security_level.sgml @@ -9,40 +9,7 @@ </author> </chapterinfo> -<title>Security levels</title> - -<sect1> -<title>Introduction</title> - -<para> -Samba supports the following options to the global smb.conf parameter -</para> - -<para><programlisting> -[global] -<ulink url="smb.conf.5.html#SECURITY"><parameter>security</parameter></ulink> = [share|user(default)|server|domain|ads] -</programlisting></para> - -<para> -Please refer to the smb.conf man page for usage information and to the document -<ulink url="DOMAIN_MEMBER.html">DOMAIN_MEMBER.html</ulink> for further background details -on domain mode security. The Windows 2000 Kerberos domain security model -(security = ads) is described in the <ulink url="ADS-HOWTO.html">ADS-HOWTO.html</ulink>. -</para> - -<para> -Of the above, "security = server" means that Samba reports to clients that -it is running in "user mode" but actually passes off all authentication -requests to another "user mode" server. This requires an additional -parameter "password server =" that points to the real authentication server. -That real authentication server can be another Samba server or can be a -Windows NT server, the later natively capable of encrypted password support. -</para> - -</sect1> - -<sect1> -<title>More complete description of security levels</title> +<title>User and Share security level (for servers not in a domain)</title> <para> A SMB server tells the client at startup what "security level" it is @@ -136,5 +103,14 @@ cryptographically impossible to translate from unix style encryption to SMB style encryption, although there are some fairly simple management schemes by which the two could be kept in sync. </para> -</sect1> + +<para> +"security = server" means that Samba reports to clients that +it is running in "user mode" but actually passes off all authentication +requests to another "user mode" server. This requires an additional +parameter "password server =" that points to the real authentication server. +That real authentication server can be another Samba server or can be a +Windows NT server, the later natively capable of encrypted password support. +</para> + </chapter> |