From 6d4b58f622aed99b61813b1bc90b8a07edf5d83c Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 27 May 2003 14:17:29 +0000 Subject: Add titles to tables (This used to be commit d62d7ba46fdd5c9cf559cb8562f7eeac8023796d) --- docs/docbook/projdoc/AccessControls.xml | 2 +- docs/docbook/projdoc/DOMAIN_MEMBER.xml | 2 +- docs/docbook/projdoc/NetworkBrowsing.xml | 12 +- .../projdoc/PAM-Authentication-And-Samba.xml | 3 +- docs/docbook/projdoc/passdb.xml | 123 +++++++++++---------- docs/docbook/projdoc/printer_driver2.xml | 3 +- 6 files changed, 77 insertions(+), 68 deletions(-) (limited to 'docs/docbook') diff --git a/docs/docbook/projdoc/AccessControls.xml b/docs/docbook/projdoc/AccessControls.xml index 661cc1ca86..6140077061 100644 --- a/docs/docbook/projdoc/AccessControls.xml +++ b/docs/docbook/projdoc/AccessControls.xml @@ -258,7 +258,7 @@ at how Samba helps to bridge the differences. There are three basic operations for managing directories, create, delete, rename. - +
Managing directories with unix and windows diff --git a/docs/docbook/projdoc/DOMAIN_MEMBER.xml b/docs/docbook/projdoc/DOMAIN_MEMBER.xml index 3042f704a8..5abb248327 100644 --- a/docs/docbook/projdoc/DOMAIN_MEMBER.xml +++ b/docs/docbook/projdoc/DOMAIN_MEMBER.xml @@ -453,7 +453,7 @@ to be fully trusted by it. Joining an NT4 type Domain with Samba-3 -
Assumptions +
Assumptions NetBIOS name:SERV1 diff --git a/docs/docbook/projdoc/NetworkBrowsing.xml b/docs/docbook/projdoc/NetworkBrowsing.xml index c698756ee5..70e4210443 100644 --- a/docs/docbook/projdoc/NetworkBrowsing.xml +++ b/docs/docbook/projdoc/NetworkBrowsing.xml @@ -1315,7 +1315,8 @@ you looked in it on a particular network right now). -
+
+ Browse subnet example 1 SubnetBrowse MasterList @@ -1357,7 +1358,8 @@ are done the browse lists look like : -
+
+ Browse subnet example 2 SubnetBrowse MasterList @@ -1390,7 +1392,8 @@ the browse lists look like. -
+
+ Browse subnet example 3 SubnetBrowse MasterList @@ -1421,7 +1424,8 @@ are removed or shut off) the browse lists will look like : -
+
+ Browse subnet example 4 SubnetBrowse MasterList diff --git a/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml b/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml index 08df14ea73..f74c8b1606 100644 --- a/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml +++ b/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml @@ -222,7 +222,8 @@ recommended that you use pam_winbind instead. Options recognized by this module are as follows: -
+
+ Options recognized by pam_mkpass debuglog more debugging info diff --git a/docs/docbook/projdoc/passdb.xml b/docs/docbook/projdoc/passdb.xml index 5dfc5fb70d..e17f56ba30 100644 --- a/docs/docbook/projdoc/passdb.xml +++ b/docs/docbook/projdoc/passdb.xml @@ -147,16 +147,14 @@ Samba-3 introduces the following new password backend capabilities: Allows the account and password data to be stored in an XML format - data file. This backend is NOT recommended for normal operation, it is - provided for developmental and for experimental use only. We recognise - that this will not stop some people from using it anyhow, it should work - but is NOT officially supported at this time (and likely will not be - at any time). + data file. This backend can not be used for normal operation, it can only + be used in conjunction with pdbedit's pdb2pdb + functionality. The DTD that is used might be subject to changes in the future. The xmlsam option can be useful for account migration between database - backends. Use of this tool will allow the data to be edited before migration + backends or backups. Use of this tool will allow the data to be edited before migration into another backend format. @@ -171,15 +169,6 @@ Samba-3 introduces the following new password backend capabilities: - plugin: - - - This option allows any external non-Samba backend to interface directly - to the samba code. This facility will allow third part vendors to provide - a proprietary backend to Samba-3. - - - @@ -1069,7 +1058,9 @@ access to attrs=lmPassword,ntPassword The sambaAccount objectclass is composed of the following attributes: -
+ +
+ Attributes in the sambaAccount objectclass (LDAP) lmPasswordthe LANMAN password 16-byte hash stored as a character @@ -1128,6 +1119,7 @@ access to attrs=lmPassword,ntPassword domaindomain the user is part of.
+ The majority of these parameters are only used when Samba is acting as a PDC of @@ -1286,9 +1278,7 @@ access to attrs=lmPassword,ntPassword for the column names) or use the default table. The file examples/pdb/mysql/mysql.dump contains the correct queries to create the required tables. Use the command : - - $ mysql -uusername -hhostname -ppassword databasename > /path/to/samba/examples/pdb/mysql/mysql.dump - + $ mysql -uusername -hhostname -ppassword databasename > /path/to/samba/examples/pdb/mysql/mysql.dump @@ -1314,14 +1304,22 @@ access to attrs=lmPassword,ntPassword - - identifier:mysql host - host name, defaults to 'localhost' - identifier:mysql password - identifier:mysql user - defaults to 'samba' - identifier:mysql database - defaults to 'samba' - identifier:mysql port - defaults to 3306 - identifier:table - Name of the table containing users - : + + Basic smb.conf options for MySQL passdb backend + + + FieldContents + + + identifier:mysql hosthost name, defaults to 'localhost' + identifier:mysql password + identifier:mysql userdefaults to 'samba' + identifier:mysql databasedefaults to 'samba' + identifier:mysql portdefaults to 3306 + identifier:tableName of the table containing users + + +
@@ -1336,39 +1334,44 @@ access to attrs=lmPassword,ntPassword Names of the columns in this table(I've added column types those columns should have first): - - identifier:logon time column - int(9) - identifier:logoff time column - int(9) - identifier:kickoff time column - int(9) - identifier:pass last set time column - int(9) - identifier:pass can change time column - int(9) - identifier:pass must change time column - int(9) - identifier:username column - varchar(255) - unix username - identifier:domain column - varchar(255) - NT domain user is part of - identifier:nt username column - varchar(255) - NT username - identifier:fullname column - varchar(255) - Full name of user - identifier:home dir column - varchar(255) - Unix homedir path - identifier:dir drive column - varchar(2) - Directory drive path (eg: 'H:') - identifier:logon script column - varchar(255) - - Batch file to run on client side when logging on - identifier:profile path column - varchar(255) - Path of profile - identifier:acct desc column - varchar(255) - Some ASCII NT user data - identifier:workstations column - varchar(255) - - Workstations user can logon to (or NULL for all) - identifier:unknown string column - varchar(255) - unknown string - identifier:munged dial column - varchar(255) - ? - identifier:user sid column - varchar(255) - NT user SID - identifier:group sid column - varchar(255) - NT group ID - identifier:lanman pass column - varchar(255) - encrypted lanman password - identifier:nt pass column - varchar(255) - encrypted nt passwd - identifier:plain pass column - varchar(255) - plaintext password - identifier:acct control column - int(9) - nt user data - identifier:unknown 3 column - int(9) - unknown - identifier:logon divs column - int(9) - ? - identifier:hours len column - int(9) - ? - identifier:unknown 5 column - int(9) - unknown - identifier:unknown 6 column - int(9) - unknown - + + MySQL field names for MySQL passdb backend + + + FieldTypeContents + + + identifier:logon time columnint(9) + identifier:logoff time columnint(9) + identifier:kickoff time columnint(9) + identifier:pass last set time columnint(9) + identifier:pass can change time columnint(9) + identifier:pass must change time columnint(9) + identifier:username columnvarchar(255)unix username + identifier:domain columnvarchar(255)NT domain user is part of + identifier:nt username columnvarchar(255)NT username + identifier:fullname columnvarchar(255)Full name of user + identifier:home dir columnvarchar(255)Unix homedir path + identifier:dir drive columnvarchar(2)Directory drive path (eg: 'H:') + identifier:logon script columnvarchar(255)Batch file to run on client side when logging on + identifier:profile path columnvarchar(255)Path of profile + identifier:acct desc columnvarchar(255)Some ASCII NT user data + identifier:workstations columnvarchar(255)Workstations user can logon to (or NULL for all) + identifier:unknown string columnvarchar(255)unknown string + identifier:munged dial columnvarchar(255)? + identifier:user sid columnvarchar(255)NT user SID + identifier:group sid columnvarchar(255)NT group ID + identifier:lanman pass columnvarchar(255)encrypted lanman password + identifier:nt pass columnvarchar(255)encrypted nt passwd + identifier:plain pass columnvarchar(255)plaintext password + identifier:acct control columnint(9)nt user data + identifier:unknown 3 columnint(9)unknown + identifier:logon divs columnint(9)? + identifier:hours len columnint(9)? + identifier:unknown 5 columnint(9)unknown + identifier:unknown 6 columnint(9)unknown + +
diff --git a/docs/docbook/projdoc/printer_driver2.xml b/docs/docbook/projdoc/printer_driver2.xml index 028c6cc1e6..b081053a12 100644 --- a/docs/docbook/projdoc/printer_driver2.xml +++ b/docs/docbook/projdoc/printer_driver2.xml @@ -839,7 +839,8 @@ to extend the printcap to multiple lines. Here are some examples of printcap files: - +
+ Example printcap files prjust printer name -- cgit