From 2e2a5d50eb0fcbfdab14e56d6150a1bd35d57f28 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 13 Nov 2002 15:34:49 +0000 Subject: Some more doc updates: - make - update status of docs document - move security_level to 'type of installation' part (This used to be commit 11ad39398e077c3901e63f31bcc6efb223854357) --- docs/docbook/projdoc/samba-doc.sgml | 22 ++++++++------- docs/docbook/projdoc/security_level.sgml | 46 ++++++++------------------------ 2 files changed, 23 insertions(+), 45 deletions(-) (limited to 'docs/docbook/projdoc') 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 @@ Abstract -Last Update : Thu Aug 15 12:48:45 CDT 2002 +Last Update : $Date: 2002/11/13 15:34:49 $ @@ -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 http://www.samba.org/ on the "Documentation" page. Please send updates to jerry@samba.org. +url="mailto:jerry@samba.org">jerry@samba.org or +jelmer@samba.org. @@ -69,7 +70,7 @@ Cheers, jerry - + General installation Introduction @@ -84,21 +85,23 @@ PLEASE read this. &ENCRYPTION; - + Type of installation Introduction -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. + +Samba can operate in various SMB networks. This part contains information on configuring samba +for various environments. + +&SECURITY-LEVEL; &Samba-PDC-HOWTO; &Samba-BDC-HOWTO; &ADS-HOWTO; &DOMAIN-MEMBER; - + Optional configuration Introduction @@ -110,7 +113,6 @@ part each cover one specific feature. &Samba-PAM; &MS-Dfs-Setup; &PRINTER-DRIVER2; -&SECURITY-LEVEL; &WINBIND; &pdb-mysql; &pdb-xml; @@ -121,7 +123,7 @@ part each cover one specific feature. &SPEED; - + Appendixes &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 @@ -Security levels - - -Introduction - - -Samba supports the following options to the global smb.conf parameter - - - -[global] -security = [share|user(default)|server|domain|ads] - - - -Please refer to the smb.conf man page for usage information and to the document -DOMAIN_MEMBER.html for further background details -on domain mode security. The Windows 2000 Kerberos domain security model -(security = ads) is described in the ADS-HOWTO.html. - - - -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. - - - - - -More complete description of security levels +User and Share security level (for servers not in a domain) 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. - + + +"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. + + -- cgit