summaryrefslogtreecommitdiff
path: root/docs/docbook
diff options
context:
space:
mode:
Diffstat (limited to 'docs/docbook')
-rw-r--r--docs/docbook/projdoc/AccessControls.xml2
-rw-r--r--docs/docbook/projdoc/DOMAIN_MEMBER.xml2
-rw-r--r--docs/docbook/projdoc/NetworkBrowsing.xml12
-rw-r--r--docs/docbook/projdoc/PAM-Authentication-And-Samba.xml3
-rw-r--r--docs/docbook/projdoc/passdb.xml123
-rw-r--r--docs/docbook/projdoc/printer_driver2.xml3
6 files changed, 77 insertions, 68 deletions
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.
<para>
There are three basic operations for managing directories, <command>create, delete, rename</command>.
- <table>
+ <table frame="all">
<title>Managing directories with unix and windows</title>
<tgroup align="center" cols="3">
<thead>
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.
<title>Joining an NT4 type Domain with Samba-3</title>
<para>
-<table><title>Assumptions</title>
+ <table frame="all"><title>Assumptions</title>
<tgroup align="left" cols="2">
<tbody>
<row><entry>NetBIOS name:</entry><entry>SERV1</entry></row>
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).
</para>
<para>
-<table>
+<table frame="all">
+ <title>Browse subnet example 1</title>
<tgroup align="left" cols="3">
<thead>
<row><entry>Subnet</entry><entry>Browse Master</entry><entry>List</entry></row>
@@ -1357,7 +1358,8 @@ are done the browse lists look like :
</para>
<para>
-<table>
+<table frame="all">
+ <title>Browse subnet example 2</title>
<tgroup align="left" cols="3">
<thead>
<row><entry>Subnet</entry><entry>Browse Master</entry><entry>List</entry></row>
@@ -1390,7 +1392,8 @@ the browse lists look like.
</para>
<para>
-<table>
+<table frame="all">
+ <title>Browse subnet example 3</title>
<tgroup cols="3" align="left">
<thead>
<row><entry>Subnet</entry><entry>Browse Master</entry><entry>List</entry></row>
@@ -1421,7 +1424,8 @@ are removed or shut off) the browse lists will look like :
</para>
<para>
-<table>
+<table frame="all">
+ <title>Browse subnet example 4</title>
<tgroup cols="3" align="left">
<thead>
<row><entry>Subnet</entry><entry>Browse Master</entry><entry>List</entry></row>
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.
<para>
Options recognized by this module are as follows:
-<table>
+<table frame="all">
+ <title>Options recognized by pam_mkpass</title>
<tgroup cols="2" align="left">
<tbody>
<row><entry>debug</entry><entry>log more debugging info</entry></row>
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:
<listitem>
<para>
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 <command>pdbedit</command>'s pdb2pdb
+ functionality. The DTD that is used might be subject to changes in the future.
</para>
<para>
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.
</para>
</listitem>
@@ -171,15 +169,6 @@ Samba-3 introduces the following new password backend capabilities:
</listitem>
</varlistentry>
- <varlistentry><term>plugin:</term>
- <listitem>
- <para>
- 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.
- </para>
- </listitem>
- </varlistentry>
</variablelist>
</sect1>
@@ -1069,7 +1058,9 @@ access to attrs=lmPassword,ntPassword
The sambaAccount objectclass is composed of the following attributes:
</para>
- <table>
+ <para>
+ <table frame="all">
+ <title>Attributes in the sambaAccount objectclass (LDAP)</title>
<tgroup cols="2" align="left">
<tbody>
<row><entry><constant>lmPassword</constant></entry><entry>the LANMAN password 16-byte hash stored as a character
@@ -1128,6 +1119,7 @@ access to attrs=lmPassword,ntPassword
<row><entry><constant>domain</constant></entry><entry>domain the user is part of.</entry></row>
</tbody>
</tgroup></table>
+ </para>
<para>
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 <filename>examples/pdb/mysql/mysql.dump</filename>
contains the correct queries to create the required tables. Use the command :
- <screen>
- <prompt>$ </prompt><userinput>mysql -u<replaceable>username</replaceable> -h<replaceable>hostname</replaceable> -p<replaceable>password</replaceable> <replaceable>databasename</replaceable> &gt; <filename>/path/to/samba/examples/pdb/mysql/mysql.dump</filename></userinput>
- </screen>
+ <screen><prompt>$ </prompt><userinput>mysql -u<replaceable>username</replaceable> -h<replaceable>hostname</replaceable> -p<replaceable>password</replaceable> <replaceable>databasename</replaceable> &gt; <filename>/path/to/samba/examples/pdb/mysql/mysql.dump</filename></userinput></screen>
</para>
</sect3>
@@ -1314,14 +1304,22 @@ access to attrs=lmPassword,ntPassword
</para>
<para>
- <programlisting>
- 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
- : </programlisting>
+ <table frame="all">
+ <title>Basic smb.conf options for MySQL passdb backend</title>
+ <tgroup cols="2" align="left">
+ <thead>
+ <row><entry>Field</entry><entry>Contents</entry></row>
+ </thead>
+ <tbody>
+ <row><entry>identifier:mysql host</entry><entry>host name, defaults to 'localhost'</entry></row>
+ <row><entry>identifier:mysql password</entry><entry></entry></row>
+ <row><entry>identifier:mysql user</entry><entry>defaults to 'samba'</entry></row>
+ <row><entry>identifier:mysql database</entry><entry>defaults to 'samba'</entry></row>
+ <row><entry>identifier:mysql port</entry><entry>defaults to 3306</entry></row>
+ <row><entry>identifier:table</entry><entry>Name of the table containing users</entry></row>
+ </tbody>
+ </tgroup>
+ </table>
</para>
<warning>
@@ -1336,39 +1334,44 @@ access to attrs=lmPassword,ntPassword
<para>Names of the columns in this table(I've added column types those columns should have first):</para>
<para>
- <programlisting>
- 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
- </programlisting>
+ <table frame="all">
+ <title>MySQL field names for MySQL passdb backend</title>
+ <tgroup cols="3" align="left">
+ <thead>
+ <row><entry>Field</entry><entry>Type</entry><entry>Contents</entry></row>
+ </thead>
+ <tbody>
+ <row><entry>identifier:logon time column</entry><entry>int(9)</entry><entry></entry></row>
+ <row><entry>identifier:logoff time column</entry><entry>int(9)</entry><entry></entry></row>
+ <row><entry>identifier:kickoff time column</entry><entry>int(9)</entry><entry></entry></row>
+ <row><entry>identifier:pass last set time column</entry><entry>int(9)</entry><entry></entry></row>
+ <row><entry>identifier:pass can change time column</entry><entry>int(9)</entry><entry></entry></row>
+ <row><entry>identifier:pass must change time column</entry><entry>int(9)</entry><entry></entry></row>
+ <row><entry>identifier:username column</entry><entry>varchar(255)</entry><entry>unix username</entry></row>
+ <row><entry>identifier:domain column</entry><entry>varchar(255)</entry><entry>NT domain user is part of</entry></row>
+ <row><entry>identifier:nt username column</entry><entry>varchar(255)</entry><entry>NT username</entry></row>
+ <row><entry>identifier:fullname column</entry><entry>varchar(255)</entry><entry>Full name of user</entry></row>
+ <row><entry>identifier:home dir column</entry><entry>varchar(255)</entry><entry>Unix homedir path</entry></row>
+ <row><entry>identifier:dir drive column</entry><entry>varchar(2)</entry><entry>Directory drive path (eg: 'H:')</entry></row>
+ <row><entry>identifier:logon script column</entry><entry>varchar(255)</entry><entry>Batch file to run on client side when logging on</entry></row>
+ <row><entry>identifier:profile path column</entry><entry>varchar(255)</entry><entry>Path of profile</entry></row>
+ <row><entry>identifier:acct desc column</entry><entry>varchar(255)</entry><entry>Some ASCII NT user data</entry></row>
+ <row><entry>identifier:workstations column</entry><entry>varchar(255)</entry><entry>Workstations user can logon to (or NULL for all)</entry></row>
+ <row><entry>identifier:unknown string column</entry><entry>varchar(255)</entry><entry>unknown string</entry></row>
+ <row><entry>identifier:munged dial column</entry><entry>varchar(255)</entry><entry>?</entry></row>
+ <row><entry>identifier:user sid column</entry><entry>varchar(255)</entry><entry>NT user SID</entry></row>
+ <row><entry>identifier:group sid column</entry><entry>varchar(255)</entry><entry>NT group ID</entry></row>
+ <row><entry>identifier:lanman pass column</entry><entry>varchar(255)</entry><entry>encrypted lanman password</entry></row>
+ <row><entry>identifier:nt pass column</entry><entry>varchar(255)</entry><entry>encrypted nt passwd</entry></row>
+ <row><entry>identifier:plain pass column</entry><entry>varchar(255)</entry><entry>plaintext password</entry></row>
+ <row><entry>identifier:acct control column</entry><entry>int(9)</entry><entry>nt user data</entry></row>
+ <row><entry>identifier:unknown 3 column</entry><entry>int(9)</entry><entry>unknown</entry></row>
+ <row><entry>identifier:logon divs column</entry><entry>int(9)</entry><entry>?</entry></row>
+ <row><entry>identifier:hours len column</entry><entry>int(9)</entry><entry>?</entry></row>
+ <row><entry>identifier:unknown 5 column</entry><entry>int(9)</entry><entry>unknown</entry></row>
+ <row><entry>identifier:unknown 6 column</entry><entry>int(9)</entry><entry>unknown</entry></row>
+ </tbody></tgroup>
+ </table>
</para>
<para>
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:
</para>
-<table>
+<table frame="all">
+ <title>Example printcap files</title>
<tgroup cols="2" align="left">
<tbody>
<row><entry><programlisting>pr</programlisting></entry><entry>just printer name</entry></row>
generated by cgit (git 2.34.1) at 2024-11-28 07:07:09 +0000