summaryrefslogtreecommitdiff
path: root/docs/docbook
diff options
context:
space:
mode:
Diffstat (limited to 'docs/docbook')
-rwxr-xr-xdocs/docbook/configure13
-rw-r--r--docs/docbook/configure.in10
-rw-r--r--docs/docbook/devdoc/Tracing.sgml7
-rw-r--r--docs/docbook/devdoc/architecture.sgml53
-rw-r--r--docs/docbook/devdoc/dev-doc.sgml8
-rw-r--r--docs/docbook/devdoc/encryption.sgml11
-rw-r--r--docs/docbook/devdoc/gencache.sgml117
-rw-r--r--docs/docbook/devdoc/modules.sgml150
-rw-r--r--docs/docbook/devdoc/packagers.sgml38
-rw-r--r--docs/docbook/devdoc/printing.sgml4
-rw-r--r--docs/docbook/devdoc/rpc_plugin.sgml77
-rw-r--r--docs/docbook/devdoc/sam.sgml3
-rw-r--r--docs/docbook/devdoc/unix-smb.sgml4
-rw-r--r--docs/docbook/devdoc/wins.sgml4
-rw-r--r--docs/docbook/faq/clientapp.sgml24
-rw-r--r--docs/docbook/faq/config.sgml28
-rw-r--r--docs/docbook/faq/errors.sgml4
-rw-r--r--docs/docbook/faq/features.sgml6
-rw-r--r--docs/docbook/faq/general.sgml43
-rw-r--r--docs/docbook/faq/install.sgml4
-rw-r--r--docs/docbook/faq/printing.sgml38
-rw-r--r--docs/docbook/faq/sambafaq.sgml2
-rw-r--r--docs/docbook/manpages/editreg.1.sgml85
-rw-r--r--docs/docbook/manpages/findsmb.1.sgml56
-rw-r--r--docs/docbook/manpages/lmhosts.5.sgml37
-rw-r--r--docs/docbook/manpages/net.8.sgml966
-rw-r--r--docs/docbook/manpages/nmbd.8.sgml178
-rw-r--r--docs/docbook/manpages/nmblookup.1.sgml87
-rw-r--r--docs/docbook/manpages/ntlm_auth.1.sgml127
-rw-r--r--docs/docbook/manpages/pdbedit.8.sgml127
-rw-r--r--docs/docbook/manpages/rpcclient.1.sgml429
-rw-r--r--docs/docbook/manpages/samba.7.sgml213
-rw-r--r--docs/docbook/manpages/smb.conf.5.sgml1601
-rw-r--r--docs/docbook/manpages/smbcacls.1.sgml80
-rw-r--r--docs/docbook/manpages/smbclient.1.sgml231
-rw-r--r--docs/docbook/manpages/smbcontrol.1.sgml307
-rw-r--r--docs/docbook/manpages/smbcquotas.1.sgml179
-rw-r--r--docs/docbook/manpages/smbd.8.sgml136
-rw-r--r--docs/docbook/manpages/smbmnt.8.sgml16
-rw-r--r--docs/docbook/manpages/smbmount.8.sgml61
-rw-r--r--docs/docbook/manpages/smbpasswd.5.sgml26
-rw-r--r--docs/docbook/manpages/smbpasswd.8.sgml83
-rw-r--r--docs/docbook/manpages/smbsh.1.sgml125
-rw-r--r--docs/docbook/manpages/smbspool.8.sgml39
-rw-r--r--docs/docbook/manpages/smbstatus.1.sgml47
-rw-r--r--docs/docbook/manpages/smbtar.1.sgml55
-rw-r--r--docs/docbook/manpages/smbtree.1.sgml93
-rw-r--r--docs/docbook/manpages/smbumount.8.sgml9
-rw-r--r--docs/docbook/manpages/swat.8.sgml78
-rw-r--r--docs/docbook/manpages/testparm.1.sgml56
-rw-r--r--docs/docbook/manpages/testprns.1.sgml29
-rw-r--r--docs/docbook/manpages/vfstest.1.sgml10
-rw-r--r--docs/docbook/manpages/wbinfo.1.sgml102
-rw-r--r--docs/docbook/manpages/winbindd.8.sgml132
-rw-r--r--docs/docbook/projdoc/Bugs.sgml5
-rw-r--r--docs/docbook/samba.dsl6
-rw-r--r--docs/docbook/smbdotconf/.cvsignore4
-rw-r--r--docs/docbook/smbdotconf/expand-smb.conf.xsl74
-rw-r--r--docs/docbook/smbdotconf/man.xsl159
-rwxr-xr-xdocs/docbook/smbdotconf/process-all.sh15
-rw-r--r--docs/docbook/smbdotconf/security/restrictanonymous.xml12
61 files changed, 2545 insertions, 4178 deletions
diff --git a/docs/docbook/configure b/docs/docbook/configure
index 8680e5b5ab..609c17ed87 100755
--- a/docs/docbook/configure
+++ b/docs/docbook/configure
@@ -557,13 +557,10 @@ else
echo "$ac_t""no" 1>&6
fi
-if test "x$JW" = x; then
- { echo "configure: error: "jw is required"" 1>&2; exit 1; }
-fi
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:567: checking for $ac_word" >&5
+echo "configure:564: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -595,13 +592,10 @@ else
echo "$ac_t""no" 1>&6
fi
-if test "x$PERL" = x; then
- { echo "configure: error: "perl is required"" 1>&2; exit 1; }
-fi
# Extract the first word of "htmldoc", so it can be a program name with args.
set dummy htmldoc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:605: checking for $ac_word" >&5
+echo "configure:599: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_HTMLDOC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -633,9 +627,6 @@ else
echo "$ac_t""no" 1>&6
fi
-if test "x$HTMLDOC" = x; then
- { echo "configure: error: "htmldoc is required"" 1>&2; exit 1; }
-fi
DOC_BUILD_DATE=`date '+%d-%m-%Y'`
diff --git a/docs/docbook/configure.in b/docs/docbook/configure.in
index 57482d134e..3a9ed51d16 100644
--- a/docs/docbook/configure.in
+++ b/docs/docbook/configure.in
@@ -1,18 +1,8 @@
AC_INIT(global.ent)
-# Jade wrapper
AC_PATH_PROG(JW, jw)
-if test "x$JW" = x; then
- AC_MSG_ERROR("jw is required")
-fi
AC_PATH_PROG(PERL, perl)
-if test "x$PERL" = x; then
- AC_MSG_ERROR("perl is required")
-fi
AC_PATH_PROG(HTMLDOC, htmldoc)
-if test "x$HTMLDOC" = x; then
- AC_MSG_ERROR("htmldoc is required")
-fi
DOC_BUILD_DATE=`date '+%d-%m-%Y'`
AC_SUBST(DOC_BUILD_DATE)
diff --git a/docs/docbook/devdoc/Tracing.sgml b/docs/docbook/devdoc/Tracing.sgml
index f55c47bc4e..ccf1e1c3c8 100644
--- a/docs/docbook/devdoc/Tracing.sgml
+++ b/docs/docbook/devdoc/Tracing.sgml
@@ -1,6 +1,11 @@
<chapter id="tracing">
<chapterinfo>
- &author.tridge;
+ <author>
+ <firstname>Andrew</firstname><surname>Tridgell</surname>
+ <affiliation>
+ <orgname>Samba Team</orgname>
+ </affiliation>
+ </author>
</chapterinfo>
<title>Tracing samba system calls</title>
diff --git a/docs/docbook/devdoc/architecture.sgml b/docs/docbook/devdoc/architecture.sgml
index e05039054b..312a63af97 100644
--- a/docs/docbook/devdoc/architecture.sgml
+++ b/docs/docbook/devdoc/architecture.sgml
@@ -4,7 +4,6 @@
<firstname>Dan</firstname><surname>Shearer</surname>
</author>
<pubdate> November 1997</pubdate>
- &author.jelmer;
</chapterinfo>
<title>Samba Architecture</title>
@@ -182,56 +181,4 @@ for browsing and WINS support.
</para>
</sect1>
-
-<sect1>
-<title>Samba's subsystems</title>
-
-<para>Samba's <filename>source/</filename> directory contains quite some directories. Here's a small explanation of what each of them contains.</para>
-
-<simplelist>
-<member>aparser - Obsolete</member>
-<member>auth - The authentication subsystem, maintained by Andrew Bartlett</member>
-<member>bin - Output directory for all the binary files</member>
-<member>client - Contains 'plain' SMB client sources: smbclient and
-some mount help utilities</member>
-<member>groupdb - Group database and mapping code</member>
-<member>include - All of samba's include files</member>
-<member>intl - Internationalization files. Not used at the moment.</member>
-<member>lib - General C helper functions. Not SMB-specific.</member>
-<member>libads - Library with ActiveDirectory related functions.</member>
-<member>libsmb - Library with SMB specific functions.</member>
-<member>locking - Locking functions!</member>
-<member>modules - Source files for various modules (VFS and charset).</member>
-<member>msdfs - DCE-DFS code</member>
-<member>nmbd - Code for the nmbd daemon</member>
-<member>nsswitch - Winbind source code</member>
-<member>pam_smbpass - Source code for pam module for authenticating against samba's passdb</member>
-<member>param - smb.conf parsing code</member>
-<member>passdb - User database(SAM) code with the various backends</member>
-<member>po - Internationalisation code - not used atm</member>
-<member>popt - Samba's internal copy of the popt library</member>
-<member>printing - Printing stuff</member>
-<member>profile - Profiling support</member>
-<member>python - Python bindings for various libsmb functions</member>
-<member>registry - Registry backend</member>
-<member>rpc_client - RPC Client library for making remote procedure calls</member>
-<member>rpc_parse - Functions for parsing RPC structures (???)</member>
-<member>rpc_server - Functions for being an RPC server</member>
-<member>rpcclient - Command-line client that is a basically a front-end to rpc_client/</member>
-<member>sam - Code for the new (but unused) SAM</member>
-<member>script - Various scripts</member>
-<member>smbd - Source code for the smbd daemon</member>
-<member>smbwrapper - Source code for library that overloads VFS function calls, for usage with LD_PRELOAD=...</member>
-<member>stf - Testsuite system?</member>
-<member>tdb - Source code of samba's Trivial Database (much like gdbm)</member>
-<member>tests - Source code for the larger tests used by configure</member>
-<member>torture - 'Torture' utilities, used for testing samba and other cifs servers</member>
-<member>ubiqx - The ubiqx library from Chris Hertel</member>
-<member>utils - Various small utilities(pdbedit, net, etc)</member>
-<member>web - SWAT sourcecode</member>
-<member>wrepld - Sourcecode of the WINS replication daemon</member>
-</simplelist>
-
-</sect1>
-
</chapter>
diff --git a/docs/docbook/devdoc/dev-doc.sgml b/docs/docbook/devdoc/dev-doc.sgml
index ee2a40535d..e256dbe3a2 100644
--- a/docs/docbook/devdoc/dev-doc.sgml
+++ b/docs/docbook/devdoc/dev-doc.sgml
@@ -1,5 +1,4 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
<!ENTITY NetBIOS SYSTEM "NetBIOS.sgml">
<!ENTITY Architecture SYSTEM "architecture.sgml">
<!ENTITY debug SYSTEM "debug.sgml">
@@ -13,9 +12,6 @@
<!ENTITY wins SYSTEM "wins.sgml">
<!ENTITY sam SYSTEM "sam.sgml">
<!ENTITY encryption SYSTEM "encryption.sgml">
-<!ENTITY rpc-plugin SYSTEM "rpc_plugin.sgml">
-<!ENTITY modules SYSTEM "modules.sgml">
-<!ENTITY packagers SYSTEM "packagers.sgml">
]>
<book id="Samba-Developers-Guide">
@@ -27,7 +23,6 @@
<surname>SAMBA Team</surname>
</author>
<address><email>samba@samba.org</email></address>
- <editor>&person.jelmer;</editor>
</bookinfo>
<dedication>
@@ -71,8 +66,5 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
&wins;
&sam;
&encryption;
-&modules;
-&rpc-plugin;
-&packagers;
</book>
diff --git a/docs/docbook/devdoc/encryption.sgml b/docs/docbook/devdoc/encryption.sgml
index 64ff4262cb..3ca8aa109c 100644
--- a/docs/docbook/devdoc/encryption.sgml
+++ b/docs/docbook/devdoc/encryption.sgml
@@ -2,7 +2,16 @@
<chapterinfo>
- &author.jeremy;
+ <author>
+ <firstname>Jeremy</firstname><surname>Allison</surname>
+ <affiliation>
+ <orgname>Samba Team</orgname>
+ <address>
+ <email>samba@samba.org</email>
+ </address>
+ </affiliation>
+ </author>
+
<pubdate>19 Apr 1999</pubdate>
</chapterinfo>
diff --git a/docs/docbook/devdoc/gencache.sgml b/docs/docbook/devdoc/gencache.sgml
deleted file mode 100644
index 096bdce789..0000000000
--- a/docs/docbook/devdoc/gencache.sgml
+++ /dev/null
@@ -1,117 +0,0 @@
-<chapter id="gencache">
-<chapterinfo>
- &author.mimir;
- <pubdate>April 2003</pubdate>
-</chapterinfo>
-
-<title>General cache mechanism and API</title>
-
-<sect1>
-<title>Abstract</title>
-<para>
-General cache (gencache) was designed to combine various kinds of caching
-mechanisms into one, defined by a simple API. This way, anyone can use it
-to create their own caching layer on top of gencache. An example of
-such approach is the netbios name cache.
-</para>
-</sect1>
-
-<sect1>
-<title>The mechanism</title>
-<para>
-Gencache utilises <emphasise>tdb</emphasise> database, like many other
-parts of Samba. As its origins are in Berkeley DB implementation, it
-uses key/value pairs stored in binary file. The values gencache
-operates on are string-based, however. This makes very easy to use it
-in command line environment eg. to quickly take a look at what's in
-the cache or set some value.
-</para>
-
-<para>
-All the data is stored in <filename>gencache.tdb</filename>
-file. Records put there are in key/value format as mentioned below,
-but as it's a cache, the timeout plays also important role and has a
-special place in the key/value pair, as well as API.
-</para>
-</sect1>
-
-
-<sect1>
-<title>The data structure</title>
-<para>
-The record stored in <filename>gencache.tdb</filename> file consists
-of the key, the value and the expiration timeout. While the first part
-is stored completely independent from the others, the last two are
-kept together. The form the record has is:
-</para>
-
-<para><programlisting>
-key: &lt;string&bt;
-value: &lt;12-digit timeout&bt;/&lt;string&gt;
-</programlisting></para>
-
-<para>The timeout part is the ASCII representation of
-<emphasis>time_t</emphasis> value of the time when the cache entry
-expires. Obviously the API, the programmer is provided with, hides this detail,
-so that you don't have to care about checking it. Simply watch
-carefully the return status of the function.
-</para>
-</sect1>
-
-<sect1>
-<title>The API</title>
-
-<para><programlisting>
-BOOL gencache_init()
-</programlisting></para>
-
-<para>This is used to initialise to whole caching mechanism. It means
-opening the file or creating it if non-existing. If it's already been
-opened earlier, then the routine just does nothing and returns
-<constant>true</constant>. If something goes wrong, say the user
-doesn't have necessary rights, the function returns
-<constant>false</constant>.</para>
-
-<para><programlisting>
-BOOL gencache_shutdown()
-</programlisting></para>
-
-<para>This is the proper way to close the cache file. It simply
-returns <constant>true</constant> after successful closing file and
-<constant>false</constant> upon a failure.</para>
-
-<para><programlisting>
-BOOL gencache_set(const char* keystr, const char* value, time_t timeout)
-</programlisting></para>
-
-<para>This is one of the most basic functions. What it allows you to
-do is to set some particular cache entry. If the entry haven't
-existed yet, the function will act just as it was "gencache_add"
-function. If it's already been in the cache, the entry will be set to
-the new value. In either case, the cache entry will be set with given
-key, value and timeout. Thus it is comfortable way to just set the
-entry and not care about the details.</para>
-
-<para><programlisting>
-BOOL gencache_set_only(const char* keystr, const char* value, time_t timeout)
-</programlisting></para>
-
-<para><programlisting>
-BOOL gencache_del(const char* keystr)
-</programlisting></para>
-
-<para><programlisting>
-BOOL gencache_get(const char* keystr, char** valstr, time_t* timeout)
-</programlisting></para>
-
-<para><programlisting>
-void gencache_iterate(void (*fn)(const char* key, const char *value, time_t timeout, void* dptr),
- void* data, const char* keystr_pattern)
-
-</programlisting></para>
-
-<sect1>
-<title>Writing your own caching layer</title>
-</sect1>
-
-</chapter>
diff --git a/docs/docbook/devdoc/modules.sgml b/docs/docbook/devdoc/modules.sgml
deleted file mode 100644
index c43e8a9118..0000000000
--- a/docs/docbook/devdoc/modules.sgml
+++ /dev/null
@@ -1,150 +0,0 @@
-<chapter id="modules">
-<chapterinfo>
- &author.jelmer;
- <pubdate> 19 March 2003 </pubdate>
-</chapterinfo>
-
-<title>Modules</title>
-
-<sect1>
-<title>Advantages</title>
-
-<para>
-The new modules system has the following advantages:
-</para>
-
-<simplelist>
-<member>Transparent loading of static and shared modules (no need
-for a subsystem to know about modules)</member>
-<member>Simple selection between shared and static modules at configure time</member>
-<member>"preload modules" option for increasing performance for stable modules</member>
-<member>No nasty #define stuff anymore</member>
-<member>All backends are available as plugin now (including pdb_ldap and pdb_tdb)</member>
-</simplelist>
-</sect1>
-
-<sect1>
-<title>Loading modules</title>
-
-<para>
-Some subsystems in samba use different backends. These backends can be
-either statically linked in to samba or available as a plugin. A subsystem
-should have a function that allows a module to register itself. For example,
-the passdb subsystem has:
-</para>
-
-<para><programlisting>
-BOOL smb_register_passdb(const char *name, pdb_init_function init, int version);
-</programlisting></para>
-
-<para>
-This function will be called by the initialisation function of the module to
-register itself.
-</para>
-
-<sect2>
-<title>Static modules</title>
-
-<para>
-The modules system compiles a list of initialisation functions for the
-static modules of each subsystem. This is a define. For example,
-it is here currently (from <filename>include/config.h</filename>):
-</para>
-
-<para><programlisting>
-/* Static init functions */
-#define static_init_pdb { pdb_mysql_init(); pdb_ldap_init(); pdb_smbpasswd_init(); pdb_tdbsam_init(); pdb_guest_init();}
-</programlisting></para>
-
-<para>
-These functions should be called before the subsystem is used. That
-should be done when the subsystem is initialised or first used.
-</para>
-
-</sect2>
-
-<sect2>
-<title>Shared modules</title>
-
-<para>
-If a subsystem needs a certain backend, it should check if it has
-already been registered. If the backend hasn't been registered already,
-the subsystem should call smb_probe_module(char *subsystem, char *backend).
-This function tries to load the correct module from a certain path
-($LIBDIR/subsystem/backend.so). If the first character in 'backend'
-is a slash, smb_probe_module() tries to load the module from the
-absolute path specified in 'backend'.
-</para>
-
-<para>After smb_probe_module() has been executed, the subsystem
-should check again if the module has been registered.
-</para>
-
-</sect2>
-</sect1>
-
-<sect1>
-<title>Writing modules</title>
-
-<para>
-Each module has an initialisation function. For modules that are
-included with samba this name is '<replaceable>subsystem</replaceable>_<replaceable>backend</replaceable>_init'. For external modules (that will never be built-in, but only available as a module) this name is always 'init_module'. (In the case of modules included with samba, the configure system will add a #define subsystem_backend_init() init_module()).
-The prototype for these functions is:
-</para>
-
-<para><programlisting>
-int init_module(void);
-</programlisting></para>
-
-<para>This function should call one or more
-registration functions. The function should return non-zero on success and zero on
-failure.</para>
-
-<para>For example, pdb_ldap_init() contains: </para>
-
-<para><programlisting>
-int pdb_ldap_init(void)
-{
- smb_register_passdb("ldapsam", pdb_init_ldapsam, PASSDB_INTERFACE_VERSION);
- smb_register_passdb("ldapsam_nua", pdb_init_ldapsam_nua, PASSDB_INTERFACE_VERSION);
- return TRUE;
-}
-</programlisting></para>
-
-<sect2>
-<title>Static/Shared selection in configure.in</title>
-
-<para>
-Some macros in configure.in generate the various defines and substs that
-are necessary for the system to work correct. All modules that should
-be built by default have to be added to the variable 'default_modules'.
-For example, if ldap is found, pdb_ldap is added to this variable.
-</para>
-
-<para>
-On the bottom of configure.in, SMB_MODULE() should be called
-for each module and SMB_SUBSYSTEM() for each subsystem.
-</para>
-
-<para>Syntax:</para>
-
-<para><programlisting>
-SMB_MODULE(<replaceable>subsystem</replaceable>_<replaceable>backend</replaceable>, <replaceable>object files</replaceable>, <replaceable>plugin name</replaceable>, <replaceable>subsystem name</replaceable>, <replaceable>static_action</replaceable>, <replaceable>shared_action</replaceable>)
-SMB_SUBSYSTEM(<replaceable>subsystem</replaceable>)
-</programlisting></para>
-
-<para>Also, make sure to add the correct directives to
-<filename>Makefile.in</filename>. <replaceable>@SUBSYSTEM_STATIC@</replaceable>
-will be replaced with a list of objects files of the modules that need to
-be linked in statically. <replaceable>@SUBSYSTEM_MODULES@</replaceable> will
-be replaced with the names of the plugins to build.
-</para>
-
-<para>You must make sure all .c files that contain defines that can
-be changed by ./configure are rebuilded in the 'modules_clean' make target.
-Practically, this means all c files that contain <command>static_init_subsystem;</command> calls need to be rebuilded.
-</para>
-
-</sect2>
-</sect1>
-</chapter>
diff --git a/docs/docbook/devdoc/packagers.sgml b/docs/docbook/devdoc/packagers.sgml
deleted file mode 100644
index edc581cf05..0000000000
--- a/docs/docbook/devdoc/packagers.sgml
+++ /dev/null
@@ -1,38 +0,0 @@
-<chapter id="Packaging">
-<chapterinfo>
- &author.jelmer;
-</chapterinfo>
-
-<title>Notes to packagers</title>
-
-<sect1>
-<title>Versioning</title>
-
-<para>Please, please update the version number in
-<filename>source/include/version.h</filename> to include the versioning of your package. This makes it easier to distinguish standard samba builds
-from custom-build samba builds (distributions often patch packages). For
-example, a good version would be: </para>
-
-<para><programlisting>
-Version 2.999+3.0.alpha21-5 for Debian
-</programlisting></para>
-
-</sect1>
-
-<sect1>
-<title>Modules</title>
-
-<para>Samba now has support for building parts of samba as plugins. This
-makes it possible to, for example, put ldap or mysql support in a seperate
-package, thus making it possible to have a normal samba package not
-depending on ldap or mysql. To build as much parts of samba
-as a plugin, run: </para>
-
-<para><programlisting>
-./configure --with-shared-modules=rpc,vfs,auth,pdb,charset
-</programlisting></para>
-
-</sect1>
-
-
-</chapter>
diff --git a/docs/docbook/devdoc/printing.sgml b/docs/docbook/devdoc/printing.sgml
index 150652ac37..363b9fb6e5 100644
--- a/docs/docbook/devdoc/printing.sgml
+++ b/docs/docbook/devdoc/printing.sgml
@@ -1,6 +1,8 @@
<chapter id="printing">
<chapterinfo>
- &author.jerry;
+ <author>
+ <firstname>Gerald</firstname><surname>Carter</surname>
+ </author>
<pubdate>October 2002</pubdate>
</chapterinfo>
diff --git a/docs/docbook/devdoc/rpc_plugin.sgml b/docs/docbook/devdoc/rpc_plugin.sgml
deleted file mode 100644
index a2d1bd4c35..0000000000
--- a/docs/docbook/devdoc/rpc_plugin.sgml
+++ /dev/null
@@ -1,77 +0,0 @@
-<chapter id="rpc-plugin">
-<chapterinfo>
- <author>
- <firstname>Anthony</firstname><surname>Liguori</surname>
- <affiliation>
- <orgname>IBM</orgname>
- <address><email>aliguor@us.ibm.com</email></address>
- </affiliation>
- </author>
- &author.jelmer;
- <pubdate>January 2003</pubdate>
-</chapterinfo>
-
-<title>RPC Pluggable Modules</title>
-
-<sect1>
-<title>About</title>
-
-<para>
-This document describes how to make use the new RPC Pluggable Modules features
-of Samba 3.0. This architecture was added to increase the maintainability of
-Samba allowing RPC Pipes to be worked on separately from the main CVS branch.
-The RPM architecture will also allow third-party vendors to add functionality
-to Samba through plug-ins.
-</para>
-
-</sect1>
-
-<sect1>
-<title>General Overview</title>
-
-<para>
-When an RPC call is sent to smbd, smbd tries to load a shared library by the
-name <filename>librpc_&lt;pipename&gt;.so</filename> to handle the call if
-it doesn't know how to handle the call internally. For instance, LSA calls
-are handled by <filename>librpc_lsass.so</filename>..
-These shared libraries should be located in the <filename>&lt;sambaroot&gt;/lib/rpc</filename>. smbd then attempts to call the init_module function within
-the shared library. Check the chapter on modules for more information.
-</para>
-
-<para>
-In the init_module function, the library should call
-rpc_pipe_register_commands(). This function takes the following arguments:
-</para>
-
-<para><programlisting>
-int rpc_pipe_register_commands(const char *clnt, const char *srv,
- const struct api_struct *cmds, int size);
-</programlisting></para>
-
-<variablelist>
-
-<varlistentry><term>clnt</term>
-<listitem><para>the Client name of the named pipe</para></listitem>
-</varlistentry>
-
-<varlistentry><term>srv</term>
-<listitem><para>the Server name of the named pipe</para></listitem>
-</varlistentry>
-
-<varlistentry><term>cmds</term>
-<listitem><para>a list of api_structs that map RPC ordinal numbers to function calls</para></listitem>
-</varlistentry>
-
-<varlistentry><term>size</term>
-<listitem><para>the number of api_structs contained in cmds</para></listitem>
-</varlistentry>
-
-</variablelist>
-
-<para>
-See rpc_server/srv_reg.c and rpc_server/srv_reg_nt.c for a small example of
-how to use this library.
-</para>
-
-</sect1>
-</chapter>
diff --git a/docs/docbook/devdoc/sam.sgml b/docs/docbook/devdoc/sam.sgml
index d4c065ca21..84c17d65e2 100644
--- a/docs/docbook/devdoc/sam.sgml
+++ b/docs/docbook/devdoc/sam.sgml
@@ -9,9 +9,6 @@
<title>The Upcoming SAM System</title>
-<note><para>The design as described in this document is _NOT_ the design that
-made it into samba 3.0. </para></note>
-
<sect1>
<title>Security in the 'new SAM'</title>
diff --git a/docs/docbook/devdoc/unix-smb.sgml b/docs/docbook/devdoc/unix-smb.sgml
index eea02012e0..d6a658089c 100644
--- a/docs/docbook/devdoc/unix-smb.sgml
+++ b/docs/docbook/devdoc/unix-smb.sgml
@@ -1,6 +1,8 @@
<chapter id="unix-smb">
<chapterinfo>
- &author.tridge;
+ <author>
+ <firstname>Andrew</firstname><surname>Tridgell</surname>
+ </author>
<pubdate>April 1995</pubdate>
</chapterinfo>
diff --git a/docs/docbook/devdoc/wins.sgml b/docs/docbook/devdoc/wins.sgml
index 5cdf760406..53410316c5 100644
--- a/docs/docbook/devdoc/wins.sgml
+++ b/docs/docbook/devdoc/wins.sgml
@@ -1,6 +1,8 @@
<chapter id="wins">
<chapterinfo>
- &author.jerry;
+ <author>
+ <firstname>Gerald</firstname><surname>Carter</surname>
+ </author>
<pubdate>October 2002</pubdate>
</chapterinfo>
diff --git a/docs/docbook/faq/clientapp.sgml b/docs/docbook/faq/clientapp.sgml
index 3d44dd44c0..6d687bf772 100644
--- a/docs/docbook/faq/clientapp.sgml
+++ b/docs/docbook/faq/clientapp.sgml
@@ -1,8 +1,8 @@
-<chapter id="FAQ-ClientApp">
+<chapter id="ClientApp">
<title>Specific client application problems</title>
<sect1>
-<title>MS Office Setup reports "Cannot change properties of '\\MSOFFICE\\SETUP.INI'"</title>
+<title>MS Office Setup reports "Cannot change properties of '\MSOFFICE\SETUP.INI'"</title>
<para>
When installing MS Office on a Samba drive for which you have admin
user permissions, ie. admin users = username, you will find the
@@ -60,16 +60,16 @@ set the following parameters on the share containing it:
</para>
<para><programlisting>
-[MSOP95]
- path = /where_you_put_it
- comment = Your comment
- volume = "The_CD_ROM_Label"
- read only = yes
- available = yes
- share modes = no
- locking = no
- browseable = yes
- public = yes
+ [MSOP95]
+ path = /where_you_put_it
+ comment = Your comment
+ volume = "The_CD_ROM_Label"
+ read only = yes
+ available = yes
+ share modes = no
+ locking = no
+ browseable = yes
+ public = yes
</programlisting></para>
</listitem>
diff --git a/docs/docbook/faq/config.sgml b/docs/docbook/faq/config.sgml
index 2c17c86c4e..78f73252a2 100644
--- a/docs/docbook/faq/config.sgml
+++ b/docs/docbook/faq/config.sgml
@@ -1,4 +1,4 @@
-<chapter id="FAQ-Config">
+<chapter id="Config">
<title>Configuration problems</title>
<sect1>
@@ -8,30 +8,4 @@ When you have a user in 'admin users', samba will always do file operations for
this user as 'root', even if 'force user' has been set.
</para>
</sect1>
-
-<sect1>
-<title>I have just installed samba and I'm trying to log in from Windows, but samba refuses all logins!</title>
-
-<para>
-Newer windows clients(NT4, 2000, XP) send encrypted passwords. Samba can't compare these
-passwords to the unix password database, so it needs it's own user database. You can
-add users to this database using "smbpasswd -a user-name".
-</para>
-
-<para>
-See also the "User database" chapter of the samba HOWTO Collection.
-</para>
-</sect1>
-
-<sect1>
-<title>How can I make samba use netbios scope ID's</title>
-
-<para>By default Samba uses a blank scope ID. This means
-all your windows boxes must also have a blank scope ID.
-If you really want to use a non-blank scope ID then you will
-need to use the 'netbios scope' smb.conf option.
-All your PCs will need to have the same setting for
-this to work. Scope ID's are not recommended.</para>
-</sect1>
-
</chapter>
diff --git a/docs/docbook/faq/errors.sgml b/docs/docbook/faq/errors.sgml
index 97619ce704..6476ec064e 100644
--- a/docs/docbook/faq/errors.sgml
+++ b/docs/docbook/faq/errors.sgml
@@ -1,4 +1,4 @@
-<chapter id="FAQ-errors">
+<chapter id="errors">
<title>Common errors</title>
@@ -50,6 +50,7 @@ Windows NT in the chapter "Portability" of the samba HOWTO collection
</member>
</simplelist>
</para>
+
</sect1>
<sect1>
@@ -63,6 +64,7 @@ It also ignores the "-N" argument when querying some (but not all) of our
NT servers.
</quote>
</para>
+
<para>
No, it does not ignore -N, it is just that your server rejected the
null password in the connection, so smbclient prompts for a password
diff --git a/docs/docbook/faq/features.sgml b/docs/docbook/faq/features.sgml
index 66b05379cc..bc1081e5c0 100644
--- a/docs/docbook/faq/features.sgml
+++ b/docs/docbook/faq/features.sgml
@@ -1,4 +1,4 @@
-<chapter id="FAQ-features">
+<chapter id="features">
<title>Features</title>
@@ -83,7 +83,9 @@ manual carefully.</para>
<title>Tools for printing faxes</title>
<para>Your incomed faxes are in:
-<filename>/var/spool/fax/incoming</filename>. Print it with:</para>
+<filename>/var/spool/fax/incoming</filename></para>
+
+<para>print it with:</para>
<para><programlisting>
for i in *
diff --git a/docs/docbook/faq/general.sgml b/docs/docbook/faq/general.sgml
index 54c620b382..38bcdf49e3 100644
--- a/docs/docbook/faq/general.sgml
+++ b/docs/docbook/faq/general.sgml
@@ -1,4 +1,4 @@
-<chapter id="FAQ-general">
+<chapter id="general">
<title>General Information</title>
<sect1>
@@ -35,7 +35,7 @@ unstable, and a series of alpha releases are distributed, for example
doing. The "alpha" in the filename will hopefully scare off those who
are just looking for the latest version to install.</member>
-<member>When the release manager, currently Jerry, thinks that the alphas have stabilised to the point
+<member>When Andrew thinks that the alphas have stabilised to the point
where he would recommend new users install it, he renames it to the
same version number without the alpha, for example 1.9.16.</member>
@@ -128,4 +128,43 @@ Look at <ulink url="http://samba.org/samba/archives.html">the samba mailing list
</para>
</sect1>
+<sect1>
+<title>Pizza supply details</title>
+<para>
+Those who have registered in the Samba survey as "Pizza Factory" will
+already know this, but the rest may need some help. Andrew doesn't ask
+for payment, but he does appreciate it when people give him
+pizza. This calls for a little organisation when the pizza donor is
+twenty thousand kilometres away, but it has been done.
+</para>
+
+<para>
+Method 1: Ring up your local branch of an international pizza chain
+and see if they honour their vouchers internationally. Pizza Hut do,
+which is how the entire Canberra Linux Users Group got to eat pizza
+one night, courtesy of someone in the US.
+</para>
+
+<para>
+Method 2: Ring up a local pizza shop in Canberra and quote a credit
+card number for a certain amount, and tell them that Andrew will be
+collecting it (don't forget to tell him.) One kind soul from Germany
+did this.
+</para>
+
+<para>
+Method 3: Purchase a pizza voucher from your local pizza shop that has
+no international affiliations and send it to Andrew. It is completely
+useless but he can hang it on the wall next to the one he already has
+from Germany :-)
+</para>
+
+<para>
+Method 4: Air freight him a pizza with your favourite regional
+flavours. It will probably get stuck in customs or torn apart by
+hungry sniffer dogs but it will have been a noble gesture.
+</para>
+
+</sect1>
+
</chapter>
diff --git a/docs/docbook/faq/install.sgml b/docs/docbook/faq/install.sgml
index f8341dc65a..88520fc71d 100644
--- a/docs/docbook/faq/install.sgml
+++ b/docs/docbook/faq/install.sgml
@@ -1,4 +1,4 @@
-<chapter id="FAQ-Install">
+<chapter id="Install">
<title>Compiling and installing Samba on a Unix host</title>
<sect1>
@@ -22,7 +22,7 @@ client to client - check your client's documentation.
</sect1>
<sect1>
-<title>Some files that I KNOW are on the server don't show up when I view the files from my client!</title>
+<title>Some files that I KNOW are on the server doesn't show up when I view the files from my client!</title>
<para>See the next question.</para>
</sect1>
diff --git a/docs/docbook/faq/printing.sgml b/docs/docbook/faq/printing.sgml
deleted file mode 100644
index be2acbd905..0000000000
--- a/docs/docbook/faq/printing.sgml
+++ /dev/null
@@ -1,38 +0,0 @@
-<chapter id="FAQ-Printing">
-<!-- Kurt Pfeifle's HOWTO chapter on printing should make this obsolete -->
-<chapterinfo>
-<author>
- <firstname>Ronan</firstname><surname>Waide</surname>
-</author>
-</chapterinfo>
-
-<title>Printing problems</title>
-
-<sect1>
-<title>setdriver or cupsaddsmb failes</title>
-<para>
-setdriver expects the following setup:
-
-<simplelist>
-<member>you are a printer admin, or root. this is the smb.conf printer admin group, not the Printer Operators group in NT. I've not tried the latter, but I don't believe it will work based on the current code.</member>
-<member>printer admins has to be defined in [global]</member>
-<member>upload the driver files to \\server\print$\w32x86 and win40 as appropriate. DON'T put them in the 0 or 2 subdirectories.</member>
-<member>Make sure that the user you're connecting as is able to write to the print$ directories</member>
-<member>Use adddriver (with appropriate parameters) to create the driver. note, this will not just update samba's notion of drivers, it will also move the files from the w32x86 and win40 directories to an appropriate subdirectory (based on driver version, I think, but not important enough for me to find out)</member>
-<member>Use setdriver to associate the driver with a printer</member>
-</simplelist>
-</para>
-
-<para>
-The setdriver call will fail if the printer doesn't already exist in
-samba's view of the world. Either create the printer in cups and
-restart samba, or create an add printer command (see smb.conf doco)
-and use RPC calls to create a printer. NB the add printer command MUST
-return a single line of text indicating which port the printer was
-added on. If it doesn't, Samba won't reload the printer
-definitions. Although samba doesn't really support the notion of
-ports, suitable add printer command and enumport command settings can
-allow you pretty good remote control of the samba printer setup.
-</para>
-</sect1>
-</chapter>
diff --git a/docs/docbook/faq/sambafaq.sgml b/docs/docbook/faq/sambafaq.sgml
index 2cc7d466fd..e9e5ed7a3c 100644
--- a/docs/docbook/faq/sambafaq.sgml
+++ b/docs/docbook/faq/sambafaq.sgml
@@ -5,7 +5,6 @@
<!ENTITY clientapp SYSTEM "clientapp.sgml">
<!ENTITY features SYSTEM "features.sgml">
<!ENTITY config SYSTEM "config.sgml">
-<!ENTITY printing SYSTEM "printing.sgml">
]>
<book id="Samba-FAQ">
@@ -35,5 +34,4 @@ and the old samba text documents which were mostly written by John Terpstra.
&clientapp;
&errors;
&features;
-&printing;
</book>
diff --git a/docs/docbook/manpages/editreg.1.sgml b/docs/docbook/manpages/editreg.1.sgml
deleted file mode 100644
index 22c3c3e759..0000000000
--- a/docs/docbook/manpages/editreg.1.sgml
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-<refentry id="editreg.1">
-
-<refmeta>
- <refentrytitle>editreg</refentrytitle>
- <manvolnum>1</manvolnum>
-</refmeta>
-
-
-<refnamediv>
- <refname>editreg</refname>
- <refpurpose>A utility to report and change SIDs in registry files
- </refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
- <cmdsynopsis>
- <command>editreg</command>
- <arg choice="opt">-v</arg>
- <arg choice="opt">-c file</arg>
- <arg choice="req">file</arg>
- </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
- <title>DESCRIPTION</title>
-
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
-
- <para><command>editreg</command> is a utility that
- can visualize windows registry files (currently only NT4) and apply
- so-called commandfiles to them.
- </para>
-</refsect1>
-
-
-<refsect1>
- <title>OPTIONS</title>
-
- <variablelist>
- <varlistentry>
- <term>registry_file</term>
- <listitem><para>Registry file to view or edit. </para></listitem>
- </varlistentry>
-
-
- <varlistentry>
- <term>-v,--verbose</term>
- <listitem><para>Increases verbosity of messages.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-c commandfile</term>
- <listitem><para>Read commands to execute on <filename>registry_file</filename> from <filename>commandfile</filename>. Currently not yet supported!
- </para></listitem>
- </varlistentry>
-
- &stdarg.help;
-
- </variablelist>
-</refsect1>
-
-<refsect1>
- <title>VERSION</title>
-
- <para>This man page is correct for version 3.0 of the Samba
- suite.</para>
-</refsect1>
-
-<refsect1>
- <title>AUTHOR</title>
-
- <para>The original Samba software and related utilities
- were created by Andrew Tridgell. Samba is now developed
- by the Samba Team as an Open Source project similar
- to the way the Linux kernel is developed.</para>
-
- <para>The editreg man page was written by Jelmer Vernooij. </para>
-</refsect1>
-
-</refentry>
diff --git a/docs/docbook/manpages/findsmb.1.sgml b/docs/docbook/manpages/findsmb.1.sgml
index 090b1c8388..0b3bbca017 100644
--- a/docs/docbook/manpages/findsmb.1.sgml
+++ b/docs/docbook/manpages/findsmb.1.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="findsmb.1">
+<refentry id="findsmb">
<refmeta>
<refentrytitle>findsmb</refentrytitle>
@@ -23,16 +23,15 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This perl script is part of the <citerefentry>
- <refentrytitle>Samba</refentrytitle><manvolnum>7</manvolnum></citerefentry>
- suite.</para>
+ <para>This perl script is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para><command>findsmb</command> is a perl script that
prints out several pieces of information about machines
on a subnet that respond to SMB name query requests.
- It uses <citerefentry><refentrytitle>nmblookup</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- and <citerefentry><refentrytitle>smbclient</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- to obtain this information.
+ It uses <ulink url="nmblookup.1.html"><command>
+ nmblookup(1)</command></ulink> and <ulink url="smbclient.1.html">
+ <command>smbclient(1)</command></ulink> to obtain this information.
</para>
</refsect1>
@@ -46,17 +45,16 @@
bugs in Windows95 into account when trying to find a Netbios name
registered of the remote machine. This option is disabled by default
because it is specific to Windows 95 and Windows 95 machines only.
- If set, <citerefentry><refentrytitle>nmblookup</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+ If set, <ulink url="nmblookup.1.html"><command>nmblookup</command></ulink>
will be called with <constant>-B</constant> option.</para></listitem>
</varlistentry>
<varlistentry>
<term>subnet broadcast address</term>
<listitem><para>Without this option, <command>findsmb
</command> will probe the subnet of the machine where
- <citerefentry><refentrytitle>findsmb</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- is run. This value is passed to
- <citerefentry><refentrytitle>nmblookup</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- as part of the <constant>-B</constant> option.</para></listitem>
+ <command>findsmb</command> is run. This value is passed
+ to <command>nmblookup</command> as part of the
+ <constant>-B</constant> option.</para></listitem>
</varlistentry>
</variablelist>
</refsect1>
@@ -78,21 +76,19 @@
version.</para>
<para>The command with <constant>-r</constant> option
- must be run on a system without <citerefentry>
- <refentrytitle>nmbd</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry> running.
-
+ must be run on a system without <ulink
+ url="nmbd.8.html"><command>nmbd</command></ulink> running.
If <command>nmbd</command> is running on the system, you will
only get the IP address and the DNS name of the machine. To
get proper responses from Windows 95 and Windows 98 machines,
the command must be run as root and with <constant>-r</constant>
option on a machine without <command>nmbd</command> running.</para>
- <para>For example, running <command>findsmb</command>
- without <constant>-r</constant> option set would yield output similar
+ <para>For example, running <command>findsmb</command> without
+ <constant>-r</constant> option set would yield output similar
to the following</para>
-<screen>
+ <screen><computeroutput>
IP ADDR NETBIOS NAME WORKGROUP/OS/VERSION
---------------------------------------------------------------------
192.168.35.10 MINESET-TEST1 [DMVENGR]
@@ -105,7 +101,7 @@ IP ADDR NETBIOS NAME WORKGROUP/OS/VERSION
192.168.35.88 SCNT2 +[MVENGR] [Windows NT 4.0] [NT LAN Manager 4.0]
192.168.35.93 FROGSTAR-PC [MVENGR] [Windows 5.0] [Windows 2000 LAN Manager]
192.168.35.97 HERBNT1 *[HERB-NT] [Windows NT 4.0] [NT LAN Manager 4.0]
-</screen>
+ </computeroutput></screen>
</refsect1>
@@ -119,12 +115,10 @@ IP ADDR NETBIOS NAME WORKGROUP/OS/VERSION
<refsect1>
<title>SEE ALSO</title>
- <para><citerefentry>
- <refentrytitle>nmbd</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry>,
- <citerefentry><refentrytitle>smbclient</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry>, and <citerefentry><refentrytitle>nmblookup</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>
+ <para><ulink url="nmbd.8.html"><command>nmbd(8)</command></ulink>,
+ <ulink url="smbclient.1.html"><command>smbclient(1)
+ </command></ulink>, and <ulink url="nmblookup.1.html">
+ <command>nmblookup(1)</command></ulink>
</para>
</refsect1>
@@ -138,11 +132,11 @@ IP ADDR NETBIOS NAME WORKGROUP/OS/VERSION
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink
- url="ftp://ftp.icce.rug.nl/pub/unix/">ftp://ftp.icce.rug.nl/pub/unix/</ulink>)
- and updated for the Samba 2.0 release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook
- XML 4.2 for Samba 3.0 was done by Alexander Bokovoy.</para>
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
+ release by Jeremy Allison. The conversion to DocBook for
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/lmhosts.5.sgml b/docs/docbook/manpages/lmhosts.5.sgml
index a8a5f2c072..7934c18e8e 100644
--- a/docs/docbook/manpages/lmhosts.5.sgml
+++ b/docs/docbook/manpages/lmhosts.5.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="lmhosts.5">
+<refentry id="lmhosts">
<refmeta>
<refentrytitle>lmhosts</refentrytitle>
@@ -13,15 +13,15 @@
</refnamediv>
<refsynopsisdiv>
- <para><filename>lmhosts</filename> is the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> NetBIOS name to IP address mapping file.</para>
+ <para><filename>lmhosts</filename> is the <ulink url="samba.7.html">
+ Samba</ulink> NetBIOS name to IP address mapping file.</para>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
- <para>This file is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This file is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para><filename>lmhosts</filename> is the <emphasis>Samba
</emphasis> NetBIOS name to IP address mapping file. It
@@ -35,7 +35,7 @@
<para>It is an ASCII file containing one line for NetBIOS name.
The two fields on each line are separated from each other by
white space. Any entry beginning with '#' is ignored. Each line
- in the lmhosts file contains the following information:</para>
+ in the lmhosts file contains the following information :</para>
<itemizedlist>
<listitem><para>IP Address - in dotted decimal format.</para>
@@ -52,16 +52,16 @@
</listitem>
</itemizedlist>
- <para>An example follows:</para>
+ <para>An example follows :</para>
- <programlisting>
+ <para><programlisting>
#
# Sample Samba lmhosts file.
#
192.9.200.1 TESTPC
192.9.200.20 NTSERVER#20
192.9.200.21 SAMBASERVER
- </programlisting>
+ </programlisting></para>
<para>Contains three IP to NetBIOS name mappings. The first
and third will be returned for any queries for the names "TESTPC"
@@ -73,24 +73,24 @@
be resolved.</para>
<para>The default location of the <filename>lmhosts</filename> file
- is in the same directory as the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file.</para>
+ is in the same directory as the <ulink url="smb.conf.5.html">
+ smb.conf(5)></ulink> file.</para>
</refsect1>
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3.0 of the Samba suite.</para>
+ <para>This man page is correct for version 2.2 of
+ the Samba suite.</para>
</refsect1>
<refsect1>
<title>SEE ALSO</title>
- <para><citerefentry>
- <refentrytitle>smbclient</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry>, and <citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>
+ <para><ulink url="smbclient.1.html"><command>smbclient(1)
+ </command></ulink>, <ulink url="smb.conf.5.html#NAMERESOLVEORDER">
+ smb.conf(5)</ulink>, and <ulink url="smbpasswd.8.html"><command>
+ smbpasswd(8)</command></ulink>
</para>
</refsect1>
@@ -108,8 +108,7 @@
<ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook
- XML 4.2 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/net.8.sgml b/docs/docbook/manpages/net.8.sgml
index ca52ce8ffc..aab9032f14 100644
--- a/docs/docbook/manpages/net.8.sgml
+++ b/docs/docbook/manpages/net.8.sgml
@@ -1,41 +1,5 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-
-<!-- This one is only used for adding users using RAP -->
-<!ENTITY net.arg.flags '
-<varlistentry>
-<term>-F flags</term>
-<listitem><para>
-FIXME. Defaults to 0x21
-</para></listitem>
-</varlistentry>'>
-
-<!-- This one is only used by shutdown (RPC) -->
-<!ENTITY net.arg.shutdown '
-<varlistentry>
-<term>-r</term>
-<listitem><para>
-Reboot after shutdown.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>-f</term>
-<listitem><para>
-Force shutting down all applications.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>-t timeout</term>
-<listitem><para>
-Timeout before system will be shut down. An interactive
-user of the system can use this time to cancel the shutdown.
-</para></listitem>
-</varlistentry>'>
-]>
-
-<refentry id="net.8">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="net">
<refmeta>
<refentrytitle>net</refentrytitle>
@@ -46,8 +10,7 @@ user of the system can use this time to cancel the shutdown.
<refnamediv>
<refname>net</refname>
<refpurpose>Tool for administration of Samba and remote
- CIFS servers.
- </refpurpose>
+ CIFS servers.</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -63,7 +26,14 @@ user of the system can use this time to cancel the shutdown.
<arg choice="opt">-n myname</arg>
<arg choice="opt">-s conffile</arg>
<arg choice="opt">-S server</arg>
+ <arg choice="opt">-C comment</arg>
+ <arg choice="opt">-M maxusers</arg>
+ <arg choice="opt">-F flags</arg>
+ <arg choice="opt">-j jobid</arg>
<arg choice="opt">-l</arg>
+ <arg choice="opt">-r</arg>
+ <arg choice="opt">-f</arg>
+ <arg choice="opt">-t timeout</arg>
<arg choice="opt">-P</arg>
<arg choice="opt">-D debuglevel</arg>
</cmdsynopsis>
@@ -72,17 +42,11 @@ user of the system can use this time to cancel the shutdown.
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para>The samba net utility is meant to work just like the net utility
- available for windows and DOS. The first argument should be used
- to specify the protocol to use when executing a certain command.
- ADS is used for ActiveDirectory, RAP is using for old (Win9x/NT3)
- clients and RPC can be used for NT4 and Windows 2000. If this
- argument is omitted, net will try to determine it automatically.
- Not all commands are available on all protocols.
- </para>
+ available for windows and DOS.</para>
</refsect1>
@@ -90,13 +54,18 @@ user of the system can use this time to cancel the shutdown.
<title>OPTIONS</title>
<variablelist>
- &stdarg.help;
+ <varlistentry>
+ <term>-h</term>
+ <listitem><para>
+ Display summary of all available options.
+
+ </para></listitem>
+ </varlistentry>
<varlistentry>
<term>-w target-workgroup</term>
<listitem><para>
- Sets target workgroup or domain. You have to specify
- either this option or the IP address or the name of a server.
+ Sets target workgroup or domain. You have to specify either this option or the IP address or the name of a server.
</para></listitem>
</varlistentry>
@@ -117,35 +86,91 @@ user of the system can use this time to cancel the shutdown.
<varlistentry>
<term>-I ip-address</term>
<listitem><para>
- IP address of target server to use. You have to
- specify either this option or a target workgroup or
- a target server.
+ IP address of target server to use. You have to specify either this option or a target workgroup or a target server.
</para></listitem>
</varlistentry>
<varlistentry>
<term>-p port</term>
<listitem><para>
- Port on the target server to connect to (usually 139 or 445).
- Defaults to trying 445 first, then 139.
+ Port on the target server to connect to.
</para></listitem>
</varlistentry>
- &stdarg.netbios.name;
- &stdarg.configfile;
+ <varlistentry>
+ <term>-n myname</term>
+ <listitem><para>
+ Sets name of the client.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-s conffile</term>
+ <listitem><para>
+ Specify alternative configuration file that should be loaded.
+ </para></listitem>
+ </varlistentry>
<varlistentry>
<term>-S server</term>
<listitem><para>
- Name of target server. You should specify either
- this option or a target workgroup or a target IP address.
+ Name of target server. You should specify either this option or a target workgroup or a target IP address.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-C comment</term>
+ <listitem><para>
+ FIXME
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-M maxusers</term>
+ <listitem><para>
+ FIXME
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-F flags</term>
+ <listitem><para>
+ FIXME
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-j jobid</term>
+ <listitem><para>
+ FIXME
</para></listitem>
</varlistentry>
<varlistentry>
<term>-l</term>
<listitem><para>
- When listing data, give more information on each item.
+ FIXME
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-r</term>
+ <listitem><para>
+ FIXME
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-f</term>
+ <listitem><para>
+ FIXME
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-t timeout</term>
+ <listitem><para>
+ FIXME
</para></listitem>
</varlistentry>
@@ -156,734 +181,153 @@ user of the system can use this time to cancel the shutdown.
</para></listitem>
</varlistentry>
- &stdarg.debug;
+ <varlistentry>
+ <term>-D debuglevel</term>
+ <listitem><para>set the debuglevel. Debug level 0 is the lowest
+ and 100 being the highest. This should be set to 100 if you are
+ planning on submitting a bug report to the Samba team (see
+ <filename>BUGS.txt</filename>).
+ </para></listitem>
+ </varlistentry>
</variablelist>
</refsect1>
-<refsect1>
-<title>COMMANDS</title>
-<refsect2>
+<refsect1>
<title>TIME</title>
<para>The <command>NET TIME</command> command allows you to view the time on a remote server
or synchronise the time on the local server with the time on the remote server.</para>
-<refsect3>
-<title>TIME</title>
-
-<para>Without any options, the <command>NET TIME</command> command
-displays the time on the remote server.
-</para>
-
-</refsect3>
-
-<refsect3>
-<title>TIME SYSTEM</title>
-
-<para> Displays the time on the remote server in a format ready for <command>/bin/date</command></para>
-
-</refsect3>
-
-<refsect3>
-<title>TIME SET</title>
-<para>Tries to set the date and time of the local server to that on
-the remote server using <command>/bin/date</command>. </para>
-
-</refsect3>
-
-<refsect3>
-<title>TIME ZONE</title>
-
-<para>Displays the timezone in hours from GMT on the remote computer.</para>
-
-</refsect3>
-</refsect2>
-
-<refsect2>
-<title>[RPC|ADS] JOIN [TYPE] [-U username[%password]] [options]</title>
-
-<para>
-Join a domain. If the account already exists on the server, and
-[TYPE] is MEMBER, the machine will attempt to join automatically.
-(Assuming that the machine has been created in server manager)
-Otherwise, a password will be prompted for, and a new account may
-be created.</para>
-
-<para>
-[TYPE] may be PDC, BDC or MEMBER to specify the type of server
-joining the domain.
-</para>
-</refsect2>
-
-<refsect2>
-<title>[RPC] OLDJOIN [options]</title>
-
-<para>Join a domain. Use the OLDJOIN option to join the domain
-using the old style of domain joining - you need to create a trust
-account in server manager first.</para>
-</refsect2>
-
-<refsect2>
-<title>[RPC|ADS] USER</title>
-
-<refsect3>
-<title>[RPC|ADS] USER DELETE <replaceable>target</replaceable></title>
-
-<para>Delete specified user</para>
-
-</refsect3>
-
-<refsect3>
-<title>[RPC|ADS] USER LIST</title>
-
-<para>List all users</para>
-
-</refsect3>
-
-<refsect3>
-<title>[RPC|ADS] USER INFO <replaceable>target</replaceable></title>
-
-<para>List the domain groups of a the specified user.</para>
-
-</refsect3>
-
-<refsect3>
-<title>[RPC|ADS] USER ADD <replaceable>name</replaceable> [password] [-F user flags] [-C comment]</title>
-
-<para>Add specified user.</para>
-</refsect3>
-</refsect2>
-
-<refsect2>
-<title>[RPC|ADS] GROUP</title>
-
-<refsect3>
-<title>[RPC|ADS] GROUP [misc options] [targets]</title>
-<para>List user groups.</para>
-</refsect3>
-
-<refsect3>
-<title>[RPC|ADS] GROUP DELETE <replaceable>name</replaceable> [misc. options]</title>
-
-<para>Delete specified group.</para>
-
-</refsect3>
-
-<refsect3>
-<title>[RPC|ADS] GROUP ADD <replaceable>name</replaceable> [-C comment]</title>
-
-<para>Create specified group.</para>
-
-</refsect3>
-</refsect2>
-
-<refsect2>
-<title>[RAP|RPC] SHARE</title>
-
-<refsect3>
-<title>[RAP|RPC] SHARE [misc. options] [targets]</title>
-
-<para>Enumerates all exported resources (network shares) on target server.</para>
-
-</refsect3>
-
-<refsect3>
-<title>[RAP|RPC] SHARE ADD <replaceable>name=serverpath</replaceable> [-C comment] [-M maxusers] [targets]</title>
-
-<para>Adds a share from a server (makes the export active). Maxusers
-specifies the number of users that can be connected to the
-share simultaneously.</para>
-
-</refsect3>
-
-<refsect3>
-<title>SHARE DELETE <replaceable>sharenam</replaceable></title>
-
-<para>Delete specified share.</para>
-</refsect3>
-</refsect2>
-
-<refsect2>
-<title>[RPC|RAP] FILE</title>
-
-<refsect3>
-<title>[RPC|RAP] FILE</title>
-
-<para>List all open files on remote server.</para>
-
-</refsect3>
-
-<refsect3>
-<title>[RPC|RAP] FILE CLOSE <replaceable>fileid</replaceable></title>
-
-<para>Close file with specified <replaceable>fileid</replaceable> on
-remote server.</para>
-
-</refsect3>
-
-<refsect3>
-<title>[RPC|RAP] FILE INFO <replaceable>fileid</replaceable></title>
-
-<para>
-Print information on specified <replaceable>fileid</replaceable>.
-Currently listed are: file-id, username, locks, path, permissions.
-</para>
-
-</refsect3>
-
-<refsect3>
-<title>[RAP|RPC] FILE USER</title>
-
-&not.implemented;
-
-</refsect3>
-
-</refsect2>
-
-<refsect2>
-<title>SESSION</title>
-
-<refsect3>
-<title>RAP SESSION</title>
-
-<para>Without any other options, SESSION enumerates all active SMB/CIFS
-sessions on the target server.</para>
-
-</refsect3>
-
-<refsect3>
-<title>RAP SESSION DELETE|CLOSE <replaceable>CLIENT_NAME</replaceable></title>
-
-<para>Close the specified sessions.</para>
-
-</refsect3>
-
-<refsect3>
-<title>RAP SESSION INFO <replaceable>CLIENT_NAME</replaceable></title>
-
-<para>Give a list with all the open files in specified session.</para>
-
-</refsect3>
-
-</refsect2>
-
-<refsect2>
-<title>RAP SERVER <replaceable>DOMAIN</replaceable></title>
-
-<para>List all servers in specified domain or workgroup. Defaults
-to local domain.</para>
-
-</refsect2>
-
-<refsect2>
-<title>RAP DOMAIN</title>
-
-<para>Lists all domains and workgroups visible on the
-current network.</para>
-
-</refsect2>
-
-<refsect2>
-<title>RAP PRINTQ</title>
-
-<refsect3>
-<title>RAP PRINTQ LIST <replaceable>QUEUE_NAME</replaceable></title>
-
-<para>Lists the specified print queue and print jobs on the server.
-If the <replaceable>QUEUE_NAME</replaceable> is omitted, all
-queues are listed.</para>
-
-</refsect3>
-
-<refsect3>
-<title>RAP PRINTQ DELETE <replaceable>JOBID</replaceable></title>
-
-<para>Delete job with specified id.</para>
-
-</refsect3>
-
-</refsect2>
-
-<refsect2>
-<title>RAP VALIDATE <replaceable>user</replaceable> [<replaceable>password</replaceable>]</title>
-
-<para>
-Validate whether the specified user can log in to the
-remote server. If the password is not specified on the commandline, it
-will be prompted.
-</para>
-
-&not.implemented;
-
-</refsect2>
-
-<refsect2>
-<title>RAP GROUPMEMBER</title>
-
-<refsect3>
-<title>RAP GROUPMEMBER LIST <replaceable>GROUP</replaceable></title>
-
-<para>List all members of the specified group.</para>
-
-</refsect3>
-
-<refsect3>
-<title>RAP GROUPMEMBER DELETE <replaceable>GROUP</replaceable> <replaceable>USER</replaceable></title>
-
-<para>Delete member from group.</para>
-
-</refsect3>
-
-<refsect3>
-<title>RAP GROUPMEMBER ADD <replaceable>GROUP</replaceable> <replaceable>USER</replaceable></title>
-
-<para>Add member to group.</para>
-
-</refsect3>
-
-</refsect2>
-
-<refsect2>
-<title>RAP ADMIN <replaceable>command</replaceable></title>
-
-<para>Execute the specified <replaceable>command</replaceable> on
-the remote server. Only works with OS/2 servers.
-</para>
-
-&not.implemented;
-
-</refsect2>
-
-<refsect2>
-<title>RAP SERVICE</title>
-
-<refsect3>
-<title>RAP SERVICE START <replaceable>NAME</replaceable> [arguments...]</title>
-
-<para>Start the specified service on the remote server. Not implemented yet.</para>
-
-&not.implemented;
-
-</refsect3>
-
-<refsect3>
-<title>RAP SERVICE STOP</title>
-
-<para>Stop the specified service on the remote server.</para>
-
-&not.implemented;
-
-</refsect3>
-
-</refsect2>
-
-<refsect2>
-<title>RAP PASSWORD <replaceable>USER</replaceable> <replaceable>OLDPASS</replaceable> <replaceable>NEWPASS</replaceable></title>
-
-<para>
-Change password of <replaceable>USER</replaceable> from <replaceable>OLDPASS</replaceable> to <replaceable>NEWPASS</replaceable>.
-</para>
-
-</refsect2>
-
-<refsect2>
-<title>LOOKUP</title>
-
-<refsect3>
-<title>LOOKUP HOST <replaceable>HOSTNAME</replaceable> [<replaceable>TYPE</replaceable>]</title>
-
-<para>
-Lookup the IP address of the given host with the specified type (netbios suffix).
-The type defaults to 0x20 (workstation).
-</para>
-
-</refsect3>
-
-<refsect3>
-<title>LOOKUP LDAP [<replaceable>DOMAIN</replaceable></title>
-
-<para>Give IP address of LDAP server of specified <replaceable>DOMAIN</replaceable>. Defaults to local domain.</para>
-
-</refsect3>
-
-<refsect3>
-<title>LOOKUP KDC [<replaceable>REALM</replaceable>]</title>
-
-<para>Give IP address of KDC for the specified <replaceable>REALM</replaceable>.
-Defaults to local realm.</para>
-
-</refsect3>
-
-<refsect3>
-<title>LOOKUP DC [<replaceable>DOMAIN</replaceable>]</title>
-
-<para>Give IP's of Domain Controllers for specified <replaceable>
-DOMAIN</replaceable>. Defaults to local domain.</para>
-
-</refsect3>
-
-<refsect3>
-<title>LOOKUP MASTER <replaceable>DOMAIN</replaceable></title>
-
-<para>Give IP of master browser for specified <replaceable>DOMAIN</replaceable>
-or workgroup. Defaults to local domain.</para>
-
-</refsect3>
-
-</refsect2>
-
-<refsect2>
-<title>CACHE</title>
-
-<para>Samba uses a general caching interface called 'gencache'. It
-can be controlled using 'NET CACHE'.</para>
-
-<para>All the timeout parameters support the suffixes:
-
-<simplelist>
-<member>s - Seconds</member>
-<member>m - Minutes</member>
-<member>h - Hours</member>
-<member>d - Days</member>
-<member>w - Weeks</member>
-</simplelist>
-
-</para>
-
-<refsect3>
-<title>CACHE ADD <replaceable>key</replaceable> <replaceable>data</replaceable> <replaceable>time-out</replaceable></title>
-
-<para>Add specified key+data to the cache with the given timeout.</para>
-
-</refsect3>
-
-<refsect3>
-<title>CACHE DEL <replaceable>key</replaceable></title>
-
-<para>Delete key from the cache.</para>
-
-</refsect3>
-
-<refsect3>
-<title>CACHE SET <replaceable>key</replaceable> <replaceable>data</replaceable> <replaceable>time-out</replaceable></title>
-
-<para>Update data of existing cache entry.</para>
-
-</refsect3>
-
-<refsect3>
-<title>CACHE SEARCH <replaceable>PATTERN</replaceable></title>
-
-<para>Search for the specified pattern in the cache data.</para>
-
-</refsect3>
-
-<refsect3>
-<title>CACHE LIST</title>
-
-<para>
-List all current items in the cache.
-</para>
-
-</refsect3>
-
-<refsect3>
-<title>CACHE FLUSH</title>
-
-<para>Remove all the current items from the cache.</para>
-
-</refsect3>
-
-</refsect2>
-
-<refsect2>
-<title>GETLOCALSID [DOMAIN]</title>
-
-<para>Print the SID of the specified domain, or if the parameter is
-omitted, the SID of the domain the local server is in.</para>
-
-</refsect2>
-
-<refsect2>
-<title>SETLOCALSID S-1-5-21-x-y-z</title>
-
-<para>Sets domain sid for the local server to the specified SID.</para>
-
-</refsect2>
-
-<refsect2>
-<title>GROUPMAP</title>
-
-<para>Manage the mappings between Windows group SIDs and UNIX groups.
-Parameters take the for "parameter=value". Common options include:</para>
-
-<itemizedlist>
-<listitem><para>unixgroup - Name of the UNIX group</para></listitem>
-<listitem><para>ntgroup - Name of the Windows NT group (must be
- resolvable to a SID</para></listitem>
-<listitem><para>rid - Unsigned 32-bit integer</para></listitem>
-<listitem><para>sid - Full SID in the form of "S-1-..."</para></listitem>
-<listitem><para>type - Type of the group; either 'domain', 'local',
- or 'builtin'</para></listitem>
-<listitem><para>comment - Freeform text description of the group</para></listitem>
-</itemizedlist>
-
-<refsect3>
-<title>GROUPMAP ADD</title>
-
-<para>Add a new group mapping entry</para>
-
-<para>net groupmap add {rid=int|sid=string} unixgroup=string [type={domain|local|builtin}] [ntgroup=string] [comment=string]</para>
-
-</refsect3>
-
-<refsect3>
-<title>GROUPMAP DELETE</title>
-
-<para>Delete a group mapping entry</para>
-
-<para>net groupmap delete {ntgroup=string|sid=SID}</para>
-
-</refsect3>
-
-<refsect3>
-<title>GROUPMAP MODIFY</title>
-
-<para>Update en existing group entry</para>
-
-<para>net groupmap modify {ntgroup=string|sid=SID} [unixgroup=string] [comment=string] [type={domain|local}</para>
-</refsect3>
-
-<refsect3>
-<title>GROUPMAP LIST</title>
-
-<para>List existing group mapping entries</para>
-
-<para>net groupmap list [verbose] [ntgroup=string] [sid=SID]</para>
-
-</refsect3>
-</refsect2>
-
-
-
-<refsect2>
-<title>MAXRID</title>
-
-<para>Prints out the highest RID currently in use on the local
-server (by the active 'passdb backend').
-</para>
-
-</refsect2>
-
-<refsect2>
-<title>RPC INFO</title>
-
-<para>Print information about the domain of the remote server,
-such as domain name, domain sid and number of users and groups.
-</para>
-
-</refsect2>
-
-<refsect2>
-<title>[RPC|ADS] TESTJOIN</title>
-
-<para>Check whether participation in a domain is still valid.</para>
-
-</refsect2>
-
-<refsect2>
-<title>[RPC|ADS] CHANGETRUSTPW</title>
-
-<para>Force change of domain trust password.</para>
-
-</refsect2>
-
-<refsect2>
-<title>RPC TRUSTDOM</title>
-
-<refsect3>
-<title>RPC TRUSTDOM ADD <replaceable>DOMAIN</replaceable></title>
-
-<para>Add a interdomain trust account for
-<replaceable>DOMAIN</replaceable> to the remote server.
-</para>
-
-</refsect3>
-
-<refsect3>
-<title>RPC TRUSTDOM DEL <replaceable>DOMAIM</replaceable></title>
-
-<para>Remove interdomain trust account for
-<replaceable>DOMAIN</replaceable> from the remote server.
-</para>
-
-&not.implemented;
-
-</refsect3>
-
-<refsect3>
-<title>RPC TRUSTDOM ESTABLISH <replaceable>DOMAIN</replaceable></title>
-
-<para>
-Establish a trust relationship to a trusting domain.
-Interdomain account must already be created on the remote PDC.
-</para>
-
-</refsect3>
-
-<refsect3>
-<title>RPC TRUSTDOM REVOKE <replaceable>DOMAIN</replaceable></title>
-<para>Abandon relationship to trusted domain</para>
-
-</refsect3>
-
-<refsect3>
-<title>RPC TRUSTDOM LIST</title>
-
-<para>List all current interdomain trust relationships.</para>
-
-</refsect3>
-
-</refsect2>
-
-<refsect2>
-<title>RPC ABORTSHUTDOWN</title>
-
-<para>Abort the shutdown of a remote server.</para>
-
-</refsect2>
-
-<refsect2>
-<title>SHUTDOWN [-t timeout] [-r] [-f] [-C message]</title>
-
-<para>Shut down the remote server.</para>
-
-<variablelist>
-&net.arg.shutdown;
-<varlistentry>
-<term>-C message</term>
-<listitem><para>Display the specified message on the screen to
-announce the shutdown.</para></listitem>
-</varlistentry>
-</variablelist>
-
-</refsect2>
-
-<refsect2>
-<title>SAMDUMP</title>
-
-<para>Print out sam database of remote server. You need
-to run this on either a BDC. <!--
-Is that correct? - Jelmer --></para>
-</refsect2>
-
-<refsect2>
-<title>VAMPIRE</title>
-
-<para>Export users, aliases and groups from remote server to
-local server. Can only be run an a BDC.
-</para>
-
-</refsect2>
-
-<refsect2>
-<title>GETSID</title>
-
-<para>Fetch domain SID and store it in the local <filename>secrets.tdb</filename>. </para>
-
-</refsect2>
-
-<refsect2>
-<title>ADS LEAVE</title>
-
-<para>Make the remote host leave the domain it is part of. </para>
-
-</refsect2>
-
-<refsect2>
-<title>ADS STATUS</title>
-
-<para>Print out status of machine account of the local machine in ADS.
-Prints out quite some debug info. Aimed at developers, regular
-users should use <command>NET ADS TESTJOIN</command>.</para>
-
-</refsect2>
-
-<refsect2>
-<title>ADS PRINTER</title>
-
-<refsect3>
-<title>ADS PRINTER INFO [<replaceable>PRINTER</replaceable>] [<replaceable>SERVER</replaceable>]</title>
-
-<para>
-Lookup info for <replaceable>PRINTER</replaceable> on <replaceable>SERVER</replaceable>. The printer name defaults to "*", the
-server name defaults to the local host.</para>
-
-</refsect3>
-
-<refsect3>
-<title>ADS PRINTER PUBLISH <replaceable>PRINTER</replaceable></title>
-
-<para>Publish specified printer using ADS.</para>
-
-</refsect3>
-
-<refsect3>
-<title>ADS PRINTER REMOVE <replaceable>PRINTER</replaceable></title>
-
-<para>Remove specified printer from ADS directory.</para>
-
-</refsect3>
+ <variablelist>
+ <varlistentry>
+ <term></term>
+ <listitem><para>
+ Without any options, the <command>NET TIME</command> command
+ displays the time on the remote server.
+ </para></listitem>
+ </varlistentry>
-</refsect2>
+ <varlistentry>
+ <term>SYSTEM</term>
+ <listitem><para>
+ Displays the time on the remote server in a format ready for /bin/date
+ </para></listitem>
+ </varlistentry>
-<refsect2>
-<title>ADS SEARCH <replaceable>EXPRESSION</replaceable> <replaceable>ATTRIBUTES...</replaceable></title>
+ <varlistentry>
+ <term>SET</term>
+ <listitem><para>
+ Tries to set the date and time of the local server to that on
+ the remote server using /bin/date.
+ </para></listitem>
+ </varlistentry>
-<para>Perform a raw LDAP search on a ADS server and dump the results. The
-expression is a standard LDAP search expression, and the
-attributes are a list of LDAP fields to show in the results.</para>
+ <varlistentry>
+ <term>ZONE</term>
+ <listitem><para>
+ Displays the timezone in hours from GMT on the remote computer.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+</refsect1>
-<para>Example: <userinput>net ads search '(objectCategory=group)' sAMAccountName</userinput>
-</para>
+<refsect1>
+ <title>RPC</title>
-</refsect2>
+ <para>The <command>NET RPC</command> command allows you to do various
+ NT4 operations.</para>
-<refsect2>
-<title>ADS DN <replaceable>DN</replaceable> <replaceable>(attributes)</replaceable></title>
+ <variablelist>
+ <varlistentry>
+ <term>JOIN -U username[%password] [options]</term>
+ <listitem><para>
+ Join a domain with specified username and password. Password
+ will be prompted if none is specified.</para>
+ </listitem>
+ </varlistentry>
-<para>
-Perform a raw LDAP search on a ADS server and dump the results. The
-DN standard LDAP DN, and the attributes are a list of LDAP fields
-to show in the result.
-</para>
+ <varlistentry>
+ <term>JOIN [options except -U]</term>
+ <listitem><para>
+ to join a domain created in server manager
+ </para></listitem>
+ </varlistentry>
-<para>Example: <userinput>net ads dn 'CN=administrator,CN=Users,DC=my,DC=domain' SAMAccountName</userinput></para>
+ <varlistentry>
+ <term>USER [misc. options] [targets]</term>
+ <listitem><para>
+ List users
+ </para></listitem>
+ </varlistentry>
-</refsect2>
+ <varlistentry>
+ <term>USER DELETE &lt;name&gt; [misc options]</term>
+ <listitem><para>
+ delete specified user
+ </para></listitem>
+ </varlistentry>
-<refsect2>
-<title>WORKGROUP</title>
+ <varlistentry>
+ <term>USER INFO &lt;name&gt; [misc options]</term>
+ <listitem><para>
+ list the domain groups of the specified user
+ </para></listitem>
+ </varlistentry>
-<para>Print out workgroup name for specified kerberos realm.</para>
+ <varlistentry>
+ <term>USER ADD &lt;name&gt; [password] [-F user flags] [misc. options</term>
+ <listitem><para>
+ Add specified user
+ </para></listitem>
+ </varlistentry>
-</refsect2>
+ <varlistentry>
+ <term>GROUP [misc options] [targets]</term>
+ <listitem><para>
+ List user groups
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>GROUP DELETE &lt;name&gt; [misc. options] [targets]</term>
+ <listitem><para>
+ Delete specified group
+ </para></listitem>
+ </varlistentry>
-<refsect2>
-<title>HELP [COMMAND]</title>
+ <varlistentry>
+ <term>GROUP ADD &lt;name&gt; [-C comment]</term>
+ <listitem><para>
+ Create specified group
+ </para></listitem>
+ </varlistentry>
-<para>Gives usage information for the specified command.</para>
+ <varlistentry>
+ <term>SHARE [misc. options] [targets]</term>
+ <listitem><para>
+ enumerates all exported resources (network shares) on target server
+ </para></listitem>
+ </varlistentry>
-</refsect2>
+ <varlistentry>
+ <term>SHARE ADD &lt;name=serverpath&gt; [misc. options] [targets]</term>
+ <listitem><para>
+ Adds a share from a server (makes the export active)
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>SHARE DELETE &lt;sharenam</term>
+ <listitem><para></para></listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1>
<title>VERSION</title>
- <para>This man page is complete for version 3.0 of the Samba
+ <para>This man page is incomplete for version 3.0 of the Samba
suite.</para>
</refsect1>
@@ -895,7 +339,9 @@ to show in the result.
by the Samba Team as an Open Source project similar
to the way the Linux kernel is developed.</para>
- <para>The net manpage was written by Jelmer Vernooij.</para>
+ <para>The original Samba man pages were written by Karl Auer.
+ The current set of manpages and documentation is maintained
+ by the Samba Team in the same fashion as the Samba source code.</para>
</refsect1>
diff --git a/docs/docbook/manpages/nmbd.8.sgml b/docs/docbook/manpages/nmbd.8.sgml
index f2b4ac5a05..db920c79a1 100644
--- a/docs/docbook/manpages/nmbd.8.sgml
+++ b/docs/docbook/manpages/nmbd.8.sgml
@@ -1,7 +1,5 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-<refentry id="nmbd.8">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="nmbd">
<refmeta>
<refentrytitle>nmbd</refentrytitle>
@@ -37,8 +35,7 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This program is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This program is part of the Samba suite.</para>
<para><command>nmbd</command> is a server that understands
and can reply to NetBIOS over IP name service requests, like
@@ -60,8 +57,8 @@
option (see OPTIONS below). Thus <command>nmbd</command> will
reply to broadcast queries for its own name(s). Additional
names for <command>nmbd</command> to respond on can be set
- via parameters in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> configuration file.</para>
+ via parameters in the <ulink url="smb.conf.5.html"><filename>
+ smb.conf(5)</filename></ulink> configuration file.</para>
<para><command>nmbd</command> can also be used as a WINS
(Windows Internet Name Server) server. What this basically means
@@ -114,27 +111,46 @@
</varlistentry>
<varlistentry>
+ <term>-a</term>
+ <listitem><para>If this parameter is specified, each new
+ connection will append log messages to the log file.
+ This is the default.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-i</term>
<listitem><para>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 daemon mode when run from the
command line. <command>nmbd</command> also logs to standard
- output, as if the <constant>-S</constant> parameter had been
+ output, as if the <command>-S</command> parameter had been
given. </para></listitem>
</varlistentry>
- &stdarg.help;
+ <varlistentry>
+ <term>-o</term>
+ <listitem><para>If this parameter is specified, the
+ log files will be overwritten when opened. By default,
+ <command>smbd</command> will append entries to the log
+ files.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-h</term>
+ <listitem><para>Prints the help information (usage)
+ for <command>nmbd</command>.</para></listitem>
+ </varlistentry>
<varlistentry>
<term>-H &lt;filename&gt;</term>
<listitem><para>NetBIOS lmhosts file. The lmhosts
file is a list of NetBIOS names to IP addresses that
is loaded by the nmbd server and used via the name
- resolution mechanism <ulink url="smb.conf.5.html#nameresolveorder"><parameter>name resolve
- order</parameter></ulink> described in <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> to resolve any
- NetBIOS name queries needed by the server. Note
+ resolution mechanism <ulink url="smb.conf.5.html#nameresolveorder">
+ name resolve order</ulink> described in <ulink
+ url="smb.conf.5.html"> <filename>smb.conf(5)</filename></ulink>
+ to resolve any NetBIOS name queries needed by the server. Note
that the contents of this file are <emphasis>NOT</emphasis>
used by <command>nmbd</command> to answer any name queries.
Adding a line to this file affects name NetBIOS resolution
@@ -144,13 +160,71 @@
Samba as part of the build process. Common defaults
are <filename>/usr/local/samba/lib/lmhosts</filename>,
<filename>/usr/samba/lib/lmhosts</filename> or
- <filename>/etc/samba/lmhosts</filename>. See the <citerefentry><refentrytitle>lmhosts</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> man page for details on the contents of this file.</para></listitem>
+ <filename>/etc/lmhosts</filename>. See the
+ <ulink url="lmhosts.5.html"><filename>lmhosts(5)</filename></ulink>
+ man page for details on the contents of this file.</para></listitem>
</varlistentry>
- &popt.common.samba;
+ <varlistentry>
+ <term>-V</term>
+ <listitem><para>Prints the version number for
+ <command>nmbd</command>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-d &lt;debug level&gt;</term>
+ <listitem><para>debuglevel is an integer
+ from 0 to 10. The default value if this parameter is
+ not specified is zero.</para>
+
+ <para>The higher this value, the more detail will
+ be logged to the log files about the activities of the
+ server. At level 0, only critical errors and serious
+ warnings will be logged. Level 1 is a reasonable level for
+ day to day running - it generates a small amount of
+ information about operations carried out.</para>
+
+ <para>Levels above 1 will generate considerable amounts
+ of log data, and should only be used when investigating
+ a problem. Levels above 3 are designed for use only by developers
+ and generate HUGE amounts of log data, most of which is extremely
+ cryptic.</para>
+
+ <para>Note that specifying this parameter here will override
+ the <ulink url="smb.conf.5.html#loglevel">log level</ulink>
+ parameter in the <ulink url="smb.conf.5.html"><filename>
+ smb.conf(5)</filename></ulink> file.</para></listitem>
+ </varlistentry>
<varlistentry>
+ <term>-l &lt;log directory&gt;</term>
+ <listitem><para>The -l parameter specifies a directory
+ into which the "log.nmbd" log file will be created
+ for operational data from the running <command>nmbd</command>
+ server. The default log directory is compiled into Samba
+ as part of the build process. Common defaults are <filename>
+ /usr/local/samba/var/log.nmb</filename>, <filename>
+ /usr/samba/var/log.nmb</filename> or
+ <filename>/var/log/log.nmb</filename>. <emphasis>Beware:</emphasis>
+ If the directory specified does not exist, <command>nmbd</command>
+ will log to the default debug log location defined at compile time.
+ </para></listitem>
+ </varlistentry>
+
+
+ <varlistentry>
+ <term>-n &lt;primary NetBIOS name&gt;</term>
+ <listitem><para>This option allows you to override
+ the NetBIOS name that Samba uses for itself. This is identical
+ to setting the <ulink url="smb.conf.5.html#netbiosname">
+ NetBIOS name</ulink> parameter in the <ulink url="smb.conf.5.html">
+ <filename>smb.conf</filename></ulink> file. However, a command
+ line setting will take precedence over settings in
+ <filename>smb.conf</filename>.</para></listitem>
+ </varlistentry>
+
+
+ <varlistentry>
<term>-p &lt;UDP port number&gt;</term>
<listitem><para>UDP port number is a positive integer value.
This option changes the default UDP port number (normally 137)
@@ -159,6 +233,18 @@
won't need help!</para></listitem>
</varlistentry>
+ <varlistentry>
+ <term>-s &lt;configuration file&gt;</term>
+ <listitem><para>The default configuration file name
+ is set at build time, typically as <filename>
+ /usr/local/samba/lib/smb.conf</filename>, but
+ this may be changed when Samba is autoconfigured.</para>
+
+ <para>The file specified contains the configuration details
+ required by the server. See <ulink url="smb.conf.5.html">
+ <filename>smb.conf(5)</filename></ulink> for more information.
+ </para></listitem>
+ </varlistentry>
</variablelist>
</refsect1>
@@ -172,7 +258,7 @@
<command>inetd</command> meta-daemon, this file
must contain suitable startup information for the
meta-daemon. See the <ulink
- url="install.html">install</ulink> document
+ url="UNIX_INSTALL.html">UNIX_INSTALL.html</ulink> document
for details.
</para></listitem>
</varlistentry>
@@ -185,7 +271,7 @@
<para>If running the server as a daemon at startup,
this file will need to contain an appropriate startup
sequence for the server. See the <ulink
- url="install.html">"How to Install and Test SAMBA"</ulink> document
+ url="UNIX_INSTALL.html">UNIX_INSTALL.html</ulink> document
for details.</para></listitem>
</varlistentry>
@@ -195,23 +281,21 @@
meta-daemon <command>inetd</command>, this file
must contain a mapping of service name (e.g., netbios-ssn)
to service port (e.g., 139) and protocol type (e.g., tcp).
- See the <ulink url="install.html">"How to Install and Test SAMBA"</ulink>
+ See the <ulink url="UNIX_INSTALL.html">UNIX_INSTALL.html</ulink>
document for details.</para></listitem>
</varlistentry>
<varlistentry>
<term><filename>/usr/local/samba/lib/smb.conf</filename></term>
- <listitem><para>This is the default location of
- the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> server
- configuration file. Other common places that systems
+ <listitem><para>This is the default location of the
+ <ulink url="smb.conf.5.html"><filename>smb.conf</filename></ulink>
+ server configuration file. Other common places that systems
install this file are <filename>/usr/samba/lib/smb.conf</filename>
- and <filename>/etc/samba/smb.conf</filename>.</para>
+ and <filename>/etc/smb.conf</filename>.</para>
<para>When run as a WINS server (see the
- <ulink url="smb.conf.5.html#WINSSUPPORT"><constant>wins support</constant></ulink>
- parameter in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> man page),
+ <ulink url="smb.conf.5.html#WINSSUPPORT">wins support</ulink>
+ parameter in the <filename>smb.conf(5)</filename> man page),
<command>nmbd</command>
will store the WINS database in the file <filename>wins.dat</filename>
in the <filename>var/locks</filename> directory configured under
@@ -219,9 +303,9 @@
<para>If <command>nmbd</command> is acting as a <emphasis>
browse master</emphasis> (see the <ulink
- url="smb.conf.5.html#LOCALMASTER"><constant>local master</constant></ulink>
- parameter in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> man page, <command>nmbd</command>
+ url="smb.conf.5.html#LOCALMASTER">local master</ulink>
+ parameter in the <filename>smb.conf(5)</filename> man page,
+ <command>nmbd</command>
will store the browsing database in the file <filename>browse.dat
</filename> in the <filename>var/locks</filename> directory
configured under wherever Samba was configured to install itself.
@@ -247,11 +331,10 @@
cause <command>nmbd</command> to dump out its server database in
the <filename>log.nmb</filename> file.</para>
- <para>The debug log level of nmbd may be raised or lowered
- using <citerefentry><refentrytitle>smbcontrol</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry> (SIGUSR[1|2] signals
- are no longer used since Samba 2.2). This is to allow
- transient problems to be diagnosed, whilst still running
+ <para>The debug log level of nmbd may be raised or lowered using
+ <ulink url="smbcontrol.1.html"><command>smbcontrol(1)</command>
+ </ulink> (SIGUSR[1|2] signals are no longer used in Samba 2.2). This is
+ to allow transient problems to be diagnosed, whilst still running
at a normally low log level.</para>
</refsect1>
@@ -265,15 +348,14 @@
<refsect1>
<title>SEE ALSO</title>
- <para>
- <citerefentry><refentrytitle>inetd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, and the Internet
- RFC's <filename>rfc1001.txt</filename>, <filename>rfc1002.txt</filename>.
+ <para><command>inetd(8)</command>, <ulink
+ url="smbd.8.html"><command>smbd(8)</command></ulink>,
+ <ulink url="smb.conf.5.html"><filename>smb.conf(5)</filename>
+ </ulink>, <ulink url="smbclient.1.html"><command>smbclient(1)
+ </command></ulink>, <ulink url="testparm.1.html"><command>
+ testparm(1)</command></ulink>, <ulink url="testprns.1.html">
+ <command>testprns(1)</command></ulink>, and the Internet RFC's
+ <filename>rfc1001.txt</filename>, <filename>rfc1002.txt</filename>.
In addition the CIFS (formerly SMB) specification is available
as a link from the Web page <ulink url="http://samba.org/cifs/">
http://samba.org/cifs/</ulink>.</para>
@@ -289,11 +371,11 @@
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook
- XML 4.2 for Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/nmblookup.1.sgml b/docs/docbook/manpages/nmblookup.1.sgml
index b4a96e96ba..7bec00949c 100644
--- a/docs/docbook/manpages/nmblookup.1.sgml
+++ b/docs/docbook/manpages/nmblookup.1.sgml
@@ -1,6 +1,4 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<refentry id="nmblookup">
<refmeta>
@@ -38,8 +36,8 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para><command>nmblookup</command> is used to query NetBIOS names
and map them to IP addresses in a network using NetBIOS over TCP/IP
@@ -71,7 +69,7 @@
query to a machine running a WINS server and the user wishes
to query the names in the WINS server. If this bit is unset
the normal (broadcast responding) NetBIOS processing code
- on a machine is used instead. See RFC1001, RFC1002 for details.
+ on a machine is used instead. See rfc1001, rfc1002 for details.
</para></listitem>
</varlistentry>
@@ -91,8 +89,8 @@
where it ignores the source port of the requesting packet
and only replies to UDP port 137. Unfortunately, on most UNIX
systems root privilege is needed to bind to this port, and
- in addition, if the <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> daemon is running on this machine it also binds to this port.
+ in addition, if the <ulink url="nmbd.8.html">nmbd(8)</ulink>
+ daemon is running on this machine it also binds to this port.
</para></listitem>
</varlistentry>
@@ -106,8 +104,12 @@
- &popt.common.connection;
- &stdarg.help;
+ <varlistentry>
+ <term>-h</term>
+ <listitem><para>Print a help (usage) message.</para></listitem>
+ </varlistentry>
+
+
<varlistentry>
<term>-B &lt;broadcast address&gt;</term>
@@ -116,8 +118,7 @@
query to the broadcast address of the network interfaces as
either auto-detected or defined in the <ulink
url="smb.conf.5.html#INTERFACES"><parameter>interfaces</parameter>
- </ulink> parameter of the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file.
+ </ulink> parameter of the <filename>smb.conf (5)</filename> file.
</para></listitem>
</varlistentry>
@@ -132,8 +133,48 @@
</varlistentry>
- &popt.common.samba;
+ <varlistentry>
+ <term>-d &lt;debuglevel&gt;</term>
+ <listitem><para>debuglevel is an integer from 0 to 10.</para>
+ <para>The default value if this parameter is not specified
+ is zero.</para>
+
+ <para>The higher this value, the more detail will be logged
+ about the activities of <command>nmblookup</command>. At level
+ 0, only critical errors and serious warnings will be logged.</para>
+
+ <para>Levels above 1 will generate considerable amounts of
+ log data, and should only be used when investigating a problem.
+ Levels above 3 are designed for use only by developers and
+ generate HUGE amounts of data, most of which is extremely cryptic.</para>
+
+ <para>Note that specifying this parameter here will override
+ the <ulink url="smb.conf.5.html#LOGLEVEL"><parameter>
+ log level</parameter></ulink> parameter in the <filename>
+ smb.conf(5)</filename> file.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-s &lt;smb.conf&gt;</term>
+ <listitem><para>This parameter specifies the pathname to
+ the Samba configuration file, <ulink url="smb.conf.5.html">
+ smb.conf(5)</ulink>. This file controls all aspects of
+ the Samba setup on the machine.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-i &lt;scope&gt;</term>
+ <listitem><para>This specifies a NetBIOS scope that
+ <command>nmblookup</command> will use to communicate with when
+ generating NetBIOS names. For details on the use of NetBIOS
+ scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes are
+ <emphasis>very</emphasis> rarely used, only set this parameter
+ if you are the system administrator in charge of all the
+ NetBIOS systems you communicate with.</para></listitem>
+ </varlistentry>
+
+
<varlistentry>
<term>-T</term>
<listitem><para>This causes any IP addresses found in the
@@ -160,7 +201,7 @@
<listitem><para>This is the NetBIOS name being queried. Depending
upon the previous options this may be a NetBIOS name or IP address.
If a NetBIOS name then the different name types may be specified
- by appending '#&lt;type&gt;' to the name. This name may also be
+ by appending '#&lt;type&gt' to the name. This name may also be
'*', which will return all registered names within a broadcast
area.</para></listitem>
</varlistentry>
@@ -173,8 +214,8 @@
<para><command>nmblookup</command> can be used to query
a WINS server (in the same way <command>nslookup</command> is
- used to query DNS servers). To query a WINS server, <command>nmblookup</command>
- must be called like this:</para>
+ used to query DNS servers). To query a WINS server,
+ <command>nmblookup</command> must be called like this:</para>
<para><command>nmblookup -U server -R 'name'</command></para>
@@ -195,10 +236,10 @@
<refsect1>
<title>SEE ALSO</title>
- <para><citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry>, and <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>.</para>
+ <para><ulink url="nmbd.8.html"><command>nmbd(8)</command></ulink>,
+ <ulink url="samba.7.html">samba(7)</ulink>, and <ulink
+ url="smb.conf.5.html">smb.conf(5)</ulink>
+ </para>
</refsect1>
<refsect1>
@@ -211,11 +252,11 @@
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook
- XML 4.2 for Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/ntlm_auth.1.sgml b/docs/docbook/manpages/ntlm_auth.1.sgml
deleted file mode 100644
index 42a362cd41..0000000000
--- a/docs/docbook/manpages/ntlm_auth.1.sgml
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-<refentry id="ntlm-auth.1">
-
-<refmeta>
- <refentrytitle>ntlm_auth</refentrytitle>
- <manvolnum>1</manvolnum>
-</refmeta>
-
-
-<refnamediv>
- <refname>ntlm_auth</refname>
- <refpurpose>tool to allow external access to Winbind's NTLM authentication function</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
- <cmdsynopsis>
- <command>ntlm_auth</command>
- <arg choice="opt">-d debuglevel</arg>
- <arg choice="opt">-l logfile</arg>
- <arg choice="opt">-s &lt;smb config file&gt;</arg>
- </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
- <title>DESCRIPTION</title>
-
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
-
- <para><command>ntlm_auth</command> is a helper utility that authenticates
- users using NT/LM authentication. It returns 0 if the users is authenticated
- successfully and 1 if access was denied. ntlm_auth uses winbind to access
- the user and authentication data for a domain. This utility
- is only to be used by other programs (currently squid).
- </para>
-</refsect1>
-
-
-<refsect1>
- <title>OPTIONS</title>
-
- <variablelist>
- <varlistentry>
- <term>--helper-protocol=PROTO</term>
- <listitem><para>
- Operate as a stdio-based helper
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>--username=USERNAME</term>
- <listitem><para>
- Specify username of user to authenticate
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>--domain=DOMAIN</term>
- <listitem><para>
- Specify domain of user to authenticate
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>--workstation=WORKSTATION</term>
- <listitem><para>
- Specify the workstation the user authenticated from
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>--challenge=STRING</term>
- <listitem><para>challenge (HEX encoded)</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>--lm-response=RESPONSE</term>
- <listitem><para>LM Response to the challenge (HEX encoded)</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>--nt-response=RESPONSE</term>
- <listitem><para>NT or NTLMv2 Response to the challenge (HEX encoded)</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>--password=PASSWORD</term>
- <listitem><para>User's plaintext password</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>--request-lm-key</term>
- <listitem><para>Retreive LM session key</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>--request-nt-key</term>
- <listitem><para>Request NT key</para></listitem>
- </varlistentry>
-
- &popt.common.samba;
- &stdarg.help;
-
- </variablelist>
-</refsect1>
-
-<refsect1>
- <title>VERSION</title>
-
- <para>This man page is correct for version 3.0 of the Samba
- suite.</para>
-</refsect1>
-
-<refsect1>
- <title>AUTHOR</title>
-
- <para>The original Samba software and related utilities
- were created by Andrew Tridgell. Samba is now developed
- by the Samba Team as an Open Source project similar
- to the way the Linux kernel is developed.</para>
-
- <para>The ntlm_auth manpage was written by Jelmer Vernooij.</para>
-</refsect1>
-
-</refentry>
diff --git a/docs/docbook/manpages/pdbedit.8.sgml b/docs/docbook/manpages/pdbedit.8.sgml
index fc9a212c19..3454b7d7fa 100644
--- a/docs/docbook/manpages/pdbedit.8.sgml
+++ b/docs/docbook/manpages/pdbedit.8.sgml
@@ -1,7 +1,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
]>
-<refentry id="pdbedit.8">
+<refentry id="pdbedit">
<refmeta>
<refentrytitle>pdbedit</refentrytitle>
@@ -33,19 +33,18 @@
<arg choice="opt">-e passdb-backend</arg>
<arg choice="opt">-g</arg>
<arg choice="opt">-b passdb-backend</arg>
- <arg choice="opt">-g</arg>
<arg choice="opt">-d debuglevel</arg>
<arg choice="opt">-s configfile</arg>
<arg choice="opt">-P account-policy</arg>
- <arg choice="opt">-C value</arg>
+ <arg choice="opt">-V value</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para>The pdbedit program is used to manage the users accounts
stored in the sam database and can only be run by root.</para>
@@ -69,11 +68,12 @@
present in the users database.
This option prints a list of user/uid pairs separated by
the ':' character.</para>
+
<para>Example: <command>pdbedit -l</command></para>
- <para><screen>
-sorce:500:Simo Sorce
-samba:45:Test User
-</screen></para>
+ <para><programlisting>
+ sorce:500:Simo Sorce
+ samba:45:Test User
+ </programlisting></para>
</listitem>
</varlistentry>
@@ -86,26 +86,26 @@ samba:45:Test User
out the account fields in a descriptive format.</para>
<para>Example: <command>pdbedit -l -v</command></para>
- <para><screen>
----------------
-username: sorce
-user ID/Group: 500/500
-user RID/GRID: 2000/2001
-Full Name: Simo Sorce
-Home Directory: \\BERSERKER\sorce
-HomeDir Drive: H:
-Logon Script: \\BERSERKER\netlogon\sorce.bat
-Profile Path: \\BERSERKER\profile
----------------
-username: samba
-user ID/Group: 45/45
-user RID/GRID: 1090/1091
-Full Name: Test User
-Home Directory: \\BERSERKER\samba
-HomeDir Drive:
-Logon Script:
-Profile Path: \\BERSERKER\profile
-</screen></para>
+ <para><programlisting>
+ ---------------
+ username: sorce
+ user ID/Group: 500/500
+ user RID/GRID: 2000/2001
+ Full Name: Simo Sorce
+ Home Directory: \\BERSERKER\sorce
+ HomeDir Drive: H:
+ Logon Script: \\BERSERKER\netlogon\sorce.bat
+ Profile Path: \\BERSERKER\profile
+ ---------------
+ username: samba
+ user ID/Group: 45/45
+ user RID/GRID: 1090/1091
+ Full Name: Test User
+ Home Directory: \\BERSERKER\samba
+ HomeDir Drive:
+ Logon Script:
+ Profile Path: \\BERSERKER\profile
+ </programlisting></para>
</listitem>
</varlistentry>
@@ -116,15 +116,14 @@ Profile Path: \\BERSERKER\profile
<listitem><para>This option sets the "smbpasswd" listing format.
It will make pdbedit list the users in the database, printing
out the account fields in a format compatible with the
- <filename>smbpasswd</filename> file format. (see the
- <citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> for details)</para>
+ <filename>smbpasswd</filename> file format. (see the <ulink
+ url="smbpasswd.5.html"><filename>smbpasswd(5)</filename></ulink> for details)</para>
<para>Example: <command>pdbedit -l -w</command></para>
- <screen>
-sorce:500:508818B733CE64BEAAD3B435B51404EE:D2A2418EFC466A8A0F6B1DBB5C3DB80C:[UX ]:LCT-00000000:
-samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:BC281CE3F53B6A5146629CD4751D3490:[UX ]:LCT-3BFA1E8D:
-</screen>
+ <para><programlisting>
+ sorce:500:508818B733CE64BEAAD3B435B51404EE:D2A2418EFC466A8A0F6B1DBB5C3DB80C:[UX ]:LCT-00000000:
+ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:BC281CE3F53B6A5146629CD4751D3490:[UX ]:LCT-3BFA1E8D:
+ </programlisting></para>
</listitem>
</varlistentry>
@@ -138,6 +137,8 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:BC281CE3F53B6A5146629CD4751D3490:[UX
operations.</para>
</listitem>
</varlistentry>
+
+
<varlistentry>
<term>-f fullname</term>
@@ -162,6 +163,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:BC281CE3F53B6A5146629CD4751D3490:[UX
</listitem>
</varlistentry>
+
<varlistentry>
<term>-D drive</term>
<listitem><para>This option can be used while adding or
@@ -206,10 +208,9 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:BC281CE3F53B6A5146629CD4751D3490:[UX
ask for the password to be used.</para>
<para>Example: <command>pdbedit -a -u sorce</command>
-<programlisting>new password:
-retype new password
-</programlisting>
-</para>
+ <programlisting>new password:
+ retype new password</programlisting>
+ </para>
</listitem>
</varlistentry>
@@ -270,18 +271,7 @@ retype new password
<listitem><para>If you specify <parameter>-g</parameter>,
then <parameter>-i in-backend -e out-backend</parameter>
applies to the group mapping instead of the user database.
-
- <para>This option will ease migration from one passdb backend to
- another and will ease backing up.</para>
-
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-g</term>
- <listitem><para>If you specify <parameter>-g</parameter>,
- then <parameter>-i in-backend -e out-backend</parameter>
- applies to the group mapping instead of the user database.
+ </para>
<para>This option will ease migration from one passdb backend to
another and will ease backing up.</para>
@@ -305,30 +295,31 @@ retype new password
maximum password age and bad lockout attempt.</para>
<para>Example: <command>pdbedit -P "bad lockout attempt"</command></para>
-<para><programlisting>
-account policy value for bad lockout attempt is 0
-</programlisting></para>
+ <para><programlisting>
+ account policy value for bad lockout attempt is 0
+ </programlisting></para>
</listitem>
</varlistentry>
<varlistentry>
- <term>-C account-policy-value</term>
+ <term>-V account-policy-value</term>
<listitem><para>Sets an account policy to a specified value.
This option may only be used in conjunction
with the <parameter>-P</parameter> option.
</para>
- <para>Example: <command>pdbedit -P "bad lockout attempt" -C 3</command></para>
-<para><programlisting>
-account policy value for bad lockout attempt was 0
-account policy value for bad lockout attempt is now 3
-</programlisting></para>
+ <para>Example: <command>pdbedit -P "bad lockout attempt" -V 3</command></para>
+ <para><programlisting>
+ account policy value for bad lockout attempt was 0
+ account policy value for bad lockout attempt is now 3
+ </programlisting></para>
</listitem>
</varlistentry>
+ &stdarg.debuglevel;
&stdarg.help;
- &popt.common.samba;
+ &stdarg.configfile;
</variablelist>
</refsect1>
@@ -350,9 +341,9 @@ account policy value for bad lockout attempt is now 3
<refsect1>
<title>SEE ALSO</title>
- <para><citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry></para>
+ <para><ulink url="smbpasswd.8.html">smbpasswd(8)</ulink>,
+ <ulink url="samba.7.html">samba(7)</ulink>
+ </para>
</refsect1>
<refsect1>
@@ -365,11 +356,11 @@ account policy value for bad lockout attempt is now 3
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook
- XML 4.2 for Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/rpcclient.1.sgml b/docs/docbook/manpages/rpcclient.1.sgml
index 789ed6b5cf..10e0ff438d 100644
--- a/docs/docbook/manpages/rpcclient.1.sgml
+++ b/docs/docbook/manpages/rpcclient.1.sgml
@@ -1,7 +1,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
]>
-<refentry id="rpcclient.1">
+<refentry id="rpcclient">
<refmeta>
<refentrytitle>rpcclient</refentrytitle>
@@ -36,8 +36,8 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para><command>rpcclient</command> is a utility initially developed
to test MS-RPC functionality in Samba itself. It has undergone
@@ -56,9 +56,28 @@
<listitem><para>NetBIOS name of Server to which to connect.
The server can be any SMB/CIFS server. The name is
resolved using the <ulink url="smb.conf.5.html#NAMERESOLVEORDER">
- <parameter>name resolve order</parameter></ulink> line from <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>.</para></listitem>
- </varlistentry>
+ <parameter>name resolve order</parameter></ulink> line from
+ <filename>smb.conf(5)</filename>.</para></listitem>
+ </varlistentry>
+
+
+ <varlistentry>
+ <term>-A|--authfile=filename</term>
+ <listitem><para>This option allows
+ you to specify a file from which to read the username and
+ password used in the connection. The format of the file is
+ </para>
+
+ <para><programlisting>
+ username = &lt;value&gt;
+ password = &lt;value&gt;
+ domain = &lt;value&gt;
+ </programlisting></para>
+
+ <para>Make certain that the permissions on the file restrict
+ access from unwanted users. </para></listitem>
+ </varlistentry>
+
<varlistentry>
@@ -66,8 +85,13 @@
<listitem><para>execute semicolon separated commands (listed
below)) </para></listitem>
</varlistentry>
-
+
+
+
+ &stdarg.debuglevel;
+ &stdarg.help;
+
<varlistentry>
<term>-I IP-address</term>
<listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to.
@@ -86,133 +110,117 @@
above. </para></listitem>
</varlistentry>
- &popt.common.samba;
- &popt.common.credentials;
- &popt.common.connection;
- &stdarg.help;
- </variablelist>
-</refsect1>
+
+ <varlistentry>
+ <term>-l|--logfile=logbasename</term>
+ <listitem><para>File name for log/debug files. The extension
+ <constant>'.client'</constant> will be appended. The log file is
+ never removed by the client.
+ </para></listitem>
+ </varlistentry>
-<refsect1>
- <title>COMMANDS</title>
+
+ <varlistentry>
+ <term>-N|--nopass</term>
+ <listitem><para>instruct <command>rpcclient</command> not to ask
+ for a password. By default, <command>rpcclient</command> will
+ prompt for a password. See also the <parameter>-U</parameter>
+ option.</para></listitem>
+ </varlistentry>
- <refsect2>
- <title>LSARPC</title>
+
+ <varlistentry>
+ <term>-s|--conf=smb.conf</term>
+ <listitem><para>Specifies the location of the all-important
+ <filename>smb.conf</filename> file. </para></listitem>
+ </varlistentry>
- <variablelist>
- <varlistentry><term>lsaquery</term><listitem><para>Query info policy</para></listitem></varlistentry>
+
+
+ <varlistentry>
+ <term>-U|--user=username[%password]</term>
+ <listitem><para>Sets the SMB username or username and password. </para>
- <varlistentry><term>lookupsids</term><listitem><para>Resolve a list
- of SIDs to usernames.
- </para></listitem></varlistentry>
+ <para>If %password is not specified, the user will be prompted. The
+ client will first check the <envar>USER</envar> environment variable, then the
+ <envar>LOGNAME</envar> variable and if either exists, the
+ string is uppercased. If these environmental variables are not
+ found, the username <constant>GUEST</constant> is used. </para>
+
+ <para>A third option is to use a credentials file which
+ contains the plaintext of the username and password. This
+ option is mainly provided for scripts where the admin does not
+ wish to pass the credentials on the command line or via environment
+ variables. If this method is used, make certain that the permissions
+ on the file restrict access from unwanted users. See the
+ <parameter>-A</parameter> for more details. </para>
- <varlistentry><term>lookupnames</term><listitem><para>Resolve a list
- of usernames to SIDs.
- </para></listitem></varlistentry>
+ <para>Be cautious about including passwords in scripts. Also, on
+ many systems the command line of a running process may be seen
+ via the <command>ps</command> command. To be safe always allow
+ <command>rpcclient</command> to prompt for a password and type
+ it in directly. </para></listitem>
+ </varlistentry>
- <varlistentry><term>enumtrusts</term><listitem><para>Enumerate trusted domains</para></listitem></varlistentry>
-
- <varlistentry><term>enumprivs</term><listitem><para>Enumerate privileges</para></listitem></varlistentry>
-
- <varlistentry><term>getdispname</term><listitem><para>Get the privilege name</para></listitem></varlistentry>
-
- <varlistentry><term>lsaenumsid</term><listitem><para>Enumerate the LSA SIDS</para></listitem></varlistentry>
-
- <varlistentry><term>lsaenumprivsaccount</term><listitem><para>Enumerate the privileges of an SID</para></listitem></varlistentry>
-
- <varlistentry><term>lsaenumacctrights</term><listitem><para>Enumerate the rights of an SID</para></listitem></varlistentry>
-
- <varlistentry><term>lsaenumacctwithright</term><listitem><para>Enumerate accounts with a right</para></listitem></varlistentry>
-
- <varlistentry><term>lsaaddacctrights</term><listitem><para>Add rights to an account</para></listitem></varlistentry>
-
- <varlistentry><term>lsaremoveacctrights</term><listitem><para>Remove rights from an account</para></listitem></varlistentry>
-
- <varlistentry><term>lsalookupprivvalue</term><listitem><para>Get a privilege value given its name</para></listitem></varlistentry>
-
- <varlistentry><term>lsaquerysecobj</term><listitem><para>Query LSA security object</para></listitem></varlistentry>
-
- </variablelist>
- </refsect2>
-
- <refsect2>
- <title>LSARPC-DS</title>
-
- <variablelist>
- <varlistentry><term>dsroledominfo</term><listitem><para>Get Primary Domain Information</para></listitem></varlistentry>
- </variablelist>
-
- <para> </para>
-
- <para><emphasis>DFS</emphasis></para>
- <variablelist>
- <varlistentry><term>dfsexist</term><listitem><para>Query DFS support</para></listitem></varlistentry>
- <varlistentry><term>dfsadd</term><listitem><para>Add a DFS share</para></listitem></varlistentry>
- <varlistentry><term>dfsremove</term><listitem><para>Remove a DFS share</para></listitem></varlistentry>
- <varlistentry><term>dfsgetinfo</term><listitem><para>Query DFS share info</para></listitem></varlistentry>
- <varlistentry><term>dfsenum</term><listitem><para>Enumerate dfs shares</para></listitem></varlistentry>
- </variablelist>
-
- </refsect2>
-
- <refsect2>
- <title>REG</title>
- <variablelist>
- <varlistentry><term>shutdown</term><listitem><para>Remote Shutdown</para></listitem></varlistentry>
- <varlistentry><term>abortshutdown</term><listitem><para>Abort Shutdown</para></listitem></varlistentry>
+
+
+
+ <varlistentry>
+ <term>-W|--workgroup=domain</term>
+ <listitem><para>Set the SMB domain of the username. This
+ overrides the default domain which is the domain defined in
+ smb.conf. If the domain specified is the same as the server's NetBIOS name,
+ it causes the client to log on using the server's local SAM (as
+ opposed to the Domain SAM). </para></listitem>
+ </varlistentry>
+
+
</variablelist>
+</refsect1>
- </refsect2>
- <refsect2>
- <title>SRVSVC</title>
+<refsect1>
+ <title>COMMANDS</title>
- <variablelist>
- <varlistentry><term>srvinfo</term><listitem><para>Server query info</para></listitem></varlistentry>
+ <para><emphasis>LSARPC</emphasis></para>
+ <itemizedlist>
+ <listitem><para><command>lsaquery</command></para></listitem>
- <varlistentry><term>netshareenum</term><listitem><para>Enumerate shares</para></listitem></varlistentry>
-
- <varlistentry><term>netfileenum</term><listitem><para>Enumerate open files</para></listitem></varlistentry>
+ <listitem><para><command>lookupsids</command> - Resolve a list
+ of SIDs to usernames.
+ </para></listitem>
- <varlistentry><term>netremotetod</term><listitem><para>Fetch remote time of day</para></listitem></varlistentry>
+ <listitem><para><command>lookupnames</command> - Resolve a list
+ of usernames to SIDs.
+ </para></listitem>
- </variablelist>
+ <listitem><para><command>enumtrusts</command></para></listitem>
+ </itemizedlist>
+ <para> </para>
+
- </refsect2>
- <refsect2>
- <title>SAMR</title>
+ <para><emphasis>SAMR</emphasis></para>
+ <itemizedlist>
+ <listitem><para><command>queryuser</command></para></listitem>
+ <listitem><para><command>querygroup</command></para></listitem>
+ <listitem><para><command>queryusergroups</command></para></listitem>
+ <listitem><para><command>querygroupmem</command></para></listitem>
+ <listitem><para><command>queryaliasmem</command></para></listitem>
+ <listitem><para><command>querydispinfo</command></para></listitem>
+ <listitem><para><command>querydominfo</command></para></listitem>
+ <listitem><para><command>enumdomgroups</command></para></listitem>
+ </itemizedlist>
+ <para> </para>
- <variablelist>
- <varlistentry><term>queryuser</term><listitem><para>Query user info</para></listitem></varlistentry>
- <varlistentry><term>querygroup</term><listitem><para>Query group info</para></listitem></varlistentry>
- <varlistentry><term>queryusergroups</term><listitem><para>Query user groups</para></listitem></varlistentry>
- <varlistentry><term>querygroupmem</term><listitem><para>Query group membership</para></listitem></varlistentry>
- <varlistentry><term>queryaliasmem</term><listitem><para>Query alias membership</para></listitem></varlistentry>
- <varlistentry><term>querydispinfo</term><listitem><para>Query display info</para></listitem></varlistentry>
- <varlistentry><term>querydominfo</term><listitem><para>Query domain info</para></listitem></varlistentry>
- <varlistentry><term>enumdomusers</term><listitem><para>Enumerate domain users</para></listitem></varlistentry>
- <varlistentry><term>enumdomgroups</term><listitem><para>Enumerate domain groups</para></listitem></varlistentry>
- <varlistentry><term>enumalsgroups</term><listitem><para>Enumerate alias groups</para></listitem></varlistentry>
- <varlistentry><term>createdomuser</term><listitem><para>Create domain user</para></listitem></varlistentry>
- <varlistentry><term>samlookupnames</term><listitem><para>Look up names</para></listitem></varlistentry>
- <varlistentry><term>samlookuprids</term><listitem><para>Look up names</para></listitem></varlistentry>
- <varlistentry><term>deletedomuser</term><listitem><para>Delete domain user</para></listitem></varlistentry>
- <varlistentry><term>samquerysecobj</term><listitem><para>Query SAMR security object</para></listitem></varlistentry>
- <varlistentry><term>getdompwinfo</term><listitem><para>Retrieve domain password info</para></listitem></varlistentry>
- <varlistentry><term>lookupdomain</term><listitem><para>Look up domain</para></listitem></varlistentry>
- </variablelist>
- </refsect2>
- <refsect2>
- <title>SPOOLSS</title>
+ <para><emphasis>SPOOLSS</emphasis></para>
- <variablelist>
- <varlistentry><term>adddriver &lt;arch&gt; &lt;config&gt;</term>
- <listitem><para>
- Execute an AddPrinterDriver() RPC to install the printer driver
+ <itemizedlist>
+ <listitem><para><command>adddriver &lt;arch&gt &lt;config&gt;</command>
+ - Execute an AddPrinterDriver() RPC to install the printer driver
information on the server. Note that the driver files should
already exist in the directory returned by
<command>getdriverdir</command>. Possible values for
@@ -221,16 +229,16 @@
The <parameter>config</parameter> parameter is defined as
follows: </para>
-<para><programlisting>
-Long Printer Name:\
-Driver File Name:\
-Data File Name:\
-Config File Name:\
-Help File Name:\
-Language Monitor Name:\
-Default Data Type:\
-Comma Separated list of Files
-</programlisting></para>
+ <para><programlisting>
+ Long Printer Name:\
+ Driver File Name:\
+ Data File Name:\
+ Config File Name:\
+ Help File Name:\
+ Language Monitor Name:\
+ Default Data Type:\
+ Comma Separated list of Files
+ </programlisting></para>
<para>Any empty fields should be enter as the string "NULL". </para>
@@ -239,174 +247,133 @@ Comma Separated list of Files
use of a bi-directional link for communication. This field should
be "NULL". On a remote NT print server, the Print Monitor for a
driver must already be installed prior to adding the driver or
- else the RPC will fail. </para></listitem></varlistentry>
-
- <varlistentry><term>addprinter &lt;printername&gt;
- &lt;sharename&gt; &lt;drivername&gt; &lt;port&gt;</term>
- <listitem><para>
- Add a printer on the remote server. This printer
+ else the RPC will fail. </para></listitem>
+
+
+
+
+ <listitem><para><command>addprinter &lt;printername&gt;
+ &lt;sharename&gt; &lt;drivername&gt; &lt;port&gt;</command>
+ - Add a printer on the remote server. This printer
will be automatically shared. Be aware that the printer driver
must already be installed on the server (see <command>adddriver</command>)
and the <parameter>port</parameter>must be a valid port name (see
<command>enumports</command>.</para>
- </listitem></varlistentry>
+ </listitem>
- <varlistentry><term>deldriver</term><listitem><para>Delete the
+ <listitem><para><command>deldriver</command> - Delete the
specified printer driver for all architectures. This
does not delete the actual driver files from the server,
only the entry from the server's list of drivers.
- </para></listitem></varlistentry>
+ </para></listitem>
- <varlistentry><term>enumdata</term><listitem><para>Enumerate all
+ <listitem><para><command>enumdata</command> - Enumerate all
printer setting data stored on the server. On Windows NT clients,
these values are stored in the registry, while Samba servers
store them in the printers TDB. This command corresponds
to the MS Platform SDK GetPrinterData() function (* This
- command is currently unimplemented).</para></listitem></varlistentry>
+ command is currently unimplemented).</para></listitem>
+
- <varlistentry><term>enumdataex</term><listitem><para>Enumerate printer data for a key</para></listitem></varlistentry>
- <varlistentry><term>enumjobs &lt;printer&gt;</term>
- <listitem><para>List the jobs and status of a given printer.
+ <listitem><para><command>enumjobs &lt;printer&gt;</command>
+ - List the jobs and status of a given printer.
This command corresponds to the MS Platform SDK EnumJobs()
- function </listitem></varlistentry>
+ function (* This command is currently unimplemented).</para></listitem>
+
+
- <varlistentry><term>enumkey</term><listitem><para>Enumerate printer keys</para></listitem></varlistentry>
- <varlistentry><term>enumports [level]</term>
- <listitem><para>
- Executes an EnumPorts() call using the specified
+ <listitem><para><command>enumports [level]</command>
+ - Executes an EnumPorts() call using the specified
info level. Currently only info levels 1 and 2 are supported.
- </para></listitem></varlistentry>
+ </para></listitem>
- <varlistentry><term>enumdrivers [level]</term>
- <listitem><para>
- Execute an EnumPrinterDrivers() call. This lists the various installed
+ <listitem><para><command>enumdrivers [level]</command>
+ - Execute an EnumPrinterDrivers() call. This lists the various installed
printer drivers for all architectures. Refer to the MS Platform SDK
documentation for more details of the various flags and calling
- options. Currently supported info levels are 1, 2, and 3.</para></listitem></varlistentry>
+ options. Currently supported info levels are 1, 2, and 3.</para></listitem>
- <varlistentry><term>enumprinters [level]</term>
- <listitem><para>Execute an EnumPrinters() call. This lists the various installed
+ <listitem><para><command>enumprinters [level]</command>
+ - Execute an EnumPrinters() call. This lists the various installed
and share printers. Refer to the MS Platform SDK documentation for
more details of the various flags and calling options. Currently
- supported info levels are 0, 1, and 2.</para></listitem></varlistentry>
+ supported info levels are 0, 1, and 2.</para></listitem>
- <varlistentry><term>getdata &lt;printername&gt; &lt;valuename;&gt;</term>
- <listitem><para>Retrieve the data for a given printer setting. See
+ <listitem><para><command>getdata &lt;printername&gt;</command>
+ - Retrieve the data for a given printer setting. See
the <command>enumdata</command> command for more information.
This command corresponds to the GetPrinterData() MS Platform
- SDK function. </para></listitem></varlistentry>
+ SDK function (* This command is currently unimplemented). </para></listitem>
- <varlistentry><term>getdataex</term><listitem><para>Get printer driver data with keyname</para></listitem></varlistentry>
- <varlistentry><term>getdriver &lt;printername&gt;</term>
- <listitem><para>
- Retrieve the printer driver information (such as driver file,
+ <listitem><para><command>getdriver &lt;printername&gt;</command>
+ - Retrieve the printer driver information (such as driver file,
config file, dependent files, etc...) for
the given printer. This command corresponds to the GetPrinterDriver()
MS Platform SDK function. Currently info level 1, 2, and 3 are supported.
- </para></listitem></varlistentry>
+ </para></listitem>
- <varlistentry><term>getdriverdir &lt;arch&gt;</term>
- <listitem><para>
- Execute a GetPrinterDriverDirectory()
+ <listitem><para><command>getdriverdir &lt;arch&gt;</command>
+ - Execute a GetPrinterDriverDirectory()
RPC to retrieve the SMB share name and subdirectory for
storing printer driver files for a given architecture. Possible
values for <parameter>arch</parameter> are "Windows 4.0"
(for Windows 95/98), "Windows NT x86", "Windows NT PowerPC", "Windows
- Alpha_AXP", and "Windows NT R4000". </para></listitem></varlistentry>
+ Alpha_AXP", and "Windows NT R4000". </para></listitem>
- <varlistentry><term>getprinter &lt;printername&gt;</term>
- <listitem><para>Retrieve the current printer information. This command
+ <listitem><para><command>getprinter &lt;printername&gt;</command>
+ - Retrieve the current printer information. This command
corresponds to the GetPrinter() MS Platform SDK function.
- </para></listitem></varlistentry>
+ </para></listitem>
+
- <varlistentry><term>getprintprocdir</term><listitem><para>Get print processor directory</para></listitem></varlistentry>
- <varlistentry><term>openprinter &lt;printername&gt;</term>
- <listitem><para>Execute an OpenPrinterEx() and ClosePrinter() RPC
+ <listitem><para><command>openprinter &lt;printername&gt;</command>
+ - Execute an OpenPrinterEx() and ClosePrinter() RPC
against a given printer. </para></listitem>
- <varlistentry><term>setdriver &lt;printername&gt;
- &lt;drivername&gt;</term>
- <listitem><para>Execute a SetPrinter() command to update the printer driver
+
+ <listitem><para><command>setdriver &lt;printername&gt;
+ &lt;drivername&gt;</command>
+ - Execute a SetPrinter() command to update the printer driver
associated with an installed printer. The printer driver must
already be correctly installed on the print server. </para>
<para>See also the <command>enumprinters</command> and
<command>enumdrivers</command> commands for obtaining a list of
- of installed printers and drivers.</para></listitem></varlistentry>
-
- <varlistentry><term>addform</term><listitem><para>Add form</para></listitem></varlistentry>
- <varlistentry><term>setform</term><listitem><para>Set form</para></listitem></varlistentry>
- <varlistentry><term>getform</term><listitem><para>Get form</para></listitem></varlistentry>
- <varlistentry><term>deleteform</term><listitem><para>Delete form</para></listitem></varlistentry>
- <varlistentry><term>enumforms</term><listitem><para>Enumerate form</para></listitem></varlistentry>
- <varlistentry><term>setprinter</term><listitem><para>Set printer comment</para></listitem></varlistentry>
- <varlistentry><term>setprinterdata</term><listitem><para>Set REG_SZ printer data</para></listitem></varlistentry>
- <varlistentry><term>rffpcnex</term><listitem><para>Rffpcnex test</para></listitem></varlistentry>
-
+ of installed printers and drivers.</para></listitem>
- </variablelist>
+ </itemizedlist>
- </refsect2>
- <refsect2>
- <title>NETLOGON</title>
+ <para><emphasis>GENERAL OPTIONS</emphasis></para>
- <variablelist>
+ <itemizedlist>
+ <listitem><para><command>debuglevel</command> - Set the current
+ debug level used to log information.</para></listitem>
- <varlistentry><term>logonctrl2</term>
- <listitem><para>Logon Control 2</para></listitem>
- </varlistentry>
-
- <varlistentry><term>logonctrl</term>
- <listitem><para>Logon Control</para></listitem>
- </varlistentry>
-
- <varlistentry><term>samsync</term>
- <listitem><para>Sam Synchronisation</para></listitem>
- </varlistentry>
-
- <varlistentry><term>samdeltas</term>
- <listitem><para>Query Sam Deltas</para></listitem>
- </varlistentry>
-
- <varlistentry><term>samlogon</term>
- <listitem><para>Sam Logon</para></listitem>
- </varlistentry>
-
- </variablelist>
- </refsect2>
-
- <refsect2>
- <title>GENERAL COMMANDS</title>
-
- <variablelist>
- <varlistentry><term>debuglevel</term><listitem><para>Set the current
- debug level used to log information.</para></listitem></varlistentry>
-
- <varlistentry><term>help (?)</term><listitem><para>Print a listing of all
+ <listitem><para><command>help (?)</command> - Print a listing of all
known commands or extended help on a particular command.
- </para></listitem></varlistentry>
+ </para></listitem>
- <varlistentry><term>quit (exit)</term><listitem><para>Exit <command>rpcclient
- </command>.</para></listitem></varlistentry>
- </variablelist>
- </refsect2>
+ <listitem><para><command>quit (exit)</command> - Exit <command>rpcclient
+ </command>.</para></listitem>
+ </itemizedlist>
+
</refsect1>
@@ -420,7 +387,7 @@ Comma Separated list of Files
<para>From Luke Leighton's original rpcclient man page:</para>
- <para><emphasis>WARNING!</emphasis> The MSRPC over SMB code has
+ <para><emphasis>"WARNING!</emphasis> The MSRPC over SMB code has
been developed from examining Network traces. No documentation is
available from the original creators (Microsoft) on how MSRPC over
SMB works, or how the individual MSRPC services work. Microsoft's
@@ -428,13 +395,12 @@ Comma Separated list of Files
to be... a bit flaky in places. </para>
<para>The development of Samba's implementation is also a bit rough,
- and as more of the services are understood, it can even result in
- versions of <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> and <citerefentry><refentrytitle>rpcclient</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry> that are incompatible for some commands or services. Additionally,
+ and as more of the services are understood, it can even result in
+ versions of <command>smbd(8)</command> and <command>rpcclient(1)</command>
+ that are incompatible for some commands or services. Additionally,
the developers are sending reports to Microsoft, and problems found
or reported to Microsoft are fixed in Service Packs, which may
- result in incompatibilities.</para>
+ result in incompatibilities." </para>
</refsect1>
@@ -456,8 +422,7 @@ Comma Separated list of Files
<para>The original rpcclient man page was written by Matthew
Geddes, Luke Kenneth Casson Leighton, and rewritten by Gerald Carter.
The conversion to DocBook for Samba 2.2 was done by Gerald
- Carter. The conversion to DocBook XML 4.2 for Samba 3.0 was
- done by Alexander Bokovoy.</para>
+ Carter.</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/samba.7.sgml b/docs/docbook/manpages/samba.7.sgml
index a5d486259f..17865edd81 100644
--- a/docs/docbook/manpages/samba.7.sgml
+++ b/docs/docbook/manpages/samba.7.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="samba.7">
+<refentry id="samba">
<refmeta>
<refentrytitle>samba</refentrytitle>
@@ -8,7 +8,7 @@
<refnamediv>
- <refname>Samba</refname>
+ <refname>SAMBA</refname>
<refpurpose>A Windows SMB/CIFS fileserver for UNIX</refpurpose>
</refnamediv>
@@ -29,30 +29,26 @@
<variablelist>
<varlistentry>
- <term><citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para>The <command>smbd</command> daemon provides the file and print services to
+ <term><command>smbd</command></term>
+ <listitem><para>The <command>smbd </command>
+ daemon provides the file and print services to
SMB clients, such as Windows 95/98, Windows NT, Windows
for Workgroups or LanManager. The configuration file
- for this daemon is described in <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>
+ for this daemon is described in <filename>smb.conf</filename>
</para></listitem>
</varlistentry>
<varlistentry>
- <term><citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></term>
+ <term><command>nmbd</command></term>
<listitem><para>The <command>nmbd</command>
daemon provides NetBIOS nameservice and browsing
support. The configuration file for this daemon
- is described in <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry></para>
+ is described in <filename>smb.conf</filename></para>
</listitem>
</varlistentry>
<varlistentry>
- <term><citerefentry><refentrytitle>smbclient</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
+ <term><command>smbclient</command></term>
<listitem><para>The <command>smbclient</command>
program implements a simple ftp-like client. This
is useful for accessing SMB shares on other compatible
@@ -63,17 +59,15 @@
</varlistentry>
<varlistentry>
- <term><citerefentry><refentrytitle>testparm</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
+ <term><command>testparm</command></term>
<listitem><para>The <command>testparm</command>
- utility is a simple syntax checker for Samba's <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> configuration file.</para>
+ utility is a simple syntax checker for Samba's
+ <filename>smb.conf</filename>configuration file.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><citerefentry><refentrytitle>testprns</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
+ <term><command>testprns</command></term>
<listitem><para>The <command>testprns</command>
utility supports testing printer names defined
in your <filename>printcap</filename> file used
@@ -82,8 +76,7 @@
</varlistentry>
<varlistentry>
- <term><citerefentry><refentrytitle>smbstatus</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
+ <term><command>smbstatus</command></term>
<listitem><para>The <command>smbstatus</command>
tool provides access to information about the
current connections to <command>smbd</command>.</para>
@@ -91,8 +84,7 @@
</varlistentry>
<varlistentry>
- <term><citerefentry><refentrytitle>nmblookup</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
+ <term><command>nmblookup</command></term>
<listitem><para>The <command>nmblookup</command>
tools allows NetBIOS name queries to be made
from a UNIX host.</para>
@@ -100,170 +92,21 @@
</varlistentry>
<varlistentry>
- <term><citerefentry><refentrytitle>smbgroupedit</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para>The <command>smbgroupedit</command>
- tool allows for mapping unix groups to NT Builtin,
- Domain, or Local groups. Also it allows setting
- priviledges for that group, such as saAddUser, etc.</para>
+ <term><command>make_smbcodepage</command></term>
+ <listitem><para>The <command>make_smbcodepage</command>
+ utility provides a means of creating SMB code page
+ definition files for your <command>smbd</command> server.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></term>
+ <term><command>smbpasswd</command></term>
<listitem><para>The <command>smbpasswd</command>
command is a tool for changing LanMan and Windows NT
password hashes on Samba and Windows NT servers.</para>
</listitem>
</varlistentry>
- <varlistentry>
- <term><citerefentry><refentrytitle>smbcacls</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para>The <command>smbcacls</command> command is
- a tool to set ACL's on remote CIFS servers. </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>smbsh</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para>The <command>smbsh</command> command is
- a program that allows you to run a unix shell with
- with an overloaded VFS.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>smbtree</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para>The <command>smbtree</command> command
- is a text-based network neighborhood tool.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>smbtar</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para>The <command>smbtar</command> can make
- backups of data on CIFS/SMB servers.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>smbspool</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para><command>smbspool</command> is a
- helper utility for printing on printers connected
- to CIFS servers. </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>smbcontrol</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para><command>smbcontrol</command> is a utility
- that can change the behaviour of running samba daemons.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>rpcclient</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para><command>rpcclient</command> is a utility
- that can be used to execute RPC commands on remote
- CIFS servers.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>pdbedit</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para>The <command>pdbedit</command> command
- can be used to maintain the local user database on
- a samba server.</para></listitem></varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>findsmb</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para>The <command>findsmb</command> command
- can be used to find SMB servers on the local network.
- </para></listitem></varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>net</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para>The <command>net</command> command
- is supposed to work similar to the DOS/Windows
- NET.EXE command.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>swat</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para><command>swat</command> is a web-based
- interface to configuring <filename>smb.conf</filename>.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para><command>winbindd</command> is a daemon
- that is used for integrating authentication and
- the user database into unix.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>wbinfo</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para><command>wbinfo</command> is a utility
- that retrieves and stores information related to winbind.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>editreg</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para><command>editreg</command> is a command-line
- utility that can edit windows registry files.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>profiles</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para><command>profiles</command> is a command-line
- utility that can be used to replace all occurences of
- a certain SID with another SID.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>vfstest</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para><command>vfstest</command> is a utility
- that can be used to test vfs modules.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>ntlm_auth</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para><command>ntlm_auth</command> is a helper-utility
- for external programs wanting to do NTLM-authentication.
- </para></listitem></varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>smbmount</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbumount</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbmount</refentrytitle><manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para><command>smbmount</command>,<command>smbmnt</command> and <command>smbmnt</command> are commands that can be used to
- mount CIFS/SMB shares on Linux.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><citerefentry><refentrytitle>smbcquotas</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para><command>smbcquotas</command> is a tool that
- can set remote QUOTA's on server with NTFS 5. </para>
- </listitem>
- </varlistentry>
</variablelist>
</refsect1>
@@ -304,8 +147,8 @@
list. Details on how to join the mailing list are given in
the README file that comes with Samba.</para>
- <para>If you have access to a WWW viewer (such as Mozilla
- or Konqueror) then you will also find lots of useful information,
+ <para>If you have access to a WWW viewer (such as Netscape
+ or Mosaic) then you will also find lots of useful information,
including back issues of the Samba mailing list, at
<ulink url="http://lists.samba.org/">http://lists.samba.org</ulink>.</para>
</refsect1>
@@ -313,7 +156,7 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3.0 of the
+ <para>This man page is correct for version 2.2 of the
Samba suite. </para>
</refsect1>
@@ -327,8 +170,8 @@
<para>If you have patches to submit, visit
<ulink url="http://devel.samba.org/">http://devel.samba.org/</ulink>
- for information on how to do it properly. We prefer patches
- in <command>diff -u</command> format.</para>
+ for information on how to do it properly. We prefer patches in
+ <command>diff -u</command> format.</para>
</refsect1>
<refsect1>
@@ -363,11 +206,11 @@
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML
- 4.2 for Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 3e98d3f25f..4842354012 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="smb.conf.5">
+<refentry id="smb.conf">
<refmeta>
<refentrytitle>smb.conf</refentrytitle>
@@ -15,13 +15,14 @@
<refsect1>
<title>SYNOPSIS</title>
- <para>The <filename>smb.conf</filename> file is a configuration
- file for the Samba suite. <filename>smb.conf</filename> contains
- runtime configuration information for the Samba programs. The <filename>smb.conf</filename> file
- is designed to be configured and administered by the <citerefentry><refentrytitle>swat</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> program. The complete
- description of the file format and possible parameters held within
- are here for reference purposes.</para> </refsect1>
+ <para>The <filename>smb.conf</filename> file is a configuration
+ file for the Samba suite. <filename>smb.conf</filename> contains
+ runtime configuration information for the Samba programs. The
+ <filename>smb.conf</filename> file is designed to be configured and
+ administered by the <ulink url="swat.8.html"><command>swat(8)</command>
+ </ulink> program. The complete description of the file format and
+ possible parameters held within are here for reference purposes.</para>
+</refsect1>
<refsect1>
<title id="FILEFORMATSECT">FILE FORMAT</title>
@@ -104,13 +105,13 @@
The user has write access to the path <filename>/home/bar</filename>.
The share is accessed via the share name "foo":</para>
-<screen>
-<computeroutput>
-[foo]
- path = /home/bar
- read only = no
-</computeroutput>
-</screen>
+ <screen>
+ <computeroutput>
+ [foo]
+ path = /home/bar
+ read only = no
+ </computeroutput>
+ </screen>
<para>The following sample section defines a printable share.
The share is readonly, but printable. That is, the only write
@@ -119,15 +120,15 @@
access will be permitted as the default guest user (specified
elsewhere):</para>
-<screen>
-<computeroutput>
-[aprinter]
- path = /usr/spool/public
- read only = yes
- printable = yes
- guest ok = yes
-</computeroutput>
-</screen>
+ <screen>
+ <computeroutput>
+ [aprinter]
+ path = /usr/spool/public
+ read only = yes
+ printable = yes
+ guest ok = yes
+ </computeroutput>
+ </screen>
</refsect1>
<refsect1>
@@ -191,12 +192,12 @@
than others. The following is a typical and suitable [homes]
section:</para>
-<screen>
-<computeroutput>
-[homes]
- read only = no
-</computeroutput>
-</screen>
+ <screen>
+ <computeroutput>
+ [homes]
+ read only = no
+ </computeroutput>
+ </screen>
<para>An important point is that if guest access is specified
in the [homes] section, all home directories will be
@@ -256,12 +257,12 @@
it. A typical [printers] entry would look like
this:</para>
-<screen><computeroutput>
-[printers]
- path = /usr/spool/public
- guest ok = yes
- printable = yes
-</computeroutput></screen>
+ <screen><computeroutput>
+ [printers]
+ path = /usr/spool/public
+ guest ok = yes
+ printable = yes
+ </computeroutput></screen>
<para>All aliases given for a printer in the printcap file
are legitimate printer names as far as the server is concerned.
@@ -269,11 +270,11 @@
to set up a pseudo-printcap. This is a file consisting of one or
more lines like this:</para>
-<screen>
-<computeroutput>
-alias|alias|alias|alias...
-</computeroutput>
-</screen>
+ <screen>
+ <computeroutput>
+ alias|alias|alias|alias...
+ </computeroutput>
+ </screen>
<para>Each alias should be an acceptable printer name for
your printing subsystem. In the [global] section, specify
@@ -287,11 +288,11 @@ alias|alias|alias|alias...
components (if there are more than one) are separated by vertical
bar symbols ('|').</para>
- <note><para>On SYSV systems which use lpstat to determine what
+ <para>NOTE: On SYSV systems which use lpstat to determine what
printers are defined on the system you may be able to use
"printcap name = lpstat" to automatically obtain a list
of printers. See the "printcap name" option
- for more details.</para></note>
+ for more details.</para>
</refsect2>
</refsect1>
@@ -471,7 +472,7 @@ alias|alias|alias|alias...
</variablelist>
<para>There are some quite creative things that can be done
- with these substitutions and other smb.conf options.</para>
+ with these substitutions and other smb.conf options.</para
</refsect1>
<refsect1>
@@ -551,7 +552,7 @@ alias|alias|alias|alias...
then steps 1 to 5 are skipped.</para>
- <orderedlist numeration="arabic">
+ <orderedlist numeration="Arabic">
<listitem><para>If the client has passed a username/password
pair and that username/password pair is validated by the UNIX
system's password programs then the connection is made as that
@@ -684,7 +685,6 @@ alias|alias|alias|alias...
<listitem><para><link linkend="LOGONSCRIPT"><parameter>logon script</parameter></link></para></listitem>
<listitem><para><link linkend="LPQCACHETIME"><parameter>lpq cache time</parameter></link></para></listitem>
<listitem><para><link linkend="MACHINEPASSWORDTIMEOUT"><parameter>machine password timeout</parameter></link></para></listitem>
- <listitem><para><link linkend="MANGLEPREFIX"><parameter>mangle prefix</parameter></link></para></listitem>
<listitem><para><link linkend="MANGLEDSTACK"><parameter>mangled stack</parameter></link></para></listitem>
<listitem><para><link linkend="MAPTOGUEST"><parameter>map to guest</parameter></link></para></listitem>
<listitem><para><link linkend="MAXDISKSIZE"><parameter>max disk size</parameter></link></para></listitem>
@@ -728,9 +728,9 @@ alias|alias|alias|alias...
<listitem><para><link linkend="PREFEREDMASTER"><parameter>prefered master</parameter></link></para></listitem>
<listitem><para><link linkend="PREFERREDMASTER"><parameter>preferred master</parameter></link></para></listitem>
<listitem><para><link linkend="PRELOAD"><parameter>preload</parameter></link></para></listitem>
- <listitem><para><link linkend="PRELOADMODULES"><parameter>preload modules</parameter></link></para></listitem>
<listitem><para><link linkend="PRINTCAP"><parameter>printcap</parameter></link></para></listitem>
<listitem><para><link linkend="PRINTCAPNAME"><parameter>printcap name</parameter></link></para></listitem>
+ <listitem><para><link linkend="PRINTERDRIVERFILE"><parameter>printer driver file</parameter></link></para></listitem>
<listitem><para><link linkend="PRIVATEDIR"><parameter>private dir</parameter></link></para></listitem>
<listitem><para><link linkend="PROTOCOL"><parameter>protocol</parameter></link></para></listitem>
<listitem><para><link linkend="READBMPX"><parameter>read bmpx</parameter></link></para></listitem>
@@ -772,6 +772,7 @@ alias|alias|alias|alias...
<listitem><para><link linkend="UNIXPASSWORDSYNC"><parameter>unix password sync</parameter></link></para></listitem>
<listitem><para><link linkend="UPDATEENCRYPTED"><parameter>update encrypted</parameter></link></para></listitem>
<listitem><para><link linkend="USEMMAP"><parameter>use mmap</parameter></link></para></listitem>
+ <listitem><para><link linkend="USERHOSTS"><parameter>use rhosts</parameter></link></para></listitem>
<listitem><para><link linkend="USESENDFILE"><parameter>use sendfile</parameter></link></para></listitem>
<listitem><para><link linkend="USERNAMELEVEL"><parameter>username level</parameter></link></para></listitem>
<listitem><para><link linkend="USERNAMEMAP"><parameter>username map</parameter></link></para></listitem>
@@ -807,7 +808,7 @@ alias|alias|alias|alias...
<listitem><para><link linkend="ALLOWHOSTS"><parameter>allow hosts</parameter></link></para></listitem>
<listitem><para><link linkend="AVAILABLE"><parameter>available</parameter></link></para></listitem>
<listitem><para><link linkend="BLOCKINGLOCKS"><parameter>blocking locks</parameter></link></para></listitem>
- <listitem><para><link linkend="BLOCKSIZE"><parameter>block size</parameter></link></para></listitem>
+<listitem><para><link linkend="BLOCKSIZE"><parameter>block size</parameter></link></para></listitem>
<listitem><para><link linkend="BROWSABLE"><parameter>browsable</parameter></link></para></listitem>
<listitem><para><link linkend="BROWSEABLE"><parameter>browseable</parameter></link></para></listitem>
<listitem><para><link linkend="CASESENSITIVE"><parameter>case sensitive</parameter></link></para></listitem>
@@ -883,6 +884,7 @@ alias|alias|alias|alias...
<listitem><para><link linkend="PATH"><parameter>path</parameter></link></para></listitem>
<listitem><para><link linkend="POSIXLOCKING"><parameter>posix locking</parameter></link></para></listitem>
<listitem><para><link linkend="POSTEXEC"><parameter>postexec</parameter></link></para></listitem>
+ <listitem><para><link linkend="POSTSCRIPT"><parameter>postscript</parameter></link></para></listitem>
<listitem><para><link linkend="PREEXEC"><parameter>preexec</parameter></link></para></listitem>
<listitem><para><link linkend="PREEXECCLOSE"><parameter>preexec close</parameter></link></para></listitem>
<listitem><para><link linkend="PRESERVECASE"><parameter>preserve case</parameter></link></para></listitem>
@@ -891,6 +893,8 @@ alias|alias|alias|alias...
<listitem><para><link linkend="PRINTABLE"><parameter>printable</parameter></link></para></listitem>
<listitem><para><link linkend="PRINTER"><parameter>printer</parameter></link></para></listitem>
<listitem><para><link linkend="PRINTERADMIN"><parameter>printer admin</parameter></link></para></listitem>
+ <listitem><para><link linkend="PRINTERDRIVER"><parameter>printer driver</parameter></link></para></listitem>
+ <listitem><para><link linkend="PRINTERDRIVERLOCATION"><parameter>printer driver location</parameter></link></para></listitem>
<listitem><para><link linkend="PRINTERNAME"><parameter>printer name</parameter></link></para></listitem>
<listitem><para><link linkend="PRINTING"><parameter>printing</parameter></link></para></listitem>
<listitem><para><link linkend="PUBLIC"><parameter>public</parameter></link></para></listitem>
@@ -936,10 +940,10 @@ alias|alias|alias|alias...
<variablelist>
<varlistentry>
- <term><anchor id="ABORTSHUTDOWNSCRIPT"/>abort shutdown script (G)</term>
+ <term><anchor id="ABORTSHUTDOWNSCRIPT">abort shutdown script (G)</term>
<listitem><para><emphasis>This parameter only exists in the HEAD cvs branch</emphasis>
- This a full path name to a script called by <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> that
+ This a full path name to a script called by
+ <ulink url="smbd.8.html"><command>smbd(8)</command></ulink> that
should stop a shutdown procedure issued by the <link
linkend="SHUTDOWNSCRIPT"><parameter>shutdown script</parameter></link>.</para>
@@ -951,7 +955,7 @@ alias|alias|alias|alias...
</varlistentry>
<varlistentry>
- <term><anchor id="ADDPRINTERCOMMAND"/>addprinter command (G)</term>
+ <term><anchor id="ADDPRINTERCOMMAND">addprinter command (G)</term>
<listitem><para>With the introduction of MS-RPC based printing
support for Windows NT/2000 clients in Samba 2.2, The MS Add
Printer Wizard (APW) icon is now also available in the
@@ -965,12 +969,12 @@ alias|alias|alias|alias...
will perform the necessary operations for adding the printer
to the print system and to add the appropriate service definition
to the <filename>smb.conf</filename> file in order that it can be
- shared by <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>.</para>
+ shared by <ulink url="smbd.8.html"><command>smbd(8)</command>
+ </ulink>.</para>
<para>The <parameter>addprinter command</parameter> is
automatically invoked with the following parameter (in
- order):</para>
+ order:</para>
<itemizedlist>
<listitem><para><parameter>printer name</parameter></para></listitem>
@@ -987,22 +991,16 @@ alias|alias|alias|alias...
driver location" parameter is included for backwards compatibility
only. The remaining fields in the structure are generated from answers
to the APW questions.</para>
-
+
<para>Once the <parameter>addprinter command</parameter> has
been executed, <command>smbd</command> will reparse the <filename>
smb.conf</filename> to determine if the share defined by the APW
exists. If the sharename is still invalid, then <command>smbd
</command> will return an ACCESS_DENIED error to the client.</para>
-
- <para>
- The "add printer command" program can output a single line of text,
- which Samba will set as the port the new printer is connected to.
- If this line isn't output, Samba won't reload its printer shares.
- </para>
<para>See also <link linkend="DELETEPRINTERCOMMAND"><parameter>
deleteprinter command</parameter></link>, <link
- linkend="PRINTING"><parameter>printing</parameter></link>,
+ linkend="printing"><parameter>printing</parameter></link>,
<link linkend="SHOWADDPRINTERWIZARD"><parameter>show add
printer wizard</parameter></link></para>
@@ -1015,7 +1013,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="ADDSHARECOMMAND"/>add share command (G)</term>
+ <term><anchor id="ADDSHARECOMMAND">add share command (G)</term>
<listitem><para>Samba 2.2.0 introduced the ability to dynamically
add and delete shares via the Windows NT 4.0 Server Manager. The
<parameter>add share command</parameter> is used to define an
@@ -1069,10 +1067,9 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="ADDMACHINESCRIPT"/>add machine script (G)</term>
+ <term><anchor id="ADDMACHINESCRIPT">add machine script (G)</term>
<listitem><para>This is the full pathname to a script that will
- be run by <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> when a machine is added
+ be run by <ulink url="smbd.8.html">smbd(8)</ulink> when a machine is added
to it's domain using the administrator username and password method. </para>
<para>This option is only required when using sam back-ends tied to the
@@ -1088,7 +1085,7 @@ alias|alias|alias|alias...
</varlistentry>
<varlistentry>
- <term><anchor id="ADSSERVER"/>ads server (G)</term>
+ <term><anchor id="ADSSERVER">ads server (G)</term>
<listitem><para>If this option is specified, samba does
not try to figure out what ads server to use itself, but
uses the specified ads server. Either one DNS name or IP
@@ -1101,10 +1098,10 @@ alias|alias|alias|alias...
</varlistentry>
<varlistentry>
- <term><anchor id="ADDUSERSCRIPT"/>add user script (G)</term>
+ <term><anchor id="ADDUSERSCRIPT">add user script (G)</term>
<listitem><para>This is the full pathname to a script that will
- be run <emphasis>AS ROOT</emphasis> by <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> under special circumstances described below.</para>
+ be run <emphasis>AS ROOT</emphasis> by <ulink url="smbd.8.html">smbd(8)
+ </ulink> under special circumstances described below.</para>
<para>Normally, a Samba server requires that UNIX users are
created for all users accessing files on this server. For sites
@@ -1114,16 +1111,16 @@ alias|alias|alias|alias...
url="smbd.8.html">smbd</ulink> to create the required UNIX users
<emphasis>ON DEMAND</emphasis> when a user accesses the Samba server.</para>
- <para>In order to use this option, <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> must <emphasis>NOT</emphasis> be set to <parameter>security = share</parameter>
+ <para>In order to use this option, <ulink url="smbd.8.html">smbd</ulink>
+ must <emphasis>NOT</emphasis> be set to <parameter>security = share</parameter>
and <parameter>add user script</parameter>
must be set to a full pathname for a script that will create a UNIX
user given one argument of <parameter>%u</parameter>, which expands into
the UNIX user name to create.</para>
<para>When the Windows user attempts to access the Samba server,
- at login (session setup in the SMB protocol) time, <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> contacts the <parameter>password server</parameter> and
+ at login (session setup in the SMB protocol) time, <ulink url="smbd.8.html">
+ smbd</ulink> contacts the <parameter>password server</parameter> and
attempts to authenticate the given user with the given password. If the
authentication succeeds then <command>smbd</command>
attempts to find a UNIX user in the UNIX password database to map the
@@ -1151,10 +1148,10 @@ alias|alias|alias|alias...
</listitem>
</varlistentry>
- <varlistentry><term><anchor id="ADDGROUPSCRIPT"/>add group script (G)</term>
+ <varlistentry><term><anchor id="ADDGROUPSCRIPT">add group script (G)</term>
<listitem><para>This is the full pathname to a script that will
- be run <emphasis>AS ROOT</emphasis> by <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> when a new group is
+ be run <emphasis>AS ROOT</emphasis> by <ulink
+ url="smbd.8.html">smbd(8)</ulink> when a new group is
requested. It will expand any
<parameter>%g</parameter> to the group name passed.
This script is only useful for installations using the
@@ -1167,7 +1164,7 @@ alias|alias|alias|alias...
</varlistentry>
<varlistentry>
- <term><anchor id="ADMINUSERS"/>admin users (S)</term>
+ <term><anchor id="ADMINUSERS">admin users (S)</term>
<listitem><para>This is a list of users who will be granted
administrative privileges on the share. This means that they
will do all file operations as the super-user (root).</para>
@@ -1183,13 +1180,13 @@ alias|alias|alias|alias...
</varlistentry>
<varlistentry>
- <term><anchor id="ADDUSERTOGROUPSCRIPT"/>add user to group script (G)</term>
+ <term><anchor id="ADDUSERTOGROUPSCRIPT">add user to group script (G)</term>
<listitem><para>Full path to the script that will be called when
a user is added to a group using the Windows NT domain administration
- tools. It will be run by <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> <emphasis>AS ROOT</emphasis>.
- Any <parameter>%g</parameter> will be replaced with the group name and
- any <parameter>%u</parameter> will be replaced with the user name.
+ tools. It will be run by <ulink url="smbd.8.html">smbd(8)</ulink>
+ <emphasis>AS ROOT</emphasis>. Any <parameter>%g</parameter> will be
+ replaced with the group name and any <parameter>%u</parameter> will
+ be replaced with the user name.
</para>
<para>Default: <command>add user to group script = </command></para>
@@ -1200,13 +1197,13 @@ alias|alias|alias|alias...
</varlistentry>
<varlistentry>
- <term><anchor id="ALLOWHOSTS"/>allow hosts (S)</term>
+ <term><anchor id="ALLOWHOSTS">allow hosts (S)</term>
<listitem><para>Synonym for <link linkend="HOSTSALLOW">
<parameter>hosts allow</parameter></link>.</para></listitem>
</varlistentry>
<varlistentry>
- <term><anchor id="ALGORITHMICRIDBASE"/>algorithmic rid base (G)</term>
+ <term><anchor id="ALGORITHMICRIDBASE">algorithmic rid base (G)</term>
<listitem><para>This determines how Samba will use its
algorithmic mapping from uids/gid to the RIDs needed to construct
NT Security Identifiers.</para>
@@ -1229,7 +1226,7 @@ alias|alias|alias|alias...
</varlistentry>
<varlistentry>
- <term><anchor id="ALLOWTRUSTEDDOMAINS"/>allow trusted domains (G)</term>
+ <term><anchor id="ALLOWTRUSTEDDOMAINS">allow trusted domains (G)</term>
<listitem><para>This option only takes effect when the <link
linkend="SECURITY"><parameter>security</parameter></link> option is set to
<constant>server</constant> or <constant>domain</constant>.
@@ -1253,9 +1250,10 @@ alias|alias|alias|alias...
</varlistentry>
<varlistentry>
- <term><anchor id="ANNOUNCEAS"/>announce as (G)</term>
- <listitem><para>This specifies what type of server <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> will announce itself as, to a network neighborhood browse
+ <term><anchor id="ANNOUNCEAS">announce as (G)</term>
+ <listitem><para>This specifies what type of server
+ <ulink url="nmbd.8.html"><command>nmbd</command></ulink>
+ will announce itself as, to a network neighborhood browse
list. By default this is set to Windows NT. The valid options
are : "NT Server" (which can also be written as "NT"),
"NT Workstation", "Win95" or "WfW" meaning Windows NT Server,
@@ -1274,7 +1272,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="ANNOUNCEVERSION"/>announce version (G)</term>
+ <term><anchor id="ANNOUNCEVERSION">announce version (G)</term>
<listitem><para>This specifies the major and minor version numbers
that nmbd will use when announcing itself as a server. The default
is 4.9. Do not change this parameter unless you have a specific
@@ -1289,7 +1287,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="AUTOSERVICES"/>auto services (G)</term>
+ <term><anchor id="AUTOSERVICES">auto services (G)</term>
<listitem><para>This is a synonym for the <link linkend="PRELOAD">
<parameter>preload</parameter></link>.</para>
</listitem>
@@ -1298,7 +1296,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="AUTHMETHODS"/>auth methods (G)</term>
+ <term><anchor id="AUTHMETHODS">auth methods (G)</term>
<listitem><para>This option allows the administrator to chose what
authentication methods <command>smbd</command> will use when authenticating
a user. This option defaults to sensible values based on <link linkend="SECURITY"><parameter>
@@ -1316,7 +1314,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="AVAILABLE"/>available (S)</term>
+ <term><anchor id="AVAILABLE">available (S)</term>
<listitem><para>This parameter lets you "turn off" a service. If
<parameter>available = no</parameter>, then <emphasis>ALL</emphasis>
attempts to connect to the service will fail. Such failures are
@@ -1330,12 +1328,12 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="BINDINTERFACESONLY"/>bind interfaces only (G)</term>
+ <term><anchor id="BINDINTERFACESONLY">bind interfaces only (G)</term>
<listitem><para>This global parameter allows the Samba admin
to limit what interfaces on a machine will serve SMB requests. It
- affects file service <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> and name service <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> in a slightly different ways.</para>
+ affects file service <ulink url="smbd.8.html">smbd(8)</ulink> and
+ name service <ulink url="nmbd.8.html">nmbd(8)</ulink> in slightly
+ different ways.</para>
<para>For name service it causes <command>nmbd</command> to bind
to ports 137 and 138 on the interfaces listed in the <link
@@ -1355,9 +1353,8 @@ alias|alias|alias|alias...
does defeat this simple check, however, so it must not be used
seriously as a security feature for <command>nmbd</command>.</para>
- <para>For file service it causes <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> to bind only to the interface list
- given in the <link linkend="INTERFACES">
+ <para>For file service it causes <ulink url="smbd.8.html">smbd(8)</ulink>
+ to bind only to the interface list given in the <link linkend="INTERFACES">
interfaces</link> parameter. This restricts the networks that
<command>smbd</command> will serve to packets coming in those
interfaces. Note that you should not use this parameter for machines
@@ -1366,9 +1363,10 @@ alias|alias|alias|alias...
<para>If <parameter>bind interfaces only</parameter> is set then
unless the network address <emphasis>127.0.0.1</emphasis> is added
- to the <parameter>interfaces</parameter> parameter list <citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> and <citerefentry><refentrytitle>swat</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> may not work as expected due to the reasons covered below.</para>
+ to the <parameter>interfaces</parameter> parameter list <ulink
+ url="smbpasswd.8.html"><command>smbpasswd(8)</command></ulink>
+ and <ulink url="swat.8.html"><command>swat(8)</command></ulink> may
+ not work as expected due to the reasons covered below.</para>
<para>To change a users SMB password, the <command>smbpasswd</command>
by default connects to the <emphasis>localhost - 127.0.0.1</emphasis>
@@ -1378,9 +1376,9 @@ alias|alias|alias|alias...
<parameter>interfaces</parameter> parameter list then <command>
smbpasswd</command> will fail to connect in it's default mode.
<command>smbpasswd</command> can be forced to use the primary IP interface
- of the local host by using its <citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> <parameter>-r <replaceable>remote machine</replaceable></parameter>
- parameter, with <replaceable>remote machine</replaceable> set
+ of the local host by using its <ulink url="smbpasswd.8.html#minusr">
+ <parameter>-r <replaceable>remote machine</replaceable></parameter>
+ </ulink> parameter, with <replaceable>remote machine</replaceable> set
to the IP name of the primary interface of the local host.</para>
<para>The <command>swat</command> status page tries to connect with
@@ -1400,10 +1398,9 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="BLOCKINGLOCKS"/>blocking locks (S)</term>
- <listitem><para>This parameter controls the behavior
- of <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> when given a request by a client
+ <term><anchor id="BLOCKINGLOCKS">blocking locks (S)</term>
+ <listitem><para>This parameter controls the behavior of <ulink
+ url="smbd.8.html">smbd(8)</ulink> when given a request by a client
to obtain a byte range lock on a region of an open file, and the
request has a time limit associated with it.</para>
@@ -1423,9 +1420,9 @@ alias|alias|alias|alias...
</varlistentry>
<varlistentry>
- <term><anchor id="BLOCKSIZE"/>block size (S)</term>
- <listitem><para>This parameter controls the behavior of <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> when reporting disk free
+ <term><anchor id="BLOCKSIZE">block size (S)</term>
+ <listitem><para>This parameter controls the behavior of
+ <ulink url="smbd.8.html">smbd(8)</ulink> when reporting disk free
sizes. By default, this reports a disk block size of 1024 bytes.
</para>
@@ -1439,19 +1436,27 @@ alias|alias|alias|alias...
<para>Changing this option does not change the disk free reporting
size, just the block size unit reported to the client.</para>
- </listitem>
- </varlistentry>
+
+ <para>Default: <command>block size = 1024</command></para>
+ <para>Example: <command>block size = 65536</command></para>
+
+ </listitem>
+ </varlistentry>
+
+
<varlistentry>
- <term><anchor id="BROWSABLE"/>browsable (S)</term>
+ <term><anchor id="BROWSABLE">browsable (S)</term>
<listitem><para>See the <link linkend="BROWSEABLE"><parameter>
browseable</parameter></link>.</para></listitem>
</varlistentry>
+
+
<varlistentry>
- <term><anchor id="BROWSELIST"/>browse list (G)</term>
- <listitem><para>This controls whether <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> will serve a browse list to
+ <term><anchor id="BROWSELIST">browse list (G)</term>
+ <listitem><para>This controls whether <ulink url="smbd.8.html">
+ <command>smbd(8)</command></ulink> will serve a browse list to
a client doing a <command>NetServerEnum</command> call. Normally
set to <constant>yes</constant>. You should never need to change
this.</para>
@@ -1462,7 +1467,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="BROWSEABLE"/>browseable (S)</term>
+ <term><anchor id="BROWSEABLE">browseable (S)</term>
<listitem><para>This controls whether this share is seen in
the list of available shares in a net view and in the browse list.</para>
@@ -1473,7 +1478,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="CASESENSITIVE"/>case sensitive (S)</term>
+ <term><anchor id="CASESENSITIVE">case sensitive (S)</term>
<listitem><para>See the discussion in the section <link
linkend="NAMEMANGLINGSECT">NAME MANGLING</link>.</para>
@@ -1484,7 +1489,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="CASESIGNAMES"/>casesignames (S)</term>
+ <term><anchor id="CASESIGNAMES">casesignames (S)</term>
<listitem><para>Synonym for <link linkend="CASESENSITIVE">case
sensitive</link>.</para></listitem>
</varlistentry>
@@ -1492,12 +1497,12 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="CHANGENOTIFYTIMEOUT"/>change notify timeout (G)</term>
+ <term><anchor id="CHANGENOTIFYTIMEOUT">change notify timeout (G)</term>
<listitem><para>This SMB allows a client to tell a server to
"watch" a particular directory for any changes and only reply to
the SMB request when a change has occurred. Such constant scanning of
- a directory is expensive under UNIX, hence an <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> daemon only performs such a scan
+ a directory is expensive under UNIX, hence an <ulink url="smbd.8.html">
+ <command>smbd(8)</command></ulink> daemon only performs such a scan
on each requested directory once every <parameter>change notify
timeout</parameter> seconds.</para>
@@ -1510,7 +1515,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="CHANGESHARECOMMAND"/>change share command (G)</term>
+ <term><anchor id="CHANGESHARECOMMAND">change share command (G)</term>
<listitem><para>Samba 2.2.0 introduced the ability to dynamically
add and delete shares via the Windows NT 4.0 Server Manager. The
<parameter>change share command</parameter> is used to define an
@@ -1560,8 +1565,12 @@ alias|alias|alias|alias...
</listitem>
</varlistentry>
+
+
+
+
<varlistentry>
- <term><anchor id="COMMENT"/>comment (S)</term>
+ <term><anchor id="COMMENT">comment (S)</term>
<listitem><para>This is a text field that is seen next to a share
when a client does a queries the server, either via the network
neighborhood or via <command>net view</command> to list what shares
@@ -1578,7 +1587,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="CONFIGFILE"/>config file (G)</term>
+ <term><anchor id="CONFIGFILE">config file (G)</term>
<listitem><para>This allows you to override the config file
to use, instead of the default (usually <filename>smb.conf</filename>).
There is a chicken and egg problem here as this option is set
@@ -1602,7 +1611,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="COPY"/>copy (S)</term>
+ <term><anchor id="COPY">copy (S)</term>
<listitem><para>This parameter allows you to "clone" service
entries. The specified service is simply duplicated under the
current service's name. Any parameters specified in the current
@@ -1620,7 +1629,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="CREATEMASK"/>create mask (S)</term>
+ <term><anchor id="CREATEMASK">create mask (S)</term>
<listitem><para>A synonym for this parameter is
<link linkend="CREATEMODE"><parameter>create mode</parameter>
</link>.</para>
@@ -1664,14 +1673,14 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="CREATEMODE"/>create mode (S)</term>
+ <term><anchor id="CREATEMODE">create mode (S)</term>
<listitem><para>This is a synonym for <link linkend="CREATEMASK"><parameter>
create mask</parameter></link>.</para></listitem>
</varlistentry>
<varlistentry>
- <term><anchor id="CSCPOLICY"/>csc policy (S)</term>
+ <term><anchor id="CSCPOLICY">csc policy (S)</term>
<listitem><para>This stands for <emphasis>client-side caching
policy</emphasis>, and specifies how clients capable of offline
caching will cache the files in the share. The valid values
@@ -1690,7 +1699,7 @@ alias|alias|alias|alias...
</varlistentry>
<varlistentry>
- <term><anchor id="DEADTIME"/>deadtime (G)</term>
+ <term><anchor id="DEADTIME">deadtime (G)</term>
<listitem><para>The value of the parameter (a decimal integer)
represents the number of minutes of inactivity before a connection
is considered dead, and it is disconnected. The deadtime only takes
@@ -1716,7 +1725,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="DEBUGHIRESTIMESTAMP"/>debug hires timestamp (G)</term>
+ <term><anchor id="DEBUGHIRESTIMESTAMP">debug hires timestamp (G)</term>
<listitem><para>Sometimes the timestamps in the log messages
are needed with a resolution of higher that seconds, this
boolean parameter adds microsecond resolution to the timestamp
@@ -1733,7 +1742,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="DEBUGPID"/>debug pid (G)</term>
+ <term><anchor id="DEBUGPID">debug pid (G)</term>
<listitem><para>When using only one log file for more then one
forked <ulink url="smbd.8.html">smbd</ulink>-process there may be hard to follow which process
outputs which message. This boolean parameter is adds the process-id
@@ -1748,7 +1757,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="DEBUGTIMESTAMP"/>debug timestamp (G)</term>
+ <term><anchor id="DEBUGTIMESTAMP">debug timestamp (G)</term>
<listitem><para>Samba debug log messages are timestamped
by default. If you are running at a high <link linkend="DEBUGLEVEL">
<parameter>debug level</parameter></link> these timestamps
@@ -1761,7 +1770,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="DEBUGUID"/>debug uid (G)</term>
+ <term><anchor id="DEBUGUID">debug uid (G)</term>
<listitem><para>Samba is sometimes run as root and sometime
run as the connected user, this boolean parameter inserts the
current euid, egid, uid and gid to the timestamp message headers
@@ -1777,7 +1786,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="DEBUGLEVEL"/>debuglevel (G)</term>
+ <term><anchor id="DEBUGLEVEL">debuglevel (G)</term>
<listitem><para>Synonym for <link linkend="LOGLEVEL"><parameter>
log level</parameter></link>.</para>
</listitem>
@@ -1786,7 +1795,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="DEFAULT"/>default (G)</term>
+ <term><anchor id="DEFAULT">default (G)</term>
<listitem><para>A synonym for <link linkend="DEFAULTSERVICE"><parameter>
default service</parameter></link>.</para></listitem>
</varlistentry>
@@ -1794,7 +1803,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="DEFAULTCASE"/>default case (S)</term>
+ <term><anchor id="DEFAULTCASE">default case (S)</term>
<listitem><para>See the section on <link linkend="NAMEMANGLINGSECT">
NAME MANGLING</link>. Also note the <link linkend="SHORTPRESERVECASE">
<parameter>short preserve case</parameter></link> parameter.</para>
@@ -1806,7 +1815,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="DEFAULTDEVMODE"/>default devmode (S)</term>
+ <term><anchor id="DEFAULTDEVMODE">default devmode (S)</term>
<listitem><para>This parameter is only applicable to <link
linkend="PRINTOK">printable</link> services. When smbd is serving
Printer Drivers to Windows NT/2k/XP clients, each printer on the Samba
@@ -1844,7 +1853,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="DEFAULTSERVICE"/>default service (G)</term>
+ <term><anchor id="DEFAULTSERVICE">default service (G)</term>
<listitem><para>This parameter specifies the name of a service
which will be connected to if the service actually requested cannot
be found. Note that the square brackets are <emphasis>NOT</emphasis>
@@ -1870,27 +1879,24 @@ alias|alias|alias|alias...
<para>Example:</para>
-<para><programlisting>
+ <para><programlisting>
[global]
default service = pub
[pub]
path = /%S
-</programlisting></para>
+ </programlisting></para>
</listitem>
</varlistentry>
- <varlistentry><term><anchor id="DELETEGROUPSCRIPT"/>delete group script (G)</term>
+ <varlistentry><term><anchor id="DELETEGROUPSCRIPT">delete group script (G)</term>
<listitem><para>This is the full pathname to a script that will
- be run <emphasis>AS ROOT</emphasis> <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> when a group is requested to be deleted.
- It will expand any <parameter>%g</parameter> to the group name passed.
- This script is only useful for installations using the Windows NT domain administration tools.
+ be run <emphasis>AS ROOT</emphasis> by <ulink url="smbd.8.html">smbd(8)</ulink> when a group is requested to be deleted. It will expand any <parameter>%g</parameter> to the group name passed. This script is only useful for installations using the Windows NT domain administration tools.
</para></listitem>
</varlistentry>
<varlistentry>
- <term><anchor id="DELETEPRINTERCOMMAND"/>deleteprinter command (G)</term>
+ <term><anchor id="DELETEPRINTERCOMMAND">deleteprinter command (G)</term>
<listitem><para>With the introduction of MS-RPC based printer
support for Windows NT/2000 clients in Samba 2.2, it is now
possible to delete printer at run time by issuing the
@@ -1916,7 +1922,7 @@ alias|alias|alias|alias...
<para>See also <link linkend="ADDPRINTERCOMMAND"><parameter>
addprinter command</parameter></link>, <link
- linkend="PRINTING"><parameter>printing</parameter></link>,
+ linkend="printing"><parameter>printing</parameter></link>,
<link linkend="SHOWADDPRINTERWIZARD"><parameter>show add
printer wizard</parameter></link></para>
@@ -1932,7 +1938,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="DELETEREADONLY"/>delete readonly (S)</term>
+ <term><anchor id="DELETEREADONLY">delete readonly (S)</term>
<listitem><para>This parameter allows readonly files to be deleted.
This is not normal DOS semantics, but is allowed by UNIX.</para>
@@ -1946,7 +1952,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="DELETESHARECOMMAND"/>delete share command (G)</term>
+ <term><anchor id="DELETESHARECOMMAND">delete share command (G)</term>
<listitem><para>Samba 2.2.0 introduced the ability to dynamically
add and delete shares via the Windows NT 4.0 Server Manager. The
<parameter>delete share command</parameter> is used to define an
@@ -1994,11 +2000,10 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="DELETEUSERSCRIPT"/>delete user script (G)</term>
+ <term><anchor id="DELETEUSERSCRIPT">delete user script (G)</term>
<listitem><para>This is the full pathname to a script that will
- be run by <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> when managing users
- with remote RPC (NT) tools.
+ be run by <ulink url="smbd.8.html"><command>smbd(8)</command></ulink>
+ when managing user's with remote RPC (NT) tools.
</para>
<para>This script is called when a remote client removes a user
@@ -2016,13 +2021,13 @@ alias|alias|alias|alias...
</varlistentry>
<varlistentry>
- <term><anchor id="DELETEUSERFROMGROUPSCRIPT"/>delete user from group script (G)</term>
+ <term><anchor id="DELETEUSERFROMGROUPSCRIPT">delete user from group script (G)</term>
<listitem><para>Full path to the script that will be called when
a user is removed from a group using the Windows NT domain administration
- tools. It will be run by <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> <emphasis>AS ROOT</emphasis>.
- Any <parameter>%g</parameter> will be replaced with the group name and
- any <parameter>%u</parameter> will be replaced with the user name.
+ tools. It will be run by <ulink url="smbd.8.html">smbd(8)</ulink>
+ <emphasis>AS ROOT</emphasis>. Any <parameter>%g</parameter> will be
+ replaced with the group name and any <parameter>%u</parameter> will
+ be replaced with the user name.
</para>
<para>Default: <command>delete user from group script = </command></para>
@@ -2033,7 +2038,7 @@ alias|alias|alias|alias...
</varlistentry>
<varlistentry>
- <term><anchor id="DELETEVETOFILES"/>delete veto files (S)</term>
+ <term><anchor id="DELETEVETOFILES">delete veto files (S)</term>
<listitem><para>This option is used when Samba is attempting to
delete a directory that contains one or more vetoed directories
(see the <link linkend="VETOFILES"><parameter>veto files</parameter></link>
@@ -2062,7 +2067,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="DENYHOSTS"/>deny hosts (S)</term>
+ <term><anchor id="DENYHOSTS">deny hosts (S)</term>
<listitem><para>Synonym for <link linkend="HOSTSDENY"><parameter>hosts
deny</parameter></link>.</para></listitem>
</varlistentry>
@@ -2071,7 +2076,7 @@ alias|alias|alias|alias...
<varlistentry>
- <term><anchor id="DFREECOMMAND"/>dfree command (G)</term>
+ <term><anchor id="DFREECOMMAND">dfree command (G)</term>
<listitem><para>The <parameter>dfree command</parameter> setting should
only be used on systems where a problem occurs with the internal
disk space calculations. This has been known to happen with Ultrix,
@@ -2104,17 +2109,17 @@ alias|alias|alias|alias...
<para>Where the script dfree (which must be made executable) could be:</para>
-<para><programlisting>
-#!/bin/sh
-df $1 | tail -1 | awk '{print $2" "$4}'
-</programlisting></para>
+ <para><programlisting>
+ #!/bin/sh
+ df $1 | tail -1 | awk '{print $2" "$4}'
+ </programlisting></para>
<para>or perhaps (on Sys V based systems):</para>
-<para><programlisting>
-#!/bin/sh
-/usr/bin/df -k $1 | tail -1 | awk '{print $3" "$5}'
-</programlisting></para>
+ <para><programlisting>
+ #!/bin/sh
+ /usr/bin/df -k $1 | tail -1 | awk '{print $3" "$5}'
+ </programlisting></para>
<para>Note that you may have to replace the command names
with full path names on some systems.</para>
@@ -2125,7 +2130,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="DIRECTORY"/>directory (S)</term>
+ <term><anchor id="DIRECTORY">directory (S)</term>
<listitem><para>Synonym for <link linkend="PATH"><parameter>path
</parameter></link>.</para></listitem>
</varlistentry>
@@ -2133,7 +2138,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="DIRECTORYMASK"/>directory mask (S)</term>
+ <term><anchor id="DIRECTORYMASK">directory mask (S)</term>
<listitem><para>This parameter is the octal modes which are
used when converting DOS modes to UNIX modes when creating UNIX
directories.</para>
@@ -2181,7 +2186,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="DIRECTORYMODE"/>directory mode (S)</term>
+ <term><anchor id="DIRECTORYMODE">directory mode (S)</term>
<listitem><para>Synonym for <link linkend="DIRECTORYMASK"><parameter>
directory mask</parameter></link></para></listitem>
</varlistentry>
@@ -2189,7 +2194,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="DIRECTORYSECURITYMASK"/>directory security mask (S)</term>
+ <term><anchor id="DIRECTORYSECURITYMASK">directory security mask (S)</term>
<listitem><para>This parameter controls what UNIX permission bits
can be modified when a Windows NT client is manipulating the UNIX
permission on a directory using the native NT security dialog
@@ -2224,7 +2229,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="DISABLENETBIOS"/>disable netbios (G)</term>
+ <term><anchor id="DISABLENETBIOS">disable netbios (G)</term>
<listitem><para>Enabling this parameter will disable netbios support
in Samba. Netbios is the only available form of browsing in
all windows versions except for 2000 and XP. </para>
@@ -2239,7 +2244,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="DISABLESPOOLSS"/>disable spoolss (G)</term>
+ <term><anchor id="DISABLESPOOLSS">disable spoolss (G)</term>
<listitem><para>Enabling this parameter will disable Samba's support
for the SPOOLSS set of MS-RPC's and will yield identical behavior
as Samba 2.0.x. Windows NT/2000 clients will downgrade to using
@@ -2260,7 +2265,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="DISPLAYCHARSET"/>display charset (G)</term>
+ <term><anchor id="DISPLAYCHARSET">display charset (G)</term>
<listitem><para>Specifies the charset that samba will use
to print messages to stdout and stderr and SWAT will use.
Should generally be the same as the <command>unix charset</command>.
@@ -2275,12 +2280,12 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="DNSPROXY"/>dns proxy (G)</term>
- <listitem><para>Specifies that <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> when acting as a WINS server and
- finding that a NetBIOS name has not been registered, should treat the
- NetBIOS name word-for-word as a DNS name and do a lookup with the DNS server
- for that name on behalf of the name-querying client.</para>
+ <term><anchor id="DNSPROXY">dns proxy (G)</term>
+ <listitem><para>Specifies that <ulink url="nmbd.8.html">nmbd(8)</ulink>
+ when acting as a WINS server and finding that a NetBIOS name has not
+ been registered, should treat the NetBIOS name word-for-word as a DNS
+ name and do a lookup with the DNS server for that name on behalf of
+ the name-querying client.</para>
<para>Note that the maximum length for a NetBIOS name is 15
characters, so the DNS name (or DNS alias) can likewise only be
@@ -2298,7 +2303,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="DOMAINLOGONS"/>domain logons (G)</term>
+ <term><anchor id="DOMAINLOGONS">domain logons (G)</term>
<listitem><para>If set to <constant>yes</constant>, the Samba server will serve
Windows 95/98 Domain logons for the <link linkend="WORKGROUP">
<parameter>workgroup</parameter></link> it is in. Samba 2.2
@@ -2313,20 +2318,20 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="DOMAINMASTER"/>domain master (G)</term>
- <listitem><para>Tell <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> to enable WAN-wide browse list
+ <term><anchor id="DOMAINMASTER">domain master (G)</term>
+ <listitem><para>Tell <ulink url="nmbd.8.html"><command>
+ nmbd(8)</command></ulink> to enable WAN-wide browse list
collation. Setting this option causes <command>nmbd</command> to
claim a special domain specific NetBIOS name that identifies
it as a domain master browser for its given <link linkend="WORKGROUP">
<parameter>workgroup</parameter></link>. Local master browsers
in the same <parameter>workgroup</parameter> on broadcast-isolated
subnets will give this <command>nmbd</command> their local browse lists,
- and then ask <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> for a complete copy of the browse
- list for the whole wide area network. Browser clients will then contact
- their local master browser, and will receive the domain-wide browse list,
- instead of just the list for their broadcast-isolated subnet.</para>
+ and then ask <ulink url="smbd.8.html"><command>smbd(8)</command></ulink>
+ for a complete copy of the browse list for the whole wide area
+ network. Browser clients will then contact their local master browser,
+ and will receive the domain-wide browse list, instead of just the list
+ for their broadcast-isolated subnet.</para>
<para>Note that Windows NT Primary Domain Controllers expect to be
able to claim this <parameter>workgroup</parameter> specific special
@@ -2351,7 +2356,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="DONTDESCEND"/>dont descend (S)</term>
+ <term><anchor id="DONTDESCEND">dont descend (S)</term>
<listitem><para>There are certain directories on some systems
(e.g., the <filename>/proc</filename> tree under Linux) that are either not
of interest to clients or are infinitely deep (recursive). This
@@ -2370,22 +2375,22 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="DOSCHARSET"/>dos charset (G)</term>
+ <term><anchor id="DOSCHARSET">dos charset (G)</term>
<listitem><para>DOS SMB clients assume the server has
the same charset as they do. This option specifies which
charset Samba should talk to DOS clients.
</para>
- <para>The default depends on which charsets you have installed.
+ <para>The default depends on which charsets you have instaled.
Samba tries to use charset 850 but falls back to ASCII in
- case it is not available. Run <citerefentry><refentrytitle>testparm</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry> to check the default on your system.
+ case it is not available. Run <ulink url="testparm.1.html">testparm(1)
+ </ulink> to check the default on your system.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><anchor id="DOSFILEMODE"/>dos filemode (S)</term>
+ <term><anchor id="DOSFILEMODE">dos filemode (S)</term>
<listitem><para> The default behavior in Samba is to provide
UNIX-like behavior where only the owner of a file/directory is
able to change the permissions on it. However, this behavior
@@ -2404,13 +2409,13 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="DOSFILETIMERESOLUTION"/>dos filetime resolution (S)</term>
+ <term><anchor id="DOSFILETIMERESOLUTION">dos filetime resolution (S)</term>
<listitem><para>Under the DOS and Windows FAT filesystem, the finest
granularity on time resolution is two seconds. Setting this parameter
for a share causes Samba to round the reported time down to the
nearest two second boundary when a query call that requires one second
- resolution is made to <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>.</para>
+ resolution is made to <ulink url="smbd.8.html"><command>smbd(8)</command>
+ </ulink>.</para>
<para>This option is mainly used as a compatibility option for Visual
C++ when used against Samba shares. If oplocks are enabled on a
@@ -2430,15 +2435,14 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="DOSFILETIMES"/>dos filetimes (S)</term>
+ <term><anchor id="DOSFILETIMES">dos filetimes (S)</term>
<listitem><para>Under DOS and Windows, if a user can write to a
file they can change the timestamp on it. Under POSIX semantics,
only the owner of the file or root may change the timestamp. By
default, Samba runs with POSIX semantics and refuses to change the
timestamp on a file if the user <command>smbd</command> is acting
on behalf of is not the file owner. Setting this option to <constant>
- yes</constant> allows DOS semantics and <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> will change the file
+ yes</constant> allows DOS semantics and <ulink url="smbd.8.html">smbd</ulink> will change the file
timestamp as DOS requires.</para>
<para>Default: <command>dos filetimes = no</command></para></listitem>
@@ -2447,19 +2451,19 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="ENCRYPTPASSWORDS"/>encrypt passwords (G)</term>
+ <term><anchor id="ENCRYPTPASSWORDS">encrypt passwords (G)</term>
<listitem><para>This boolean controls whether encrypted passwords
will be negotiated with the client. Note that Windows NT 4.0 SP3 and
above and also Windows 98 will by default expect encrypted passwords
unless a registry entry is changed. To use encrypted passwords in
- Samba see the chapter User Database in the Samba HOWTO Collection.</para>
+ Samba see the file ENCRYPTION.txt in the Samba documentation
+ directory <filename>docs/</filename> shipped with the source code.</para>
<para>In order for encrypted passwords to work correctly
- <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> must either
- have access to a local <citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file (see the <citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> program for information on how to set up
+ <ulink url="smbd.8.html"><command>smbd(8)</command></ulink> must either
+ have access to a local <ulink url="smbpasswd.5.html"><filename>smbpasswd(5)
+ </filename></ulink> file (see the <ulink url="smbpasswd.8.html"><command>
+ smbpasswd(8)</command></ulink> program for information on how to set up
and maintain this file), or set the <link
linkend="SECURITY">security = [server|domain|ads]</link> parameter which
causes <command>smbd</command> to authenticate against another
@@ -2470,7 +2474,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="ENHANCEDBROWSING"/>enhanced browsing (G)</term>
+ <term><anchor id="ENHANCEDBROWSING">enhanced browsing (G)</term>
<listitem><para>This option enables a couple of enhancements to
cross-subnet browse propagation that have been added in Samba
but which are not standard in Microsoft implementations.
@@ -2496,7 +2500,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="ENUMPORTSCOMMAND"/>enumports command (G)</term>
+ <term><anchor id="ENUMPORTSCOMMAND">enumports command (G)</term>
<listitem><para>The concept of a "port" is fairly foreign
to UNIX hosts. Under Windows NT/2000 print servers, a port
is associated with a port monitor and generally takes the form of
@@ -2519,7 +2523,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="EXEC"/>exec (S)</term>
+ <term><anchor id="EXEC">exec (S)</term>
<listitem><para>This is a synonym for <link linkend="PREEXEC">
<parameter>preexec</parameter></link>.</para></listitem>
</varlistentry>
@@ -2527,7 +2531,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="FAKEDIRECTORYCREATETIMES"/>fake directory create times (S)</term>
+ <term><anchor id="FAKEDIRECTORYCREATETIMES">fake directory create times (S)</term>
<listitem><para>NTFS and Windows VFAT file systems keep a create
time for all files and directories. This is not the same as the
ctime - status change time - that Unix keeps, so Samba by default
@@ -2561,7 +2565,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="FAKEOPLOCKS"/>fake oplocks (S)</term>
+ <term><anchor id="FAKEOPLOCKS">fake oplocks (S)</term>
<listitem><para>Oplocks are the way that SMB clients get permission
from a server to locally cache file operations. If a server grants
an oplock (opportunistic lock) then the client is free to assume
@@ -2593,11 +2597,10 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="FOLLOWSYMLINKS"/>follow symlinks (S)</term>
+ <term><anchor id="FOLLOWSYMLINKS">follow symlinks (S)</term>
<listitem><para>This parameter allows the Samba administrator
- to stop <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> from following symbolic
- links in a particular share. Setting this
+ to stop <ulink url="smbd.8.html"><command>smbd(8)</command></ulink>
+ from following symbolic links in a particular share. Setting this
parameter to <constant>no</constant> prevents any file or directory
that is a symbolic link from being followed (the user will get an
error). This option is very useful to stop users from adding a
@@ -2614,7 +2617,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="FORCECREATEMODE"/>force create mode (S)</term>
+ <term><anchor id="FORCECREATEMODE">force create mode (S)</term>
<listitem><para>This parameter specifies a set of UNIX mode bit
permissions that will <emphasis>always</emphasis> be set on a
file created by Samba. This is done by bitwise 'OR'ing these bits onto
@@ -2642,7 +2645,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="FORCEDIRECTORYMODE"/>force directory mode (S)</term>
+ <term><anchor id="FORCEDIRECTORYMODE">force directory mode (S)</term>
<listitem><para>This parameter specifies a set of UNIX mode bit
permissions that will <emphasis>always</emphasis> be set on a directory
created by Samba. This is done by bitwise 'OR'ing these bits onto the
@@ -2671,7 +2674,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="FORCEDIRECTORYSECURITYMODE"/>force directory security mode (S)</term>
+ <term><anchor id="FORCEDIRECTORYSECURITYMODE">force directory security mode (S)</term>
<listitem><para>This parameter controls what UNIX permission bits
can be modified when a Windows NT client is manipulating the UNIX
permission on a directory using the native NT security dialog box.</para>
@@ -2707,7 +2710,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="FORCEGROUP"/>force group (S)</term>
+ <term><anchor id="FORCEGROUP">force group (S)</term>
<listitem><para>This specifies a UNIX group name that will be
assigned as the default primary group for all users connecting
to this service. This is useful for sharing files by ensuring
@@ -2743,7 +2746,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="FORCESECURITYMODE"/>force security mode (S)</term>
+ <term><anchor id="FORCESECURITYMODE">force security mode (S)</term>
<listitem><para>This parameter controls what UNIX permission
bits can be modified when a Windows NT client is manipulating
the UNIX permission on a file using the native NT security dialog
@@ -2781,7 +2784,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="FORCEUSER"/>force user (S)</term>
+ <term><anchor id="FORCEUSER">force user (S)</term>
<listitem><para>This specifies a UNIX user name that will be
assigned as the default user for all users connecting to this service.
This is useful for sharing files. You should also use it carefully
@@ -2809,11 +2812,11 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="FSTYPE"/>fstype (S)</term>
+ <term><anchor id="FSTYPE">fstype (S)</term>
<listitem><para>This parameter allows the administrator to
configure the string that specifies the type of filesystem a share
- is using that is reported by <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> when a client queries the filesystem type
+ is using that is reported by <ulink url="smbd.8.html"><command>smbd(8)
+ </command></ulink> when a client queries the filesystem type
for a share. The default type is <constant>NTFS</constant> for
compatibility with Windows NT but this can be changed to other
strings such as <constant>Samba</constant> or <constant>FAT
@@ -2826,7 +2829,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="GETWDCACHE"/>getwd cache (G)</term>
+ <term><anchor id="GETWDCACHE">getwd cache (G)</term>
<listitem><para>This is a tuning option. When this is enabled a
caching algorithm will be used to reduce the time taken for getwd()
calls. This can have a significant impact on performance, especially
@@ -2840,7 +2843,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="GROUP"/>group (S)</term>
+ <term><anchor id="GROUP">group (S)</term>
<listitem><para>Synonym for <link linkend="FORCEGROUP"><parameter>force
group</parameter></link>.</para></listitem>
</varlistentry>
@@ -2848,7 +2851,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="GUESTACCOUNT"/>guest account (S)</term>
+ <term><anchor id="GUESTACCOUNT">guest account (S)</term>
<listitem><para>This is a username which will be used for access
to services which are specified as <link linkend="GUESTOK"><parameter>
guest ok</parameter></link> (see below). Whatever privileges this
@@ -2878,16 +2881,12 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="GUESTOK"/>guest ok (S)</term>
+ <term><anchor id="GUESTOK">guest ok (S)</term>
<listitem><para>If this parameter is <constant>yes</constant> for
a service, then no password is required to connect to the service.
Privileges will be those of the <link linkend="GUESTACCOUNT"><parameter>
guest account</parameter></link>.</para>
- <para>This paramater nullifies the benifits of setting
- <link linkend="RESTRICTANONYMOUS"><parameter>restrict
- anonymous</parameter></link> = 2</para>
-
<para>See the section below on <link linkend="SECURITY"><parameter>
security</parameter></link> for more information about this option.
</para>
@@ -2898,7 +2897,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="GUESTONLY"/>guest only (S)</term>
+ <term><anchor id="GUESTONLY">guest only (S)</term>
<listitem><para>If this parameter is <constant>yes</constant> for
a service, then only guest connections to the service are permitted.
This parameter will have no effect if <link linkend="GUESTOK">
@@ -2914,7 +2913,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="HIDEDOTFILES"/>hide dot files (S)</term>
+ <term><anchor id="HIDEDOTFILES">hide dot files (S)</term>
<listitem><para>This is a boolean parameter that controls whether
files starting with a dot appear as hidden files.</para>
@@ -2924,7 +2923,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="HIDEFILES"/>hide files(S)</term>
+ <term><anchor id="HIDEFILES">hide files(S)</term>
<listitem><para>This is a list of files or directories that are not
visible but are accessible. The DOS 'hidden' attribute is applied
to any files or directories that match.</para>
@@ -2962,7 +2961,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="HIDELOCALUSERS"/>hide local users(G)</term>
+ <term><anchor id="HIDELOCALUSERS">hide local users(G)</term>
<listitem><para>This parameter toggles the hiding of local UNIX
users (root, wheel, floppy, etc) from remote clients.</para>
@@ -2972,7 +2971,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="HIDEUNREADABLE"/>hide unreadable (G)</term>
+ <term><anchor id="HIDEUNREADABLE">hide unreadable (G)</term>
<listitem><para>This parameter prevents clients from seeing the
existance of files that cannot be read. Defaults to off.</para>
@@ -2981,7 +2980,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="HIDEUNWRITEABLEFILES"/>hide unwriteable files (G)</term>
+ <term><anchor id="HIDEUNWRITEABLEFILES">hide unwriteable files (G)</term>
<listitem><para>This parameter prevents clients from seeing
the existance of files that cannot be written to. Defaults to off.
Note that unwriteable directories are shown as usual.
@@ -2992,7 +2991,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="HIDESPECIALFILES"/>hide special files (G)</term>
+ <term><anchor id="HIDESPECIALFILES">hide special files (G)</term>
<listitem><para>This parameter prevents clients from seeing
special files such as sockets, devices and fifo's in directory
listings.
@@ -3003,10 +3002,10 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="HOMEDIRMAP"/>homedir map (G)</term>
+ <term><anchor id="HOMEDIRMAP">homedir map (G)</term>
<listitem><para>If<link linkend="NISHOMEDIR"><parameter>nis homedir
- </parameter></link> is <constant>yes</constant>, and <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> is also acting
+ </parameter></link> is <constant>yes</constant>, and <ulink
+ url="smbd.8.html"><command>smbd(8)</command></ulink> is also acting
as a Win95/98 <parameter>logon server</parameter> then this parameter
specifies the NIS (or YP) map from which the server for the user's
home directory should be extracted. At present, only the Sun
@@ -3019,8 +3018,8 @@ df $1 | tail -1 | awk '{print $2" "$4}'
that copes with different map formats and also Amd (another
automounter) maps.</para>
- <note><para>A working NIS client is required on
- the system for this option to work.</para></note>
+ <para><emphasis>NOTE :</emphasis>A working NIS client is required on
+ the system for this option to work.</para>
<para>See also <link linkend="NISHOMEDIR"><parameter>nis homedir</parameter>
</link>, <link linkend="DOMAINLOGONS"><parameter>domain logons</parameter>
@@ -3036,7 +3035,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="HOSTMSDFS"/>host msdfs (G)</term>
+ <term><anchor id="HOSTMSDFS">host msdfs (G)</term>
<listitem><para>This boolean parameter is only available
if Samba has been configured and compiled with the <command>
--with-msdfs</command> option. If set to <constant>yes</constant>,
@@ -3054,7 +3053,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="HOSTNAMELOOKUPS"/>hostname lookups (G)</term>
+ <term><anchor id="HOSTNAMELOOKUPS">hostname lookups (G)</term>
<listitem><para>Specifies whether samba should use (expensive)
hostname lookups or use the ip addresses instead. An example place
where hostname lookups are currently used is when checking
@@ -3070,7 +3069,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="HOSTSALLOW"/>hosts allow (S)</term>
+ <term><anchor id="HOSTSALLOW">hosts allow (S)</term>
<listitem><para>A synonym for this parameter is <parameter>allow
hosts</parameter>.</para>
@@ -3119,9 +3118,9 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<para>Note that access still requires suitable user-level passwords.</para>
- <para>See <citerefentry><refentrytitle>testparm</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry> for a way of testing your host access
- to see if it does what you expect.</para>
+ <para>See <ulink url="testparm.1.html"><command>testparm(1)</command>
+ </ulink> for a way of testing your host access to see if it does
+ what you expect.</para>
<para>Default: <emphasis>none (i.e., all hosts permitted access)
</emphasis></para>
@@ -3134,7 +3133,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="HOSTSDENY"/>hosts deny (S)</term>
+ <term><anchor id="HOSTSDENY">hosts deny (S)</term>
<listitem><para>The opposite of <parameter>hosts allow</parameter>
- hosts listed here are <emphasis>NOT</emphasis> permitted access to
services unless the specific services have their own lists to override
@@ -3151,7 +3150,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="HOSTSEQUIV"/>hosts equiv (G)</term>
+ <term><anchor id="HOSTSEQUIV">hosts equiv (G)</term>
<listitem><para>If this global parameter is a non-null string,
it specifies the name of a file to read for the names of hosts
and users who will be allowed access without specifying a password.
@@ -3163,14 +3162,14 @@ df $1 | tail -1 | awk '{print $2" "$4}'
hosts equiv</parameter> may be useful for NT clients which will
not supply passwords to Samba.</para>
- <note><para>The use of <parameter>hosts equiv
+ <para><emphasis>NOTE :</emphasis> The use of <parameter>hosts equiv
</parameter> can be a major security hole. This is because you are
trusting the PC to supply the correct username. It is very easy to
get a PC to supply a false username. I recommend that the
<parameter>hosts equiv</parameter> option be only used if you really
know what you are doing, or perhaps on a home network where you trust
your spouse and kids. And only if you <emphasis>really</emphasis> trust
- them :-).</para></note>
+ them :-).</para>
<para>Default: <emphasis>no host equivalences</emphasis></para>
<para>Example: <command>hosts equiv = /etc/hosts.equiv</command></para>
@@ -3180,7 +3179,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="INCLUDE"/>include (G)</term>
+ <term><anchor id="INCLUDE">include (G)</term>
<listitem><para>This allows you to include one config file
inside another. The file is included literally, as though typed
in place.</para>
@@ -3197,7 +3196,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="INHERITACLS"/>inherit acls (S)</term>
+ <term><anchor id="INHERITACLS">inherit acls (S)</term>
<listitem><para>This parameter can be used to ensure
that if default acls exist on parent directories,
they are always honored when creating a subdirectory.
@@ -3215,7 +3214,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="INHERITPERMISSIONS"/>inherit permissions (S)</term>
+ <term><anchor id="INHERITPERMISSIONS">inherit permissions (S)</term>
<listitem><para>The permissions on new files and directories
are normally governed by <link linkend="CREATEMASK"><parameter>
create mask</parameter></link>, <link linkend="DIRECTORYMASK">
@@ -3256,7 +3255,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="INTERFACES"/>interfaces (G)</term>
+ <term><anchor id="INTERFACES">interfaces (G)</term>
<listitem><para>This option allows you to override the default
network interfaces list that Samba will use for browsing, name
registration and other NBT traffic. By default Samba will query
@@ -3308,7 +3307,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="INVALIDUSERS"/>invalid users (S)</term>
+ <term><anchor id="INVALIDUSERS">invalid users (S)</term>
<listitem><para>This is a list of users that should not be allowed
to login to this service. This is really a <emphasis>paranoid</emphasis>
check to absolutely ensure an improper setting does not breach
@@ -3320,12 +3319,12 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<para>A name starting with '+' is interpreted only
by looking in the UNIX group database. A name starting with
- '&amp;' is interpreted only by looking in the NIS netgroup database
+ '&' is interpreted only by looking in the NIS netgroup database
(this requires NIS to be working on your system). The characters
- '+' and '&amp;' may be used at the start of the name in either order
+ '+' and '&' may be used at the start of the name in either order
so the value <parameter>+&amp;group</parameter> means check the
UNIX group database, followed by the NIS netgroup database, and
- the value <parameter>&amp;+group</parameter> means check the NIS
+ the value <parameter>&+group</parameter> means check the NIS
netgroup database, followed by the UNIX group database (the
same as the '@' prefix).</para>
@@ -3344,7 +3343,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="KEEPALIVE"/>keepalive (G)</term>
+ <term><anchor id="KEEPALIVE">keepalive (G)</term>
<listitem><para>The value of the parameter (an integer) represents
the number of seconds between <parameter>keepalive</parameter>
packets. If this parameter is zero, no keepalive packets will be
@@ -3364,7 +3363,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="KERNELOPLOCKS"/>kernel oplocks (G)</term>
+ <term><anchor id="KERNELOPLOCKS">kernel oplocks (G)</term>
<listitem><para>For UNIXes that support kernel based <link
linkend="OPLOCKS"><parameter>oplocks</parameter></link>
(currently only IRIX and the Linux 2.4 kernel), this parameter
@@ -3372,10 +3371,10 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<para>Kernel oplocks support allows Samba <parameter>oplocks
</parameter> to be broken whenever a local UNIX process or NFS operation
- accesses a file that <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> has oplocked. This allows complete
- data consistency between SMB/CIFS, NFS and local file access (and is
- a <emphasis>very</emphasis> cool feature :-).</para>
+ accesses a file that <ulink url="smbd.8.html"><command>smbd(8)</command>
+ </ulink> has oplocked. This allows complete data consistency between
+ SMB/CIFS, NFS and local file access (and is a <emphasis>very</emphasis>
+ cool feature :-).</para>
<para>This parameter defaults to <constant>on</constant>, but is translated
to a no-op on systems that no not have the necessary kernel support.
@@ -3393,12 +3392,12 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LANMANAUTH"/>lanman auth (G)</term>
- <listitem><para>This parameter determines whether or not <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> will attempt to authenticate users
- using the LANMAN password hash. If disabled, only clients which support NT
- password hashes (e.g. Windows NT/2000 clients, smbclient, etc... but not
- Windows 95/98 or the MS DOS network client) will be able to connect to the Samba host.</para>
+ <term><anchor id="LANMANAUTH">lanman auth (G)</term>
+ <listitem><para>This parameter determines whether or not <ulink url="smbd.8.html">smbd</ulink> will
+ attempt to authenticate users using the LANMAN password hash.
+ If disabled, only clients which support NT password hashes (e.g. Windows
+ NT/2000 clients, smbclient, etc... but not Windows 95/98 or the MS DOS
+ network client) will be able to connect to the Samba host.</para>
<para>Default : <command>lanman auth = yes</command></para>
</listitem>
@@ -3409,10 +3408,9 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LARGEREADWRITE"/>large readwrite (G)</term>
- <listitem><para>This parameter determines whether or not <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> supports the new 64k streaming
- read and write varient SMB requests introduced
+ <term><anchor id="LARGEREADWRITE">large readwrite (G)</term>
+ <listitem><para>This parameter determines whether or not <ulink url="smbd.8.html">smbd</ulink>
+ supports the new 64k streaming read and write varient SMB requests introduced
with Windows 2000. Note that due to Windows 2000 client redirector bugs
this requires Samba to be running on a 64-bit capable operating system such
as IRIX, Solaris or a Linux 2.4 kernel. Can improve performance by 10% with
@@ -3427,15 +3425,15 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LDAPADMINDN"/>ldap admin dn (G)</term>
- <listitem><para> The <parameter>ldap admin dn</parameter> defines the Distinguished
+ <term><anchor id="LDAPADMINDN">ldap admin dn (G)</term>
+ <listitem><para>The <parameter>ldap admin dn</parameter> defines the Distinguished
Name (DN) name used by Samba to contact the ldap server when retreiving
user account information. The <parameter>ldap
admin dn</parameter> is used in conjunction with the admin dn password
stored in the <filename>private/secrets.tdb</filename> file. See the
- <citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> man page for more information on how
- to accmplish this.</para>
+ <ulink url="smbpasswd.8.html"><command>smbpasswd(8)</command></ulink> man
+ page for more information on how to accomplish this.
+ </para>
</listitem>
</varlistentry>
@@ -3452,7 +3450,17 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LDAPFILTER"/>ldap filter (G)</term>
+ <term><anchor id="LDAPDELONLYSAMATTR"/>ldap del only sam attr (G)</term>
+ <listitem><para> Inverted synonym for <link linkend="LDAPDELETEDN"><parameter>
+ ldap delete dn</parameter></link>.
+ </para>
+ </listitem>
+ </varlistentry>
+
+
+
+ <varlistentry>
+ <term><anchor id="LDAPFILTER">ldap filter (G)</term>
<listitem><para>This parameter specifies the RFC 2254 compliant LDAP search filter.
The default is to match the login name with the <constant>uid</constant>
attribute for all entries matching the <constant>sambaAccount</constant>
@@ -3466,7 +3474,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LDAPPORT"/>ldap port (G)</term>
+ <term><anchor id="LDAPPORT">ldap port (G)</term>
<listitem><para>This parameter is only available if Samba has been
configure to include the <command>--with-ldapsam</command> option
at compile time.
@@ -3488,7 +3496,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LDAPSERVER"/>ldap server (G)</term>
+ <term><anchor id="LDAPSERVER">ldap server (G)</term>
<listitem><para>This parameter is only available if Samba has been
configure to include the <command>--with-ldapsam</command> option
at compile time.
@@ -3505,7 +3513,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LDAPSSL"/>ldap ssl (G)</term>
+ <term><anchor id="LDAPSSL">ldap ssl (G)</term>
<listitem><para>This option is used to define whether or not Samba should
use SSL when connecting to the ldap server
This is <emphasis>NOT</emphasis> related to
@@ -3539,7 +3547,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LDAPSUFFIX"/>ldap suffix (G)</term>
+ <term><anchor id="LDAPSUFFIX">ldap suffix (G)</term>
<listitem>
<para>Specifies where user and machine accounts are added to the tree. Can be overriden by <command>ldap user suffix</command> and <command>ldap machine suffix</command>. It also used as the base dn for all ldap searches. </para>
@@ -3550,7 +3558,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LDAPUSERSUFFIX"/>ldap user suffix (G)</term>
+ <term><anchor id="LDAPUSERSUFFIX">ldap user suffix (G)</term>
<listitem><para>It specifies where users are added to the tree.
</para>
@@ -3563,7 +3571,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LDAPMACHINESUFFIX"/>ldap machine suffix (G)</term>
+ <term><anchor id="LDAPMACHINESUFFIX">ldap machine suffix (G)</term>
<listitem><para>It specifies where machines should be
added to the ldap tree.
</para>
@@ -3575,7 +3583,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="LDAPPASSWDSYNC"/>ldap passwd sync (G)</term>
+ <term><anchor id="LDAPPASSWDSYNC">ldap passwd sync (G)</term>
<listitem><para>This option is used to define whether
or not Samba should sync the LDAP password with the NT
and LM hashes for normal accounts (NOT for
@@ -3599,7 +3607,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="LDAPTRUSTIDS"/>ldap trust ids (G)</term>
+ <term><anchor id="LDAPTRUSTIDS">ldap trust ids (G)</term>
<listitem><para>Normally, Samba validates each entry
in the LDAP server against getpwnam(). This allows
LDAP to be used for Samba with the unix system using
@@ -3618,7 +3626,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="LEVEL2OPLOCKS"/>level2 oplocks (S)</term>
+ <term><anchor id="LEVEL2OPLOCKS">level2 oplocks (S)</term>
<listitem><para>This parameter controls whether Samba supports
level2 (read-only) oplocks on a share.</para>
@@ -3662,9 +3670,9 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LMANNOUNCE"/>lm announce (G)</term>
- <listitem><para>This parameter determines if <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> will produce Lanman announce
+ <term><anchor id="LMANNOUNCE">lm announce (G)</term>
+ <listitem><para>This parameter determines if <ulink url="nmbd.8.html">
+ <command>nmbd(8)</command></ulink> will produce Lanman announce
broadcasts that are needed by OS/2 clients in order for them to see
the Samba server in their browse list. This parameter can have three
values, <constant>yes</constant>, <constant>no</constant>, or
@@ -3689,7 +3697,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LMINTERVAL"/>lm interval (G)</term>
+ <term><anchor id="LMINTERVAL">lm interval (G)</term>
<listitem><para>If Samba is set to produce Lanman announce
broadcasts needed by OS/2 clients (see the <link linkend="LMANNOUNCE">
<parameter>lm announce</parameter></link> parameter) then this
@@ -3709,7 +3717,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LOADPRINTERS"/>load printers (G)</term>
+ <term><anchor id="LOADPRINTERS">load printers (G)</term>
<listitem><para>A boolean variable that controls whether all
printers in the printcap will be loaded for browsing by default.
See the <link linkend="PRINTERSSECT">printers</link> section for
@@ -3722,9 +3730,9 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LOCALMASTER"/>local master (G)</term>
- <listitem><para>This option allows <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> to try and become a local master browser
+ <term><anchor id="LOCALMASTER">local master (G)</term>
+ <listitem><para>This option allows <ulink url="nmbd.8.html"><command>
+ nmbd(8)</command></ulink> to try and become a local master browser
on a subnet. If set to <constant>no</constant> then <command>
nmbd</command> will not attempt to become a local master browser
on a subnet and will also lose in all browsing elections. By
@@ -3743,7 +3751,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LOCKDIR"/>lock dir (G)</term>
+ <term><anchor id="LOCKDIR">lock dir (G)</term>
<listitem><para>Synonym for <link linkend="LOCKDIRECTORY"><parameter>
lock directory</parameter></link>.</para></listitem>
</varlistentry>
@@ -3751,7 +3759,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LOCKDIRECTORY"/>lock directory (G)</term>
+ <term><anchor id="LOCKDIRECTORY">lock directory (G)</term>
<listitem><para>This option specifies the directory where lock
files will be placed. The lock files are used to implement the
<link linkend="MAXCONNECTIONS"><parameter>max connections</parameter>
@@ -3765,7 +3773,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LOCKSPINCOUNT"/>lock spin count (G)</term>
+ <term><anchor id="LOCKSPINCOUNT">lock spin count (G)</term>
<listitem><para>This parameter controls the number of times
that smbd should attempt to gain a byte range lock on the
behalf of a client request. Experiments have shown that
@@ -3784,7 +3792,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LOCKSPINTIME"/>lock spin time (G)</term>
+ <term><anchor id="LOCKSPINTIME">lock spin time (G)</term>
<listitem><para>The time in microseconds that smbd should
pause before attempting to gain a failed lock. See
<link linkend="LOCKSPINCOUNT"><parameter>lock spin
@@ -3798,7 +3806,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LOCKING"/>locking (S)</term>
+ <term><anchor id="LOCKING">locking (S)</term>
<listitem><para>This controls whether or not locking will be
performed by the server in response to lock requests from the
client.</para>
@@ -3826,7 +3834,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LOGFILE"/>log file (G)</term>
+ <term><anchor id="LOGFILE">log file (G)</term>
<listitem><para>This option allows you to override the name
of the Samba log file (also known as the debug file).</para>
@@ -3840,7 +3848,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LOGLEVEL"/>log level (G)</term>
+ <term><anchor id="LOGLEVEL">log level (G)</term>
<listitem><para>The value of the parameter (a astring) allows
the debug level (logging level) to be specified in the
<filename>smb.conf</filename> file. This parameter has been
@@ -3858,7 +3866,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LOGONDRIVE"/>logon drive (G)</term>
+ <term><anchor id="LOGONDRIVE">logon drive (G)</term>
<listitem><para>This parameter specifies the local path to
which the home directory will be connected (see <link
linkend="LOGONHOME"><parameter>logon home</parameter></link>)
@@ -3875,7 +3883,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LOGONHOME"/>logon home (G)</term>
+ <term><anchor id="LOGONHOME">logon home (G)</term>
<listitem><para>This parameter specifies the home directory
location when a Win95/98 or NT Workstation logs into a Samba PDC.
It allows you to do </para>
@@ -3917,7 +3925,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LOGONPATH"/>logon path (G)</term>
+ <term><anchor id="LOGONPATH">logon path (G)</term>
<listitem><para>This parameter specifies the home directory
where roaming profiles (NTuser.dat etc files for Windows NT) are
stored. Contrary to previous versions of these manual pages, it has
@@ -3965,7 +3973,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LOGONSCRIPT"/>logon script (G)</term>
+ <term><anchor id="LOGONSCRIPT">logon script (G)</term>
<listitem><para>This parameter specifies the batch file (.bat) or
NT command file (.cmd) to be downloaded and run on a machine when
a user successfully logs in. The file must contain the DOS
@@ -4007,7 +4015,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LPPAUSECOMMAND"/>lppause command (S)</term>
+ <term><anchor id="LPPAUSECOMMAND">lppause command (S)</term>
<listitem><para>This parameter specifies the command to be
executed on the server host in order to stop printing or spooling
a specific print job.</para>
@@ -4051,7 +4059,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LPQCACHETIME"/>lpq cache time (G)</term>
+ <term><anchor id="LPQCACHETIME">lpq cache time (G)</term>
<listitem><para>This controls how long lpq info will be cached
for to prevent the <command>lpq</command> command being called too
often. A separate cache is kept for each variation of the <command>
@@ -4080,7 +4088,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LPQCOMMAND"/>lpq command (S)</term>
+ <term><anchor id="LPQCOMMAND">lpq command (S)</term>
<listitem><para>This parameter specifies the command to be
executed on the server host in order to obtain <command>lpq
</command>-style printer status information.</para>
@@ -4124,7 +4132,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LPRESUMECOMMAND"/>lpresume command (S)</term>
+ <term><anchor id="LPRESUMECOMMAND">lpresume command (S)</term>
<listitem><para>This parameter specifies the command to be
executed on the server host in order to restart or continue
printing or spooling a specific print job.</para>
@@ -4164,7 +4172,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="LPRMCOMMAND"/>lprm command (S)</term>
+ <term><anchor id="LPRMCOMMAND">lprm command (S)</term>
<listitem><para>This parameter specifies the command to be
executed on the server host in order to delete a print job.</para>
@@ -4194,7 +4202,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MACHINEPASSWORDTIMEOUT"/>machine password timeout (G)</term>
+ <term><anchor id="MACHINEPASSWORDTIMEOUT">machine password timeout (G)</term>
<listitem><para>If a Samba server is a member of a Windows
NT Domain (see the <link linkend="SECURITYEQUALSDOMAIN">security = domain</link>)
parameter) then periodically a running <ulink url="smbd.8.html">
@@ -4204,8 +4212,8 @@ df $1 | tail -1 | awk '{print $2" "$4}'
will be changed, in seconds. The default is one week (expressed in
seconds), the same as a Windows NT Domain member server.</para>
- <para>See also <citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, and the <link linkend="SECURITYEQUALSDOMAIN">
+ <para>See also <ulink url="smbpasswd.8.html"><command>smbpasswd(8)
+ </command></ulink>, and the <link linkend="SECURITYEQUALSDOMAIN">
security = domain</link>) parameter.</para>
<para>Default: <command>machine password timeout = 604800</command></para>
@@ -4214,7 +4222,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAGICOUTPUT"/>magic output (S)</term>
+ <term><anchor id="MAGICOUTPUT">magic output (S)</term>
<listitem><para>This parameter specifies the name of a file
which will contain output created by a magic script (see the
<link linkend="MAGICSCRIPT"><parameter>magic script</parameter></link>
@@ -4234,7 +4242,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAGICSCRIPT"/>magic script (S)</term>
+ <term><anchor id="MAGICSCRIPT">magic script (S)</term>
<listitem><para>This parameter specifies the name of a file which,
if opened, will be executed by the server when the file is closed.
This allows a UNIX script to be sent to the Samba host and
@@ -4265,7 +4273,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MANGLECASE"/>mangle case (S)</term>
+ <term><anchor id="MANGLECASE">mangle case (S)</term>
<listitem><para>See the section on <link linkend="NAMEMANGLINGSECT">
NAME MANGLING</link></para>
@@ -4275,7 +4283,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MANGLEDMAP"/>mangled map (S)</term>
+ <term><anchor id="MANGLEDMAP">mangled map (S)</term>
<listitem><para>This is for those who want to directly map UNIX
file names which cannot be represented on Windows/DOS. The mangling
of names is not always what is needed. In particular you may have
@@ -4300,7 +4308,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MANGLEDNAMES"/>mangled names (S)</term>
+ <term><anchor id="MANGLEDNAMES">mangled names (S)</term>
<listitem><para>This controls whether non-DOS names under UNIX
should be mapped to DOS-compatible names ("mangled") and made visible,
or whether non-DOS names should simply be ignored.</para>
@@ -4359,7 +4367,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="MANGLINGMETHOD"/>mangling method (G)</term>
+ <term><anchor id="MANGLINGMETHOD">mangling method (G)</term>
<listitem><para> controls the algorithm used for the generating
the mangled names. Can take two different values, "hash" and
"hash2". "hash" is the default and is the algorithm that has been
@@ -4374,7 +4382,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="MANGLEPREFIX"/>mangle prefix (G)</term>
+ <term><anchor id="MANGLEPREFIX">mangle prefix (G)</term>
<listitem><para> controls the number of prefix
characters from the original name used when generating
the mangled names. A larger value will give a weaker
@@ -4386,10 +4394,10 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="MANGLEDSTACK"/>mangled stack (G)</term>
+ <term><anchor id="MANGLEDSTACK">mangled stack (G)</term>
<listitem><para>This parameter controls the number of mangled names
- that should be cached in the Samba server <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>.</para>
+ that should be cached in the Samba server <ulink url="smbd.8.html">
+ smbd(8)</ulink>.</para>
<para>This stack is a list of recently mangled base names
(extensions are only maintained if they are longer than 3 characters
@@ -4413,7 +4421,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MANGLINGCHAR"/>mangling char (S)</term>
+ <term><anchor id="MANGLINGCHAR">mangling char (S)</term>
<listitem><para>This controls what character is used as
the <emphasis>magic</emphasis> character in <link
linkend="NAMEMANGLINGSECT">name mangling</link>. The default is a '~'
@@ -4430,7 +4438,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAPARCHIVE"/>map archive (S)</term>
+ <term><anchor id="MAPARCHIVE">map archive (S)</term>
<listitem><para>This controls whether the DOS archive attribute
should be mapped to the UNIX owner execute bit. The DOS archive bit
is set when a file has been modified since its last backup. One
@@ -4450,7 +4458,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAPHIDDEN"/>map hidden (S)</term>
+ <term><anchor id="MAPHIDDEN">map hidden (S)</term>
<listitem><para>This controls whether DOS style hidden files
should be mapped to the UNIX world execute bit.</para>
@@ -4465,7 +4473,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAPSYSTEM"/>map system (S)</term>
+ <term><anchor id="MAPSYSTEM">map system (S)</term>
<listitem><para>This controls whether DOS style system files
should be mapped to the UNIX group execute bit.</para>
@@ -4480,15 +4488,14 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAPTOGUEST"/>map to guest (G)</term>
+ <term><anchor id="MAPTOGUEST">map to guest (G)</term>
<listitem><para>This parameter is only useful in <link linkend="SECURITY">
security</link> modes other than <parameter>security = share</parameter>
- i.e. <constant>user</constant>, <constant>server</constant>,
and <constant>domain</constant>.</para>
<para>This parameter can take three different values, which tell
- <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> what to do with user
+ <ulink url="smbd.8.html">smbd(8)</ulink> what to do with user
login requests that don't match a valid UNIX user in some way.</para>
<para>The three settings are :</para>
@@ -4536,7 +4543,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAXCONNECTIONS"/>max connections (S)</term>
+ <term><anchor id="MAXCONNECTIONS">max connections (S)</term>
<listitem><para>This option allows the number of simultaneous
connections to a service to be limited. If <parameter>max connections
</parameter> is greater than 0 then connections will be refused if
@@ -4556,7 +4563,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAXDISKSIZE"/>max disk size (G)</term>
+ <term><anchor id="MAXDISKSIZE">max disk size (G)</term>
<listitem><para>This option allows you to put an upper limit
on the apparent size of disks. If you set this option to 100
then all shares will appear to be not larger than 100 MB in
@@ -4583,7 +4590,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAXLOGSIZE"/>max log size (G)</term>
+ <term><anchor id="MAXLOGSIZE">max log size (G)</term>
<listitem><para>This option (an integer in kilobytes) specifies
the max size the log file should grow to. Samba periodically checks
the size and if it is exceeded it will rename the file, adding
@@ -4599,7 +4606,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAXMUX"/>max mux (G)</term>
+ <term><anchor id="MAXMUX">max mux (G)</term>
<listitem><para>This option controls the maximum number of
outstanding simultaneous SMB operations that Samba tells the client
it will allow. You should never need to set this parameter.</para>
@@ -4611,10 +4618,9 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAXOPENFILES"/>max open files (G)</term>
+ <term><anchor id="MAXOPENFILES">max open files (G)</term>
<listitem><para>This parameter limits the maximum number of
- open files that one <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> file
+ open files that one <ulink url="smbd.8.html">smbd(8)</ulink> file
serving process may have open for a client at any one time. The
default for this parameter is set very high (10,000) as Samba uses
only one bit per unopened file.</para>
@@ -4630,11 +4636,11 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAXPRINTJOBS"/>max print jobs (S)</term>
+ <term><anchor id="MAXPRINTJOBS">max print jobs (S)</term>
<listitem><para>This parameter limits the maximum number of
jobs allowable in a Samba printer queue at any given moment.
- If this number is exceeded, <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> will remote "Out of Space" to the client.
+ If this number is exceeded, <ulink url="smbd.8.html"><command>
+ smbd(8)</command></ulink> will remote "Out of Space" to the client.
See all <link linkend="TOTALPRINTJOBS"><parameter>total
print jobs</parameter></link>.
</para>
@@ -4646,7 +4652,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAXPROTOCOL"/>max protocol (G)</term>
+ <term><anchor id="MAXPROTOCOL">max protocol (G)</term>
<listitem><para>The value of the parameter (a string) is the highest
protocol level that will be supported by the server.</para>
@@ -4684,15 +4690,14 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAXSMBDPROCESSES"/>max smbd processes (G)</term>
+ <term><anchor id="MAXSMBDPROCESSES">max smbd processes (G)</term>
<listitem><para>This parameter limits the maximum number of
<ulink url="smbd.8.html"><command>smbd(8)</command></ulink>
processes concurrently running on a system and is intended
as a stopgap to prevent degrading service to clients in the event
that the server has insufficient resources to handle more than this
number of connections. Remember that under normal operating
- conditions, each user will have an <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> associated with him or her
+ conditions, each user will have an <ulink url="smbd.8.html">smbd</ulink> associated with him or her
to handle connections to all shares from a given host.
</para>
@@ -4705,9 +4710,8 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAXTTL"/>max ttl (G)</term>
- <listitem><para>This option tells <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>
+ <term><anchor id="MAXTTL">max ttl (G)</term>
+ <listitem><para>This option tells <ulink url="nmbd.8.html">nmbd(8)</ulink>
what the default 'time to live' of NetBIOS names should be (in seconds)
when <command>nmbd</command> is requesting a name using either a
broadcast packet or from a WINS server. You should never need to
@@ -4720,9 +4724,9 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAXWINSTTL"/>max wins ttl (G)</term>
- <listitem><para>This option tells <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> when acting as a WINS server (<link linkend="WINSSUPPORT">
+ <term><anchor id="MAXWINSTTL">max wins ttl (G)</term>
+ <listitem><para>This option tells <ulink url="nmbd.8.html">nmbd(8)
+ </ulink> when acting as a WINS server (<link linkend="WINSSUPPORT">
<parameter>wins support = yes</parameter></link>) what the maximum
'time to live' of NetBIOS names that <command>nmbd</command>
will grant will be (in seconds). You should never need to change this
@@ -4738,7 +4742,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MAXXMIT"/>max xmit (G)</term>
+ <term><anchor id="MAXXMIT">max xmit (G)</term>
<listitem><para>This option controls the maximum packet size
that will be negotiated by Samba. The default is 65535, which
is the maximum. In some cases you may find you get better performance
@@ -4753,7 +4757,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MESSAGECOMMAND"/>message command (G)</term>
+ <term><anchor id="MESSAGECOMMAND">message command (G)</term>
<listitem><para>This specifies what command to run when the
server receives a WinPopup style message.</para>
@@ -4763,13 +4767,13 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<para>An example is:</para>
- <para><command>message command = csh -c 'xedit %s;rm %s' &amp;</command>
+ <para><command>message command = csh -c 'xedit %s;rm %s' &</command>
</para>
<para>This delivers the message using <command>xedit</command>, then
removes it afterwards. <emphasis>NOTE THAT IT IS VERY IMPORTANT
THAT THIS COMMAND RETURN IMMEDIATELY</emphasis>. That's why I
- have the '&amp;' on the end. If it doesn't return immediately then
+ have the '&' on the end. If it doesn't return immediately then
your PCs may freeze when sending messages (they should recover
after 30 seconds, hopefully).</para>
@@ -4814,7 +4818,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<para>Default: <emphasis>no message command</emphasis></para>
<para>Example: <command>message command = csh -c 'xedit %s;
- rm %s' &amp;</command></para>
+ rm %s' &</command></para>
</listitem>
</varlistentry>
@@ -4822,7 +4826,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MINPASSWDLENGTH"/>min passwd length (G)</term>
+ <term><anchor id="MINPASSWDLENGTH">min passwd length (G)</term>
<listitem><para>Synonym for <link linkend="MINPASSWORDLENGTH">
<parameter>min password length</parameter></link>.</para>
</listitem>
@@ -4831,7 +4835,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MINPASSWORDLENGTH"/>min password length (G)</term>
+ <term><anchor id="MINPASSWORDLENGTH">min password length (G)</term>
<listitem><para>This option sets the minimum length in characters
of a plaintext password that <command>smbd</command> will accept when performing
UNIX password changing.</para>
@@ -4849,7 +4853,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MINPRINTSPACE"/>min print space (S)</term>
+ <term><anchor id="MINPRINTSPACE">min print space (S)</term>
<listitem><para>This sets the minimum amount of free disk
space that must be available before a user will be able to spool
a print job. It is specified in kilobytes. The default is 0, which
@@ -4867,7 +4871,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MINPROTOCOL"/>min protocol (G)</term>
+ <term><anchor id="MINPROTOCOL">min protocol (G)</term>
<listitem><para>The value of the parameter (a string) is the
lowest SMB protocol dialect than Samba will support. Please refer
to the <link linkend="MAXPROTOCOL"><parameter>max protocol</parameter></link>
@@ -4891,9 +4895,8 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MINWINSTTL"/>min wins ttl (G)</term>
- <listitem><para>This option tells <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>
+ <term><anchor id="MINWINSTTL">min wins ttl (G)</term>
+ <listitem><para>This option tells <ulink url="nmbd.8.html">nmbd(8)</ulink>
when acting as a WINS server (<link linkend="WINSSUPPORT"><parameter>
wins support = yes</parameter></link>) what the minimum 'time to live'
of NetBIOS names that <command>nmbd</command> will grant will be (in
@@ -4906,7 +4909,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MSDFSPROXY"/>msdfs proxy (S)</term>
+ <term><anchor id="MSDFSPROXY">msdfs proxy (S)</term>
<listitem><para>This parameter indicates that the share is a
stand-in for another CIFS share whose location is specified by
the value of the parameter. When clients attempt to connect to
@@ -4917,7 +4920,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
and
<link linkend="HOSTMSDFS"><parameter>host msdfs</parameter></link>
options to find out how to set up a Dfs root share.</para>
- <para>Example: <command>msdfs proxy = \\\\otherserver\\someshare</command></para>
+ <para>Example: <command>msdfs proxy = \otherserver\someshare</command></para>
</listitem>
</varlistentry>
@@ -4925,17 +4928,17 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="MSDFSROOT"/>msdfs root (S)</term>
+ <term><anchor id="MSDFSROOT">msdfs root (S)</term>
<listitem><para>This boolean parameter is only available if
Samba is configured and compiled with the <command>
--with-msdfs</command> option. If set to <constant>yes</constant>,
Samba treats the share as a Dfs root and allows clients to browse
the distributed file system tree rooted at the share directory.
Dfs links are specified in the share directory by symbolic
- links of the form <filename>msdfs:serverA\\shareA,serverB\\shareB</filename>
+ links of the form <filename>msdfs:serverA\shareA,serverB\shareB</filename>
and so on. For more information on setting up a Dfs tree
- on Samba, refer to <ulink url="msdfs.html">"Hosting a Microsoft
- Distributed File System tree on Samba"</ulink> document.</para>
+ on Samba, refer to <ulink url="msdfs_setup.html">msdfs_setup.html
+ </ulink>.</para>
<para>See also <link linkend="HOSTMSDFS"><parameter>host msdfs
</parameter></link></para>
@@ -4945,7 +4948,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="NAMECACHETIMEOUT"/>name cache timeout (G)</term>
+ <term><anchor id="NAMECACHETIMEOUT">name cache timeout (G)</term>
<listitem><para>Specifies the number of seconds it takes before
entries in samba's hostname resolve cache time out. If
the timeout is set to 0. the caching is disabled.
@@ -4958,7 +4961,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="NAMERESOLVEORDER"/>name resolve order (G)</term>
+ <term><anchor id="NAMERESOLVEORDER">name resolve order (G)</term>
<listitem><para>This option is used by the programs in the Samba
suite to determine what naming services to use and in what order
to resolve host names to IP addresses. The option takes a space
@@ -5011,7 +5014,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="NETBIOSALIASES"/>netbios aliases (G)</term>
+ <term><anchor id="NETBIOSALIASES">netbios aliases (G)</term>
<listitem><para>This is a list of NetBIOS names that <ulink
url="nmbd.8.html">nmbd(8)</ulink> will advertise as additional
names by which the Samba server is known. This allows one machine
@@ -5032,7 +5035,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="NETBIOSNAME"/>netbios name (G)</term>
+ <term><anchor id="NETBIOSNAME">netbios name (G)</term>
<listitem><para>This sets the NetBIOS name by which a Samba
server is known. By default it is the same as the first component
of the host's DNS name. If a machine is a browse server or
@@ -5051,7 +5054,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="NETBIOSSCOPE"/>netbios scope (G)</term>
+ <term><anchor id="NETBIOSSCOPE">netbios scope (G)</term>
<listitem><para>This sets the NetBIOS scope that Samba will
operate under. This should not be set unless every machine
on your LAN also sets this value.</para>
@@ -5060,7 +5063,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="NISHOMEDIR"/>nis homedir (G)</term>
+ <term><anchor id="NISHOMEDIR">nis homedir (G)</term>
<listitem><para>Get the home share server from a NIS map. For
UNIX systems that use an automounter, the user's home directory
will often be mounted on a workstation on demand from a remote
@@ -5093,7 +5096,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="NONUNIXACCOUNTRANGE"/>non unix account range (G)</term>
+ <term><anchor id="NONUNIXACCOUNTRANGE">non unix account range (G)</term>
<listitem><para>The non unix account range parameter specifies
the range of 'user ids' that are allocated by the various 'non unix
account' passdb backends. These backends allow
@@ -5102,10 +5105,10 @@ df $1 | tail -1 | awk '{print $2" "$4}'
This range of ids should have no existing local or NIS users within
it as strange conflicts can occur otherwise.</para>
- <note><para>These userids never appear on the system and Samba will never
+ <para>NOTE: These userids never appear on the system and Samba will never
'become' these users. They are used only to ensure that the algorithmic
RID mapping does not conflict with normal users.
- </para></note>
+ </para>
<para>Default: <command>non unix account range = &lt;empty string&gt;
</command></para>
@@ -5117,7 +5120,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="NTACLSUPPORT"/>nt acl support (S)</term>
+ <term><anchor id="NTACLSUPPORT">nt acl support (S)</term>
<listitem><para>This boolean parameter controls whether
<ulink url="smbd.8.html">smbd(8)</ulink> will attempt to map
UNIX permissions into Windows NT access control lists.
@@ -5131,10 +5134,9 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="NTPIPESUPPORT"/>nt pipe support (G)</term>
+ <term><anchor id="NTPIPESUPPORT">nt pipe support (G)</term>
<listitem><para>This boolean parameter controls whether
- <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> will allow Windows NT
+ <ulink url="smbd.8.html">smbd(8)</ulink> will allow Windows NT
clients to connect to the NT SMB specific <constant>IPC$</constant>
pipes. This is a developer debugging option and can be left
alone.</para>
@@ -5146,7 +5148,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="NTSTATUSSUPPORT"/>nt status support (G)</term>
+ <term><anchor id="NTSTATUSSUPPORT">nt status support (G)</term>
<listitem><para>This boolean parameter controls whether <ulink
url="smbd.8.html">smbd(8)</ulink> will negotiate NT specific status
support with Windows NT/2k/XP clients. This is a developer
@@ -5163,12 +5165,11 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="NULLPASSWORDS"/>null passwords (G)</term>
+ <term><anchor id="NULLPASSWORDS">null passwords (G)</term>
<listitem><para>Allow or disallow client access to accounts
that have null passwords. </para>
- <para>See also <citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>.</para>
+ <para>See also <ulink url="smbpasswd.5.html">smbpasswd (5)</ulink>.</para>
<para>Default: <command>null passwords = no</command></para>
</listitem>
@@ -5178,7 +5179,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="OBEYPAMRESTRICTIONS"/>obey pam restrictions (G)</term>
+ <term><anchor id="OBEYPAMRESTRICTIONS">obey pam restrictions (G)</term>
<listitem><para>When Samba 2.2 is configured to enable PAM support
(i.e. --with-pam), this parameter will control whether or not Samba
should obey PAM's account and session management directives. The
@@ -5199,7 +5200,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="ONLYUSER"/>only user (S)</term>
+ <term><anchor id="ONLYUSER">only user (S)</term>
<listitem><para>This is a boolean option that controls whether
connections with usernames not in the <parameter>user</parameter>
list will be allowed. By default this option is disabled so that a
@@ -5227,7 +5228,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="ONLYGUEST"/>only guest (S)</term>
+ <term><anchor id="ONLYGUEST">only guest (S)</term>
<listitem><para>A synonym for <link linkend="GUESTONLY"><parameter>
guest only</parameter></link>.</para>
</listitem>
@@ -5236,7 +5237,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="OPLOCKBREAKWAITTIME"/>oplock break wait time (G)</term>
+ <term><anchor id="OPLOCKBREAKWAITTIME">oplock break wait time (G)</term>
<listitem><para>This is a tuning parameter added due to bugs in
both Windows 9x and WinNT. If Samba responds to a client too
quickly when that client issues an SMB that can cause an oplock
@@ -5254,15 +5255,15 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="OPLOCKCONTENTIONLIMIT"/>oplock contention limit (S)</term>
+ <term><anchor id="OPLOCKCONTENTIONLIMIT">oplock contention limit (S)</term>
<listitem><para>This is a <emphasis>very</emphasis> advanced
<ulink url="smbd.8.html">smbd(8)</ulink> tuning option to
improve the efficiency of the granting of oplocks under multiple
client contention for the same file.</para>
- <para>In brief it specifies a number, which causes <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>not to grant an oplock even when requested
- if the approximate number of clients contending for an oplock on the same file goes over this
+ <para>In brief it specifies a number, which causes <ulink url="smbd.8.html">smbd</ulink> not to
+ grant an oplock even when requested if the approximate number of
+ clients contending for an oplock on the same file goes over this
limit. This causes <command>smbd</command> to behave in a similar
way to Windows NT.</para>
@@ -5278,7 +5279,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="OPLOCKS"/>oplocks (S)</term>
+ <term><anchor id="OPLOCKS">oplocks (S)</term>
<listitem><para>This boolean option tells <command>smbd</command> whether to
issue oplocks (opportunistic locks) to file open requests on this
share. The oplock code can dramatically (approx. 30% or more) improve
@@ -5306,16 +5307,13 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="NTLMAUTH"/>ntlm auth (G)</term>
- <listitem><para>This parameter determines
- whether or not <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> will
+ <term><anchor id="NTLMAUTH">ntlm auth (G)</term>
+ <listitem><para>This parameter determines whether or not <ulink url="smbd.8.html">smbd</ulink> will
attempt to authenticate users using the NTLM password hash.
If disabled, only the lanman password hashes will be used.
</para>
- <para>Please note that at least this option or <command>lanman auth</command> should
- be enabled in order to be able to log in.
+ <para>Please note that at least this option or <command>lanman auth</command> should be enabled in order to be able to log in.
</para>
<para>Default : <command>ntlm auth = yes</command></para>
@@ -5323,11 +5321,10 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="OSLEVEL"/>os level (G)</term>
+ <term><anchor id="OSLEVEL">os level (G)</term>
<listitem><para>This integer value controls what level Samba
advertises itself as for browse elections. The value of this
- parameter determines whether <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>
+ parameter determines whether <ulink url="nmbd.8.html">nmbd(8)</ulink>
has a chance of becoming a local master browser for the <parameter>
WORKGROUP</parameter> in the local broadcast area.</para>
@@ -5347,7 +5344,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="OS2DRIVERMAP"/>os2 driver map (G)</term>
+ <term><anchor id="OS2DRIVERMAP">os2 driver map (G)</term>
<listitem><para>The parameter is used to define the absolute
path to a file containing a mapping of Windows NT printer driver
names to OS/2 printer driver names. The format is:</para>
@@ -5360,9 +5357,10 @@ df $1 | tail -1 | awk '{print $2" "$4}'
LaserJet 5L</command>.</para>
<para>The need for the file is due to the printer driver namespace
- problem described in the <ulink url="printing.html">Samba
+ problem described in the <ulink url="printer_driver2.html">Samba
Printing HOWTO</ulink>. For more details on OS/2 clients, please
- refer to the OS2-Client-HOWTO containing in the Samba documentation.</para>
+ refer to the <ulink url="OS2-Client-HOWTO.html">OS2-Client-HOWTO
+ </ulink> containing in the Samba documentation.</para>
<para>Default: <command>os2 driver map = &lt;empty string&gt;
</command></para>
@@ -5371,7 +5369,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PAMPASSWORDCHANGE"/>pam password change (G)</term>
+ <term><anchor id="PAMPASSWORDCHANGE">pam password change (G)</term>
<listitem><para>With the addition of better PAM support in Samba 2.2,
this parameter, it is possible to use PAM's password change control
flag for Samba. If enabled, then PAM will be used for password
@@ -5389,12 +5387,12 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PANICACTION"/>panic action (G)</term>
+ <term><anchor id="PANICACTION">panic action (G)</term>
<listitem><para>This is a Samba developer option that allows a
- system command to be called when either <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> or <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> crashes. This is usually used to
- draw attention to the fact that a problem occurred.</para>
+ system command to be called when either <ulink url="smbd.8.html">
+ smbd(8)</ulink> or <ulink url="nmbd.8.html">nmbd(8)</ulink>
+ crashes. This is usually used to draw attention to the fact that
+ a problem occurred.</para>
<para>Default: <command>panic action = &lt;empty string&gt;</command></para>
<para>Example: <command>panic action = "/bin/sleep 90000"</command></para>
@@ -5402,27 +5400,25 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</varlistentry>
<varlistentry>
- <term><anchor id="PARANOIDSERVERSECURITY"/>paranoid server security (G)</term>
+ <term><anchor id="PARANOIDSERVERSECURITY">paranoid server security (G)</term>
<listitem><para>Some version of NT 4.x allow non-guest
users with a bad passowrd. When this option is enabled, samba will not
use a broken NT 4.x server as password server, but instead complain
- to the logs and exit.
+ to the logs and exit.
</para>
- <para>Disabling this option prevents Samba from making
- this check, which involves deliberatly attempting a
- bad logon to the remote server.</para>
-
<para>Default: <command>paranoid server security = yes</command></para>
</listitem>
</varlistentry>
<varlistentry>
- <term><anchor id="PASSDBBACKEND"/>passdb backend (G)</term>
+ <term><anchor id="PASSDBBACKEND">passdb backend (G)</term>
<listitem><para>This option allows the administrator to chose which backends to retrieve and store passwords with. This allows (for example) both
smbpasswd and tdbsam to be used without a recompile.
Multiple backends can be specified, separated by spaces. The backends will be searched in the order they are specified. New users are always added to the first backend specified.
+ Experimental backends must still be selected
+ (eg --with-tdbsam) at configure time.
</para>
<para>This parameter is in two parts, the backend's name, and a 'location'
@@ -5477,25 +5473,46 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<listitem><para><command>nisplussam</command> - The NIS+ based passdb backend. Takes name NIS domain as an optional argument. Only works with sun NIS+ servers. </para></listitem>
+ <listitem><para><command>plugin</command> - Allows Samba to load an
+ arbitary passdb backend from the .so specified as a compulsary argument.
+ </para>
+
+ <para>Any characters after the (optional) second : are passed to the plugin
+ for its own processing</para>
+ </listitem>
+
+ <listitem><para><command>unixsam</command> - (EXPERIMENTAL) Allows samba to map all (other) available unix users</para>
+
+ <para>This backend uses the standard unix database for retrieving users. Users included
+ in this pdb are NOT listed in samba user listings and users included in this pdb won't be
+ able to login. The use of this backend is to always be able to display the owner of a file
+ on the samba server - even when the user doesn't have a 'real' samba account in one of the
+ other passdb backends.
+ </para>
+
+ <para>This backend should always be the last backend listed, since it contains all users in
+ the unix passdb and might 'override' mappings if specified earlier. It's meant to only return
+ accounts for users that aren't covered by the previous backends.</para>
+ </listitem>
</itemizedlist>
</para>
<para>Default: <command>passdb backend = smbpasswd guest</command></para>
- <para>Example: <command>passdb backend = tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd guest</command></para>
- <para>Example: <command>passdb backend = ldapsam_nua:ldaps://ldap.example.com guest</command></para>
- <para>Example: <command>passdb backend = mysql:my_plugin_args tdbsam:/etc/samba/private/passdb.tdb</command></para>
+ <para>Example: <command>passdb backend = tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd </command></para>
+ <para>Example: <command>passdb backend = ldapsam_nua:ldaps://ldap.example.com </command></para>
+ <para>Example: <command>passdb backend = plugin:/usr/local/samba/lib/my_passdb.so:my_plugin_args tdbsam:/etc/samba/private/passdb.tdb</command></para>
</listitem>
</varlistentry>
<varlistentry>
- <term><anchor id="PASSWDCHAT"/>passwd chat (G)</term>
+ <term><anchor id="PASSWDCHAT">passwd chat (G)</term>
<listitem><para>This string controls the <emphasis>"chat"</emphasis>
- conversation that takes places between <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> and the local password changing
+ conversation that takes places between <ulink
+ url="smbd.8.html">smbd</ulink> and the local password changing
program to change the user's password. The string describes a
- sequence of response-receive pairs that <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> uses to determine what to send to the
+ sequence of response-receive pairs that <ulink url="smbd.8.html">
+ smbd(8)</ulink> uses to determine what to send to the
<link linkend="PASSWDPROGRAM"><parameter>passwd program</parameter>
</link> and what to expect back. If the expected output is not
received then the password is not changed.</para>
@@ -5517,8 +5534,8 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<para>The string can contain the macro <parameter>%n</parameter> which is substituted
for the new password. The chat sequence can also contain the standard
- macros <constant>\\n</constant>, <constant>\\r</constant>, <constant>
- \\t</constant> and <constant>\\s</constant> to give line-feed,
+ macros <constant>\n</constant>, <constant>\r</constant>, <constant>
+ \t</constant> and <constant>\s</constant> to give line-feed,
carriage-return, tab and space. The chat sequence string can also contain
a '*' which matches any sequence of characters.
Double quotes can be used to collect strings with spaces
@@ -5540,10 +5557,10 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<parameter>passwd chat debug</parameter></link> and <link linkend="PAMPASSWORDCHANGE">
<parameter>pam password change</parameter></link>.</para>
- <para>Default: <command>passwd chat = *new*password* %n\\n
- *new*password* %n\\n *changed*</command></para>
- <para>Example: <command>passwd chat = "*Enter OLD password*" %o\\n
- "*Enter NEW password*" %n\\n "*Reenter NEW password*" %n\\n "*Password
+ <para>Default: <command>passwd chat = *new*password* %n\n
+ *new*password* %n\n *changed*</command></para>
+ <para>Example: <command>passwd chat = "*Enter OLD password*" %o\n
+ "*Enter NEW password*" %n\n "*Reenter NEW password*" %n\n "*Password
changed*"</command></para>
</listitem>
</varlistentry>
@@ -5551,12 +5568,11 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PASSWDCHATDEBUG"/>passwd chat debug (G)</term>
+ <term><anchor id="PASSWDCHATDEBUG">passwd chat debug (G)</term>
<listitem><para>This boolean specifies if the passwd chat script
parameter is run in <emphasis>debug</emphasis> mode. In this mode the
strings passed to and received from the passwd chat are printed
- in the <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> log with a
+ in the <ulink url="smbd.8.html">smbd(8)</ulink> log with a
<link linkend="DEBUGLEVEL"><parameter>debug level</parameter></link>
of 100. This is a dangerous option as it will allow plaintext passwords
to be seen in the <command>smbd</command> log. It is available to help
@@ -5579,7 +5595,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PASSWDPROGRAM"/>passwd program (G)</term>
+ <term><anchor id="PASSWDPROGRAM">passwd program (G)</term>
<listitem><para>The name of a program that can be used to set
UNIX user passwords. Any occurrences of <parameter>%u</parameter>
will be replaced with the user name. The user name is checked for
@@ -5617,7 +5633,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PASSWORDLEVEL"/>password level (G)</term>
+ <term><anchor id="PASSWORDLEVEL">password level (G)</term>
<listitem><para>Some client/server combinations have difficulty
with mixed-case passwords. One offending client is Windows for
Workgroups, which for some reason forces passwords to upper
@@ -5660,7 +5676,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PASSWORDSERVER"/>password server (G)</term>
+ <term><anchor id="PASSWORDSERVER">password server (G)</term>
<listitem><para>By specifying the name of another SMB server (such
as a WinNT box) with this option, and using <command>security = domain
</command> or <command>security = server</command> you can get Samba
@@ -5681,10 +5697,10 @@ df $1 | tail -1 | awk '{print $2" "$4}'
the "LM1.2X002" or the "NT LM 0.12" protocol, and it must be in
user level security mode.</para>
- <note><para>Using a password server
+ <para><emphasis>NOTE:</emphasis> Using a password server
means your UNIX box (running Samba) is only as secure as your
password server. <emphasis>DO NOT CHOOSE A PASSWORD SERVER THAT
- YOU DON'T COMPLETELY TRUST</emphasis>.</para></note>
+ YOU DON'T COMPLETELY TRUST</emphasis>.</para>
<para>Never point a Samba server at itself for password
serving. This will cause a loop and could lock up your Samba
@@ -5755,7 +5771,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PATH"/>path (S)</term>
+ <term><anchor id="PATH">path (S)</term>
<listitem><para>This parameter specifies a directory to which
the user of the service is to be given access. In the case of
printable services, this is where print data will spool prior to
@@ -5786,7 +5802,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PIDDIRECTORY"/>pid directory (G)</term>
+ <term><anchor id="PIDDIRECTORY">pid directory (G)</term>
<listitem><para>This option specifies the directory where pid
files will be placed. </para>
@@ -5798,9 +5814,8 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="POSIXLOCKING"/>posix locking (S)</term>
- <listitem><para>The <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>
+ <term><anchor id="POSIXLOCKING">posix locking (S)</term>
+ <listitem><para>The <ulink url="smbd.8.html"><command>smbd(8)</command></ulink>
daemon maintains an database of file locks obtained by SMB clients.
The default behavior is to map this internal database to POSIX
locks. This means that file locks obtained by SMB clients are
@@ -5816,7 +5831,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="POSTEXEC"/>postexec (S)</term>
+ <term><anchor id="POSTEXEC">postexec (S)</term>
<listitem><para>This option specifies a command to be run
whenever the service is disconnected. It takes the usual
substitutions. The command may be run as the root on some
@@ -5841,7 +5856,23 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PREEXEC"/>preexec (S)</term>
+ <term><anchor id="POSTSCRIPT">postscript (S)</term>
+ <listitem><para>This parameter forces a printer to interpret
+ the print files as PostScript. This is done by adding a <constant>%!
+ </constant> to the start of print output.</para>
+
+ <para>This is most useful when you have lots of PCs that persist
+ in putting a control-D at the start of print jobs, which then
+ confuses your printer.</para>
+
+ <para>Default: <command>postscript = no</command></para>
+ </listitem>
+ </varlistentry>
+
+
+
+ <varlistentry>
+ <term><anchor id="PREEXEC">preexec (S)</term>
<listitem><para>This option specifies a command to be run whenever
the service is connected to. It takes the usual substitutions.</para>
@@ -5850,12 +5881,12 @@ df $1 | tail -1 | awk '{print $2" "$4}'
is an example:</para>
<para><command>preexec = csh -c 'echo \"Welcome to %S!\" |
- /usr/local/samba/bin/smbclient -M %m -I %I' &amp; </command></para>
+ /usr/local/samba/bin/smbclient -M %m -I %I' & </command></para>
<para>Of course, this could get annoying after a while :-)</para>
<para>See also <link linkend="PREEXECCLOSE"><parameter>preexec close
- </parameter></link> and <link linkend="POSTEXEC"><parameter>postexec
+ </parameter</link> and <link linkend="POSTEXEC"><parameter>postexec
</parameter></link>.</para>
<para>Default: <emphasis>none (no command executed)</emphasis></para>
@@ -5867,7 +5898,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PREEXECCLOSE"/>preexec close (S)</term>
+ <term><anchor id="PREEXECCLOSE">preexec close (S)</term>
<listitem><para>This boolean option controls whether a non-zero
return code from <link linkend="PREEXEC"><parameter>preexec
</parameter></link> should close the service being connected to.</para>
@@ -5878,7 +5909,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PREFERREDMASTER"/>preferred master (G)</term>
+ <term><anchor id="PREFERREDMASTER">preferred master (G)</term>
<listitem><para>This boolean parameter controls if <ulink
url="nmbd.8.html">nmbd(8)</ulink> is a preferred master browser
for its workgroup.</para>
@@ -5907,7 +5938,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PREFEREDMASTER"/>prefered master (G)</term>
+ <term><anchor id="PREFEREDMASTER">prefered master (G)</term>
<listitem><para>Synonym for <link linkend="PREFERREDMASTER"><parameter>
preferred master</parameter></link> for people who cannot spell :-).</para>
</listitem>
@@ -5916,7 +5947,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PRELOAD"/>preload (G)</term>
+ <term><anchor id="PRELOAD">preload (G)</term>
<listitem><para>This is a list of services that you want to be
automatically added to the browse lists. This is most useful
for homes and printers services that would otherwise not be
@@ -5932,24 +5963,9 @@ df $1 | tail -1 | awk '{print $2" "$4}'
</listitem>
</varlistentry>
- <varlistentry>
- <term><anchor id="PRELOADMODULES"/>preload modules (G)</term>
- <listitem><para>This is a list of paths to modules that should
- be loaded into smbd before a client connects. This improves
- the speed of smbd when reacting to new connections somewhat. </para>
-
- <para>It is recommended to only use this option on heavy-performance
- servers.</para>
-
- <para>Default: <command>preload modules = </command></para>
-
- <para>Example: <command>preload modules = /usr/lib/samba/passdb/mysql.so</command></para>
-
- </listitem>
- </varlistentry>
<varlistentry>
- <term><anchor id="PRESERVECASE"/>preserve case (S)</term>
+ <term><anchor id="PRESERVECASE">preserve case (S)</term>
<listitem><para> This controls if new filenames are created
with the case that the client passes, or if they are forced to
be the <link linkend="DEFAULTCASE"><parameter>default case
@@ -5965,7 +5981,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PRINTCOMMAND"/>print command (S)</term>
+ <term><anchor id="PRINTCOMMAND">print command (S)</term>
<listitem><para>After a print job has finished spooling to
a service, this command will be used via a <command>system()</command>
call to process the spool file. Typically the command specified will
@@ -6055,7 +6071,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PRINTOK"/>print ok (S)</term>
+ <term><anchor id="PRINTOK">print ok (S)</term>
<listitem><para>Synonym for <link linkend="PRINTABLE">
<parameter>printable</parameter></link>.</para>
</listitem>
@@ -6065,7 +6081,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PRINTABLE"/>printable (S)</term>
+ <term><anchor id="PRINTABLE">printable (S)</term>
<listitem><para>If this parameter is <constant>yes</constant>, then
clients may open, write to and submit spool files on the directory
specified for the service. </para>
@@ -6083,7 +6099,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PRINTCAP"/>printcap (G)</term>
+ <term><anchor id="PRINTCAP">printcap (G)</term>
<listitem><para>Synonym for <link linkend="PRINTCAPNAME"><parameter>
printcap name</parameter></link>.</para>
</listitem>
@@ -6093,7 +6109,7 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<varlistentry>
- <term><anchor id="PRINTCAPNAME"/>printcap name (G)</term>
+ <term><anchor id="PRINTCAPNAME">printcap name (G)</term>
<listitem><para>This parameter may be used to override the
compiled-in default printcap name used by the server (usually <filename>
/etc/printcap</filename>). See the discussion of the <link
@@ -6119,22 +6135,22 @@ df $1 | tail -1 | awk '{print $2" "$4}'
<para>A minimal printcap file would look something like this:</para>
-<para><programlisting>
-print1|My Printer 1
-print2|My Printer 2
-print3|My Printer 3
-print4|My Printer 4
-print5|My Printer 5
-</programlisting></para>
+ <para><programlisting>
+ print1|My Printer 1
+ print2|My Printer 2
+ print3|My Printer 3
+ print4|My Printer 4
+ print5|My Printer 5
+ </programlisting></para>
<para>where the '|' separates aliases of a printer. The fact
that the second alias has a space in it gives a hint to Samba
that it's a comment.</para>
- <note><para>Under AIX the default printcap
+ <para><emphasis>NOTE</emphasis>: Under AIX the default printcap
name is <filename>/etc/qconfig</filename>. Samba will assume the
file is in AIX <filename>qconfig</filename> format if the string
- <filename>qconfig</filename> appears in the printcap filename.</para></note>
+ <filename>qconfig</filename> appears in the printcap filename.</para>
<para>Default: <command>printcap name = /etc/printcap</command></para>
<para>Example: <command>printcap name = /etc/myprintcap</command></para>
@@ -6146,7 +6162,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="PRINTERADMIN"/>printer admin (S)</term>
+ <term><anchor id="PRINTERADMIN">printer admin (S)</term>
<listitem><para>This is a list of users that can do anything to
printers via the remote administration interfaces offered by MS-RPC
(usually using a NT workstation). Note that the root user always
@@ -6160,8 +6176,113 @@ print5|My Printer 5
+
+
+ <varlistentry>
+ <term><anchor id="PRINTERDRIVER">printer driver (S)</term>
+ <listitem><para><emphasis>Note :</emphasis>This is a deprecated
+ parameter and will be removed in the next major release
+ following version 2.2. Please see the instructions in
+ the <ulink url="printer_driver2.html">Samba 2.2. Printing
+ HOWTO</ulink> for more information
+ on the new method of loading printer drivers onto a Samba server.
+ </para>
+
+ <para>This option allows you to control the string
+ that clients receive when they ask the server for the printer driver
+ associated with a printer. If you are using Windows95 or Windows NT
+ then you can use this to automate the setup of printers on your
+ system.</para>
+
+ <para>You need to set this parameter to the exact string (case
+ sensitive) that describes the appropriate printer driver for your
+ system. If you don't know the exact string to use then you should
+ first try with no <link linkend="PRINTERDRIVER"><parameter>
+ printer driver</parameter></link> option set and the client will
+ give you a list of printer drivers. The appropriate strings are
+ shown in a scroll box after you have chosen the printer manufacturer.</para>
+
+ <para>See also <link linkend="PRINTERDRIVERFILE"><parameter>printer
+ driver file</parameter></link>.</para>
+
+ <para>Example: <command>printer driver = HP LaserJet 4L</command></para>
+ </listitem>
+ </varlistentry>
+
+
+
<varlistentry>
- <term><anchor id="PRINTERNAME"/>printer name (S)</term>
+ <term><anchor id="PRINTERDRIVERFILE">printer driver file (G)</term>
+ <listitem><para><emphasis>Note :</emphasis>This is a deprecated
+ parameter and will be removed in the next major release
+ following version 2.2. Please see the instructions in
+ the <ulink url="printer_driver2.html">Samba 2.2. Printing
+ HOWTO</ulink> for more information
+ on the new method of loading printer drivers onto a Samba server.
+ </para>
+
+ <para>This parameter tells Samba where the printer driver
+ definition file, used when serving drivers to Windows 95 clients, is
+ to be found. If this is not set, the default is :</para>
+
+ <para><filename><replaceable>SAMBA_INSTALL_DIRECTORY</replaceable>
+ /lib/printers.def</filename></para>
+
+ <para>This file is created from Windows 95 <filename>msprint.inf
+ </filename> files found on the Windows 95 client system. For more
+ details on setting up serving of printer drivers to Windows 95
+ clients, see the outdated documentation file in the <filename>docs/</filename>
+ directory, <filename>PRINTER_DRIVER.txt</filename>.</para>
+
+ <para>See also <link linkend="PRINTERDRIVERLOCATION"><parameter>
+ printer driver location</parameter></link>.</para>
+
+ <para>Default: <emphasis>None (set in compile).</emphasis></para>
+
+ <para>Example: <command>printer driver file =
+ /usr/local/samba/printers/drivers.def</command></para>
+ </listitem>
+ </varlistentry>
+
+
+
+
+ <varlistentry>
+ <term><anchor id="PRINTERDRIVERLOCATION">printer driver location (S)</term>
+ <listitem><para><emphasis>Note :</emphasis>This is a deprecated
+ parameter and will be removed in the next major release
+ following version 2.2. Please see the instructions in
+ the <ulink url="printer_driver2.html">Samba 2.2. Printing
+ HOWTO</ulink> for more information
+ on the new method of loading printer drivers onto a Samba server.
+ </para>
+
+ <para>This parameter tells clients of a particular printer
+ share where to find the printer driver files for the automatic
+ installation of drivers for Windows 95 machines. If Samba is set up
+ to serve printer drivers to Windows 95 machines, this should be set to</para>
+
+ <para><command>\\MACHINE\PRINTER$</command></para>
+
+ <para>Where MACHINE is the NetBIOS name of your Samba server,
+ and PRINTER$ is a share you set up for serving printer driver
+ files. For more details on setting this up see the outdated documentation
+ file in the <filename>docs/</filename> directory, <filename>
+ PRINTER_DRIVER.txt</filename>.</para>
+
+ <para>See also <link linkend="PRINTERDRIVERFILE"><parameter>
+ printer driver file</parameter></link>.</para>
+
+ <para>Default: <command>none</command></para>
+ <para>Example: <command>printer driver location = \\MACHINE\PRINTER$
+ </command></para>
+ </listitem>
+ </varlistentry>
+
+
+
+ <varlistentry>
+ <term><anchor id="PRINTERNAME">printer name (S)</term>
<listitem><para>This parameter specifies the name of the printer
to which print jobs spooled through a printable service will be sent.</para>
@@ -6178,7 +6299,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="PRINTER"/>printer (S)</term>
+ <term><anchor id="PRINTER">printer (S)</term>
<listitem><para>Synonym for <link linkend="PRINTERNAME"><parameter>
printer name</parameter></link>.</para>
</listitem>
@@ -6187,7 +6308,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="PRINTING"/>printing (S)</term>
+ <term><anchor id="PRINTING">printing (S)</term>
<listitem><para>This parameters controls how printer status
information is interpreted on your system. It also affects the
default values for the <parameter>print command</parameter>,
@@ -6218,7 +6339,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="PRIVATEDIR"/>private dir (G)</term>
+ <term><anchor id="PRIVATEDIR">private dir (G)</term>
<listitem><para>This parameters defines the directory
smbd will use for storing such files as <filename>smbpasswd</filename>
and <filename>secrets.tdb</filename>.
@@ -6232,7 +6353,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="PROTOCOL"/>protocol (G)</term>
+ <term><anchor id="PROTOCOL">protocol (G)</term>
<listitem><para>Synonym for <link linkend="MAXPROTOCOL">
<parameter>max protocol</parameter></link>.</para></listitem>
</varlistentry>
@@ -6241,7 +6362,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="PUBLIC"/>public (S)</term>
+ <term><anchor id="PUBLIC">public (S)</term>
<listitem><para>Synonym for <link linkend="GUESTOK"><parameter>guest
ok</parameter></link>.</para>
</listitem>
@@ -6250,7 +6371,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="QUEUEPAUSECOMMAND"/>queuepause command (S)</term>
+ <term><anchor id="QUEUEPAUSECOMMAND">queuepause command (S)</term>
<listitem><para>This parameter specifies the command to be
executed on the server host in order to pause the printer queue.</para>
@@ -6279,7 +6400,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="QUEUERESUMECOMMAND"/>queueresume command (S)</term>
+ <term><anchor id="QUEUERESUMECOMMAND">queueresume command (S)</term>
<listitem><para>This parameter specifies the command to be
executed on the server host in order to resume the printer queue. It
is the command to undo the behavior that is caused by the
@@ -6314,7 +6435,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="READBMPX"/>read bmpx (G)</term>
+ <term><anchor id="READBMPX">read bmpx (G)</term>
<listitem><para>This boolean parameter controls whether <ulink
url="smbd.8.html">smbd(8)</ulink> will support the "Read
Block Multiplex" SMB. This is now rarely used and defaults to
@@ -6329,7 +6450,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="READLIST"/>read list (S)</term>
+ <term><anchor id="READLIST">read list (S)</term>
<listitem><para>This is a list of users that are given read-only
access to a service. If the connecting user is in this list then
they will not be given write access, no matter what the <link
@@ -6351,7 +6472,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="READONLY"/>read only (S)</term>
+ <term><anchor id="READONLY">read only (S)</term>
<listitem><para>An inverted synonym is <link linkend="WRITEABLE">
<parameter>writeable</parameter></link>.</para>
@@ -6370,7 +6491,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="READRAW"/>read raw (G)</term>
+ <term><anchor id="READRAW">read raw (G)</term>
<listitem><para>This parameter controls whether or not the server
will support the raw read SMB requests when transferring data
to clients.</para>
@@ -6393,7 +6514,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="READSIZE"/>read size (G)</term>
+ <term><anchor id="READSIZE">read size (G)</term>
<listitem><para>The option <parameter>read size</parameter>
affects the overlap of disk reads/writes with network reads/writes.
If the amount of data being transferred in several of the SMB
@@ -6420,7 +6541,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="REALM"/>realm (G)</term>
+ <term><anchor id="REALM">realm (G)</term>
<listitem><para>
This option specifies the kerberos realm to use. The realm is
used as the ADS equivalent of the NT4<command>domain</command>. It
@@ -6433,7 +6554,7 @@ print5|My Printer 5
</varlistentry>
<varlistentry>
- <term><anchor id="REMOTEANNOUNCE"/>remote announce (G)</term>
+ <term><anchor id="REMOTEANNOUNCE">remote announce (G)</term>
<listitem><para>This option allows you to setup <ulink
url="nmbd.8.html">nmbd(8)</ulink> to periodically announce itself
to arbitrary IP addresses with an arbitrary workgroup name.</para>
@@ -6458,7 +6579,7 @@ print5|My Printer 5
addresses of the remote networks, but can also be the IP addresses
of known browse masters if your network config is that stable.</para>
- <para>See the documentation file <ulink url="improved-browsing.html">BROWSING</ulink>
+ <para>See the documentation file <filename>BROWSING.txt</filename>
in the <filename>docs/</filename> directory.</para>
<para>Default: <command>remote announce = &lt;empty string&gt;
@@ -6469,7 +6590,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="REMOTEBROWSESYNC"/>remote browse sync (G)</term>
+ <term><anchor id="REMOTEBROWSESYNC">remote browse sync (G)</term>
<listitem><para>This option allows you to setup <ulink
url="nmbd.8.html">nmbd(8)</ulink> to periodically request
synchronization of browse lists with the master browser of a Samba
@@ -6507,7 +6628,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="RESTRICTANONYMOUS"/>restrict anonymous (G)</term>
+ <term><anchor id="RESTRICTANONYMOUS">restrict anonymous (G)</term>
<listitem><para>This is a integer parameter, and
mirrors as much as possible the functinality the
<constant>RestrictAnonymous</constant>
@@ -6520,7 +6641,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="ROOT"/>root (G)</term>
+ <term><anchor id="ROOT">root (G)</term>
<listitem><para>Synonym for <link linkend="ROOTDIRECTORY">
<parameter>root directory"</parameter></link>.</para>
</listitem>
@@ -6529,7 +6650,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="ROOTDIR"/>root dir (G)</term>
+ <term><anchor id="ROOTDIR">root dir (G)</term>
<listitem><para>Synonym for <link linkend="ROOTDIRECTORY">
<parameter>root directory"</parameter></link>.</para>
</listitem>
@@ -6537,7 +6658,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="ROOTDIRECTORY"/>root directory (G)</term>
+ <term><anchor id="ROOTDIRECTORY">root directory (G)</term>
<listitem><para>The server will <command>chroot()</command> (i.e.
Change its root directory) to this directory on startup. This is
not strictly necessary for secure operation. Even without it the
@@ -6569,7 +6690,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="ROOTPOSTEXEC"/>root postexec (S)</term>
+ <term><anchor id="ROOTPOSTEXEC">root postexec (S)</term>
<listitem><para>This is the same as the <parameter>postexec</parameter>
parameter except that the command is run as root. This
is useful for unmounting filesystems
@@ -6584,7 +6705,7 @@ print5|My Printer 5
</varlistentry>
<varlistentry>
- <term><anchor id="ROOTPREEXEC"/>root preexec (S)</term>
+ <term><anchor id="ROOTPREEXEC">root preexec (S)</term>
<listitem><para>This is the same as the <parameter>preexec</parameter>
parameter except that the command is run as root. This
is useful for mounting filesystems (such as CDROMs) when a
@@ -6602,7 +6723,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="ROOTPREEXECCLOSE"/>root preexec close (S)</term>
+ <term><anchor id="ROOTPREEXECCLOSE">root preexec close (S)</term>
<listitem><para>This is the same as the <parameter>preexec close
</parameter> parameter except that the command is run as root.</para>
@@ -6616,14 +6737,14 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="SECURITY"/>security (G)</term>
+ <term><anchor id="SECURITY">security (G)</term>
<listitem><para>This option affects how clients respond to
Samba and is one of the most important settings in the <filename>
smb.conf</filename> file.</para>
<para>The option sets the "security mode bit" in replies to
- protocol negotiations with <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> to turn share level security on or off. Clients decide
+ protocol negotiations with <ulink url="smbd.8.html">smbd(8)
+ </ulink> to turn share level security on or off. Clients decide
based on this bit whether (and how) to transfer user and password
information to the server.</para>
@@ -6668,7 +6789,7 @@ print5|My Printer 5
<para>The different settings will now be explained.</para>
- <para><anchor id="SECURITYEQUALSSHARE"/><emphasis>SECURITY = SHARE
+ <para><anchor id="SECURITYEQUALSSHARE"><emphasis>SECURITY = SHARE
</emphasis></para>
<para>When clients connect to a share level security server they
@@ -6737,10 +6858,10 @@ print5|My Printer 5
<para>See also the section <link linkend="VALIDATIONSECT">
NOTE ABOUT USERNAME/PASSWORD VALIDATION</link>.</para>
- <para><anchor id="SECURITYEQUALSUSER"/><emphasis>SECURITY = USER
+ <para><anchor id="SECURITYEQUALSUSER"><emphasis>SECURITY = USER
</emphasis></para>
- <para>This is the default security setting in Samba 3.0.
+ <para>This is the default security setting in Samba 2.2.
With user-level security a client must first "log-on" with a
valid username and password (which can be mapped using the <link
linkend="USERNAMEMAP"><parameter>username map</parameter></link>
@@ -6764,27 +6885,24 @@ print5|My Printer 5
<para>See also the section <link linkend="VALIDATIONSECT">
NOTE ABOUT USERNAME/PASSWORD VALIDATION</link>.</para>
- <para><anchor id="SECURITYEQUALSDOMAIN"/><emphasis>SECURITY = DOMAIN
-
+ <para><anchor id="SECURITYEQUALSSERVER"><emphasis>SECURITY = SERVER
</emphasis></para>
- <para>This mode will only work correctly if <citerefentry><refentrytitle>net</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> has been used to add this
- machine into a Windows NT Domain. It expects the <link
- linkend="ENCRYPTPASSWORDS"><parameter>encrypted passwords</parameter>
- </link> parameter to be set to <constant>yes</constant>. In this
- mode Samba will try to validate the username/password by passing
- it to a Windows NT Primary or Backup Domain Controller, in exactly
- the same way that a Windows NT Server would do.</para>
-
- <para><emphasis>Note</emphasis> that a valid UNIX user must still
- exist as well as the account on the Domain Controller to allow
- Samba to have a valid UNIX account to map file access to.</para>
+ <para>In this mode Samba will try to validate the username/password
+ by passing it to another SMB server, such as an NT box. If this
+ fails it will revert to <command>security = user</command>, but note
+ that if encrypted passwords have been negotiated then Samba cannot
+ revert back to checking the UNIX password file, it must have a valid
+ <filename>smbpasswd</filename> file to check users against. See the
+ documentation file in the <filename>docs/</filename> directory
+ <filename>ENCRYPTION.txt</filename> for details on how to set this
+ up.</para>
- <para><emphasis>Note</emphasis> that from the client's point
- of view <command>security = domain</command> is the same as <command>security = user
- </command>. It only affects how the server deals with the authentication,
- it does not in any way affect what the client sees.</para>
+ <para><emphasis>Note</emphasis> that from the client's point of
+ view <command>security = server</command> is the same as <command>
+ security = user</command>. It only affects how the server deals
+ with the authentication, it does not in any way affect what the
+ client sees.</para>
<para><emphasis>Note</emphasis> that the name of the resource being
requested is <emphasis>not</emphasis> sent to the server until after
@@ -6802,42 +6920,27 @@ print5|My Printer 5
server</parameter></link> parameter and the <link
linkend="ENCRYPTPASSWORDS"><parameter>encrypted passwords</parameter>
</link> parameter.</para>
-
- <para><anchor id="SECURITYEQUALSSERVER"/><emphasis>SECURITY = SERVER
+
+ <para><anchor id="SECURITYEQUALSDOMAIN"><emphasis>SECURITY = DOMAIN
</emphasis></para>
- <para>In this mode Samba will try to validate the username/password
- by passing it to another SMB server, such as an NT box. If this
- fails it will revert to <command>security =
- user</command>. It expects the <link
+ <para>This mode will only work correctly if <ulink
+ url="smbpasswd.8.html">smbpasswd(8)</ulink> has been used to add this
+ machine into a Windows NT Domain. It expects the <link
linkend="ENCRYPTPASSWORDS"><parameter>encrypted passwords</parameter>
- </link> parameter to be set to
- <constant>yes</constant>, unless the remote server
- does not support them. However note
- that if encrypted passwords have been negotiated then Samba cannot
- revert back to checking the UNIX password file, it must have a valid
- <filename>smbpasswd</filename> file to check users against. See the
- documentation file in the <filename>docs/</filename> directory
- <filename>ENCRYPTION.txt</filename> for details on how to set this
- up.</para>
+ </link> parameter to be set to <constant>yes</constant>. In this
+ mode Samba will try to validate the username/password by passing
+ it to a Windows NT Primary or Backup Domain Controller, in exactly
+ the same way that a Windows NT Server would do.</para>
- <para><emphasis>Note</emphasis> this mode of operation
- has significant pitfalls, due to the fact that is
- activly initiates a man-in-the-middle attack on the
- remote SMB server. In particular, this mode of
- operation can cause significant resource consuption on
- the PDC, as it must maintain an active connection for
- the duration of the user's session. Furthermore, if
- this connection is lost, there is no way to
- reestablish it, and futher authenticaions to the Samba
- server may fail. (From a single client, till it
- disconnects). </para>
+ <para><emphasis>Note</emphasis> that a valid UNIX user must still
+ exist as well as the account on the Domain Controller to allow
+ Samba to have a valid UNIX account to map file access to.</para>
- <para><emphasis>Note</emphasis> that from the client's point of
- view <command>security = server</command> is the same as <command>
- security = user</command>. It only affects how the server deals
- with the authentication, it does not in any way affect what the
- client sees.</para>
+ <para><emphasis>Note</emphasis> that from the client's point
+ of view <command>security = domain</command> is the same as <command>security = user
+ </command>. It only affects how the server deals with the authentication,
+ it does not in any way affect what the client sees.</para>
<para><emphasis>Note</emphasis> that the name of the resource being
requested is <emphasis>not</emphasis> sent to the server until after
@@ -6848,6 +6951,14 @@ print5|My Printer 5
See the <link linkend="MAPTOGUEST"><parameter>map to guest</parameter>
</link> parameter for details on doing this.</para>
+ <para><emphasis>BUG:</emphasis> There is currently a bug in the
+ implementation of <command>security = domain</command> with respect
+ to multi-byte character set usernames. The communication with a
+ Domain Controller must be done in UNICODE and Samba currently
+ does not widen multi-byte user names to UNICODE correctly, thus
+ a multi-byte username will not be recognized correctly at the
+ Domain Controller. This issue will be addressed in a future release.</para>
+
<para>See also the section <link linkend="VALIDATIONSECT">
NOTE ABOUT USERNAME/PASSWORD VALIDATION</link>.</para>
@@ -6855,17 +6966,16 @@ print5|My Printer 5
server</parameter></link> parameter and the <link
linkend="ENCRYPTPASSWORDS"><parameter>encrypted passwords</parameter>
</link> parameter.</para>
-
+
<para>Default: <command>security = USER</command></para>
<para>Example: <command>security = DOMAIN</command></para>
-
</listitem>
</varlistentry>
<varlistentry>
- <term><anchor id="SECURITYMASK"/>security mask (S)</term>
+ <term><anchor id="SECURITYMASK">security mask (S)</term>
<listitem><para>This parameter controls what UNIX permission
bits can be modified when a Windows NT client is manipulating
the UNIX permission on a file using the native NT security
@@ -6925,7 +7035,7 @@ print5|My Printer 5
</varlistentry>
<varlistentry>
- <term><anchor id="SERVERSTRING"/>server string (G)</term>
+ <term><anchor id="SERVERSTRING">server string (G)</term>
<listitem><para>This controls what string will show up in the
printer comment box in print manager and next to the IPC connection
in <command>net view</command>. It can be any string that you wish
@@ -6969,7 +7079,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="SETDIRECTORY"/>set directory (S)</term>
+ <term><anchor id="SETDIRECTORY">set directory (S)</term>
<listitem><para>If <command>set directory = no</command>, then
users of the service may not use the setdir command to change
directory.</para>
@@ -6985,7 +7095,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="SHAREMODES"/>share modes (S)</term>
+ <term><anchor id="SHAREMODES">share modes (S)</term>
<listitem><para>This enables or disables the honoring of
the <parameter>share modes</parameter> during a file open. These
modes are used by clients to gain exclusive read or write access
@@ -7014,7 +7124,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="SHORTPRESERVECASE"/>short preserve case (S)</term>
+ <term><anchor id="SHORTPRESERVECASE">short preserve case (S)</term>
<listitem><para>This boolean parameter controls if new files
which conform to 8.3 syntax, that is all in upper case and of
suitable length, are created upper case, or if they are forced
@@ -7034,7 +7144,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="SHOWADDPRINTERWIZARD"/>show add printer wizard (G)</term>
+ <term><anchor id="SHOWADDPRINTERWIZARD">show add printer wizard (G)</term>
<listitem><para>With the introduction of MS-RPC based printing support
for Windows NT/2000 client in Samba 2.2, a "Printers..." folder will
appear on Samba hosts in the share listing. Normally this folder will
@@ -7069,7 +7179,7 @@ print5|My Printer 5
<varlistentry>
- <term><anchor id="SHUTDOWNSCRIPT"/>shutdown script (G)</term>
+ <term><anchor id="SHUTDOWNSCRIPT">shutdown script (G)</term>
<listitem><para><emphasis>This parameter only exists in the HEAD cvs branch</emphasis>
This a full path name to a script called by
<ulink url="smbd.8.html"><command>smbd(8)</command></ulink> that
@@ -7095,15 +7205,15 @@ print5|My Printer 5
<para>Default: <emphasis>None</emphasis>.</para>
<para>Example: <command>abort shutdown script = /usr/local/samba/sbin/shutdown %m %t %r %f</command></para>
<para>Shutdown script example:
-<programlisting>
-#!/bin/bash
+ <programlisting>
+ #!/bin/bash
-$time=0
-let "time/60"
-let "time++"
+ $time=0
+ let "time/60"
+ let "time++"
-/sbin/shutdown $3 $4 +$time $1 &amp;
-</programlisting>
+ /sbin/shutdown $3 $4 +$time $1 &
+ </programlisting>
Shutdown does not return so we need to launch it in background.
</para>
@@ -7113,7 +7223,7 @@ let "time++"
<varlistentry>
- <term><anchor id="SMBPASSWDFILE"/>smb passwd file (G)</term>
+ <term><anchor id="SMBPASSWDFILE">smb passwd file (G)</term>
<listitem><para>This option sets the path to the encrypted
smbpasswd file. By default the path to the smbpasswd file
is compiled into Samba.</para>
@@ -7128,7 +7238,7 @@ let "time++"
<varlistentry>
- <term><anchor id="SMBPORTS"/>smb ports (G)</term>
+ <term><anchor id="SMBPORTS">smb ports (G)</term>
<listitem><para>Specifies which ports the server should listen on
for SMB traffic.
</para>
@@ -7139,7 +7249,7 @@ let "time++"
</varlistentry>
<varlistentry>
- <term><anchor id="SOCKETADDRESS"/>socket address (G)</term>
+ <term><anchor id="SOCKETADDRESS">socket address (G)</term>
<listitem><para>This option allows you to control what
address Samba will listen for connections on. This is used to
support multiple virtual interfaces on the one server, each
@@ -7156,7 +7266,7 @@ let "time++"
<varlistentry>
- <term><anchor id="SOCKETOPTIONS"/>socket options (G)</term>
+ <term><anchor id="SOCKETOPTIONS">socket options (G)</term>
<listitem><para>This option allows you to set socket options
to be used when talking with the client.</para>
@@ -7229,7 +7339,7 @@ let "time++"
<varlistentry>
- <term><anchor id="SOURCEENVIRONMENT"/>source environment (G)</term>
+ <term><anchor id="SOURCEENVIRONMENT">source environment (G)</term>
<listitem><para>This parameter causes Samba to set environment
variables as per the content of the file named.</para>
@@ -7251,23 +7361,17 @@ let "time++"
/usr/local/smb_env_vars</command></para>
</listitem>
</varlistentry>
+<varlistentry>
+<term><anchor id="SPNEGO">use spnego (G)</term>
+<listitem><para> This variable controls controls whether samba will try to use Simple and Protected NEGOciation (as specified by rfc2478) with WindowsXP and Windows2000sp2 clients to agree upon an authentication mechanism. As of samba 3.0alpha it must be set to "no" for these clients to join a samba domain controller. It can be set to "yes" to allow samba to participate in an AD domain controlled by a Windows2000 domain controller.</para>
+<para>Default: <emphasis>use spnego = yes</emphasis></para>
+</listitem>
+</varlistentry>
<varlistentry>
- <term><anchor id="SPNEGO"/>use spnego (G)</term>
- <listitem><para> This variable controls controls whether samba will try
- to use Simple and Protected NEGOciation (as specified by rfc2478) with
- WindowsXP and Windows2000sp2 clients to agree upon an authentication mechanism.
- Unless further issues are discovered with our SPNEGO
- implementation, there is no reason this should ever be
- disabled.</para>
- <para>Default: <emphasis>use spnego = yes</emphasis></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><anchor id="STATCACHE"/>stat cache (G)</term>
- <listitem><para>This parameter determines if <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> will use a cache in order to
+ <term><anchor id="STATCACHE">stat cache (G)</term>
+ <listitem><para>This parameter determines if <ulink
+ url="smbd.8.html">smbd(8)</ulink> will use a cache in order to
speed up case insensitive name mappings. You should never need
to change this parameter.</para>
@@ -7276,7 +7380,7 @@ let "time++"
</varlistentry>
<varlistentry>
- <term><anchor id="STATCACHESIZE"/>stat cache size (G)</term>
+ <term><anchor id="STATCACHESIZE">stat cache size (G)</term>
<listitem><para>This parameter determines the number of
entries in the <parameter>stat cache</parameter>. You should
never need to change this parameter.</para>
@@ -7288,7 +7392,7 @@ let "time++"
<varlistentry>
- <term><anchor id="STRICTALLOCATE"/>strict allocate (S)</term>
+ <term><anchor id="STRICTALLOCATE">strict allocate (S)</term>
<listitem><para>This is a boolean that controls the handling of
disk space allocation in the server. When this is set to <constant>yes</constant>
the server will change from UNIX behaviour of not committing real
@@ -7312,7 +7416,7 @@ let "time++"
<varlistentry>
- <term><anchor id="STRICTLOCKING"/>strict locking (S)</term>
+ <term><anchor id="STRICTLOCKING">strict locking (S)</term>
<listitem><para>This is a boolean that controls the handling of
file locking in the server. When this is set to <constant>yes</constant>
the server will check every read and write access for file locks, and
@@ -7332,7 +7436,7 @@ let "time++"
<varlistentry>
- <term><anchor id="STRICTSYNC"/>strict sync (S)</term>
+ <term><anchor id="STRICTSYNC">strict sync (S)</term>
<listitem><para>Many Windows applications (including the Windows
98 explorer shell) seem to confuse flushing buffer contents to
disk with doing a sync to disk. Under UNIX, a sync call forces
@@ -7340,8 +7444,7 @@ let "time++"
all outstanding data in kernel disk buffers has been safely stored
onto stable storage. This is very slow and should only be done
rarely. Setting this parameter to <constant>no</constant> (the
- default) means that <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> ignores the Windows applications requests for
+ default) means that <ulink url="smbd.8.html">smbd</ulink> ignores the Windows applications requests for
a sync call. There is only a possibility of losing data if the
operating system itself that Samba is running on crashes, so there is
little danger in this default setting. In addition, this fixes many
@@ -7357,7 +7460,7 @@ let "time++"
<varlistentry>
- <term><anchor id="STRIPDOT"/>strip dot (G)</term>
+ <term><anchor id="STRIPDOT">strip dot (G)</term>
<listitem><para>This is a boolean that controls whether to
strip trailing dots off UNIX filenames. This helps with some
CDROMs that have filenames ending in a single dot.</para>
@@ -7369,7 +7472,7 @@ let "time++"
<varlistentry>
- <term><anchor id="SYNCALWAYS"/>sync always (S)</term>
+ <term><anchor id="SYNCALWAYS">sync always (S)</term>
<listitem><para>This is a boolean parameter that controls
whether writes will always be written to stable storage before
the write call returns. If this is <constant>no</constant> then the server will be
@@ -7391,7 +7494,7 @@ let "time++"
<varlistentry>
- <term><anchor id="SYSLOG"/>syslog (G)</term>
+ <term><anchor id="SYSLOG">syslog (G)</term>
<listitem><para>This parameter maps how Samba debug messages
are logged onto the system syslog logging levels. Samba debug
level zero maps onto syslog <constant>LOG_ERR</constant>, debug
@@ -7411,7 +7514,7 @@ let "time++"
<varlistentry>
- <term><anchor id="SYSLOGONLY"/>syslog only (G)</term>
+ <term><anchor id="SYSLOGONLY">syslog only (G)</term>
<listitem><para>If this parameter is set then Samba debug
messages are logged into the system syslog only, and not to
the debug log files.</para>
@@ -7423,7 +7526,7 @@ let "time++"
<varlistentry>
- <term><anchor id="TEMPLATEHOMEDIR"/>template homedir (G)</term>
+ <term><anchor id="TEMPLATEHOMEDIR">template homedir (G)</term>
<listitem><para>When filling out the user information for a Windows NT
user, the <ulink url="winbindd.8.html">winbindd(8)</ulink> daemon
uses this parameter to fill in the home directory for that user.
@@ -7439,10 +7542,9 @@ let "time++"
<varlistentry>
- <term><anchor id="TEMPLATESHELL"/>template shell (G)</term>
+ <term><anchor id="TEMPLATESHELL">template shell (G)</term>
<listitem><para>When filling out the user information for a Windows NT
- user, the <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> daemon
+ user, the <ulink url="winbindd.8.html">winbindd(8)</ulink> daemon
uses this parameter to fill in the login shell for that user.</para>
<para>Default: <command>template shell = /bin/false</command></para>
@@ -7452,7 +7554,7 @@ let "time++"
<varlistentry>
- <term><anchor id="TIMEOFFSET"/>time offset (G)</term>
+ <term><anchor id="TIMEOFFSET">time offset (G)</term>
<listitem><para>This parameter is a setting in minutes to add
to the normal GMT to local time conversion. This is useful if
you are serving a lot of PCs that have incorrect daylight
@@ -7466,9 +7568,9 @@ let "time++"
<varlistentry>
- <term><anchor id="TIMESERVER"/>time server (G)</term>
- <listitem><para>This parameter determines if <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> advertises itself as a time server to Windows
+ <term><anchor id="TIMESERVER">time server (G)</term>
+ <listitem><para>This parameter determines if <ulink url="nmbd.8.html">
+ nmbd(8)</ulink> advertises itself as a time server to Windows
clients.</para>
<para>Default: <command>time server = no</command></para>
@@ -7477,7 +7579,7 @@ let "time++"
<varlistentry>
- <term><anchor id="TIMESTAMPLOGS"/>timestamp logs (G)</term>
+ <term><anchor id="TIMESTAMPLOGS">timestamp logs (G)</term>
<listitem><para>Synonym for <link linkend="DEBUGTIMESTAMP"><parameter>
debug timestamp</parameter></link>.</para>
</listitem>
@@ -7488,17 +7590,16 @@ let "time++"
<varlistentry>
- <term><anchor id="TOTALPRINTJOBS"/>total print jobs (G)</term>
+ <term><anchor id="TOTALPRINTJOBS">total print jobs (G)</term>
<listitem><para>This parameter accepts an integer value which defines
a limit on the maximum number of print jobs that will be accepted
system wide at any given time. If a print job is submitted
- by a client which will exceed this number, then <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> will return an
+ by a client which will exceed this number, then <ulink url="smbd.8.html">smbd</ulink> will return an
error indicating that no space is available on the server. The
default value of 0 means that no such limit exists. This parameter
can be used to prevent a server from exceeding its capacity and is
designed as a printing throttle. See also
- <link linkend="MAXPRINTJOBS"><parameter>max print jobs</parameter></link>.
+ <link linkend="MAXPRINTJOBS"><parameter>max print jobs</parameter</link>.
</para>
<para>Default: <command>total print jobs = 0</command></para>
@@ -7507,7 +7608,7 @@ let "time++"
</varlistentry>
<varlistentry>
- <term><anchor id="UNICODE"/>unicode (G)</term>
+ <term><anchor id="UNICODE">unicode (G)</term>
<listitem><para>Specifies whether Samba should try
to use unicode on the wire by default. Note: This does NOT
mean that samba will assume that the unix machine uses unicode!
@@ -7519,19 +7620,19 @@ let "time++"
</varlistentry>
<varlistentry>
- <term><anchor id="UNIXCHARSET"/>unix charset (G)</term>
+ <term><anchor id="UNIXCHARSET">unix charset (G)</term>
<listitem><para>Specifies the charset the unix machine
Samba runs on uses. Samba needs to know this in order to be able to
convert text to the charsets other SMB clients use.
</para>
- <para>Default: <command>unix charset = UTF8</command></para>
- <para>Example: <command>unix charset = ASCII</command></para>
+ <para>Default: <command>unix charset = ASCII</command></para>
+ <para>Example: <command>unix charset = UTF8</command></para>
</listitem>
</varlistentry>
<varlistentry>
- <term><anchor id="UNIXEXTENSIONS"/>unix extensions(G)</term>
+ <term><anchor id="UNIXEXTENSIONS">unix extensions(G)</term>
<listitem><para>This boolean parameter controls whether Samba
implments the CIFS UNIX extensions, as defined by HP.
These extensions enable Samba to better serve UNIX CIFS clients
@@ -7547,7 +7648,7 @@ let "time++"
<varlistentry>
- <term><anchor id="UNIXPASSWORDSYNC"/>unix password sync (G)</term>
+ <term><anchor id="UNIXPASSWORDSYNC">unix password sync (G)</term>
<listitem><para>This boolean parameter controls whether Samba
attempts to synchronize the UNIX password with the SMB password
when the encrypted SMB password in the smbpasswd file is changed.
@@ -7568,7 +7669,7 @@ let "time++"
<varlistentry>
- <term><anchor id="UPDATEENCRYPTED"/>update encrypted (G)</term>
+ <term><anchor id="UPDATEENCRYPTED">update encrypted (G)</term>
<listitem><para>This boolean parameter allows a user logging
on with a plaintext password to have their encrypted (hashed)
password in the smbpasswd file to be updated automatically as
@@ -7599,7 +7700,7 @@ let "time++"
<varlistentry>
- <term><anchor id="USECLIENTDRIVER"/>use client driver (S)</term>
+ <term><anchor id="USECLIENTDRIVER">use client driver (S)</term>
<listitem><para>This parameter applies only to Windows NT/2000
clients. It has no affect on Windows 95/98/ME clients. When
serving a printer to Windows NT/2000 clients without first installing
@@ -7637,7 +7738,7 @@ let "time++"
<varlistentry>
- <term><anchor id="USEMMAP"/>use mmap (G)</term>
+ <term><anchor id="USEMMAP">use mmap (G)</term>
<listitem><para>This global parameter determines if the tdb internals of Samba can
depend on mmap working correctly on the running system. Samba requires a coherent
mmap/read-write system memory cache. Currently only HPUX does not have such a
@@ -7655,7 +7756,27 @@ let "time++"
<varlistentry>
- <term><anchor id="USER"/>user (S)</term>
+ <term><anchor id="USERHOSTS">use rhosts (G)</term>
+ <listitem><para>If this global parameter is <constant>yes</constant>, it specifies
+ that the UNIX user's <filename>.rhosts</filename> file in their home directory
+ will be read to find the names of hosts and users who will be allowed
+ access without specifying a password.</para>
+
+ <para><emphasis>NOTE:</emphasis> The use of <parameter>use rhosts
+ </parameter> can be a major security hole. This is because you are
+ trusting the PC to supply the correct username. It is very easy to
+ get a PC to supply a false username. I recommend that the <parameter>
+ use rhosts</parameter> option be only used if you really know what
+ you are doing.</para>
+
+ <para>Default: <command>use rhosts = no</command></para>
+ </listitem>
+ </varlistentry>
+
+
+
+ <varlistentry>
+ <term><anchor id="USER">user (S)</term>
<listitem><para>Synonym for <link linkend="USERNAME"><parameter>
username</parameter></link>.</para>
</listitem>
@@ -7664,7 +7785,7 @@ let "time++"
<varlistentry>
- <term><anchor id="USERS"/>users (S)</term>
+ <term><anchor id="USERS">users (S)</term>
<listitem><para>Synonym for <link linkend="USERNAME"><parameter>
username</parameter></link>.</para>
</listitem>
@@ -7672,7 +7793,7 @@ let "time++"
<varlistentry>
- <term><anchor id="USERNAME"/>username (S)</term>
+ <term><anchor id="USERNAME">username (S)</term>
<listitem><para>Multiple users may be specified in a comma-delimited
list, in which case the supplied password will be tested against
each username in turn (left to right).</para>
@@ -7713,7 +7834,7 @@ let "time++"
will be looked up only in the UNIX groups database and will
expand to a list of all users in the group of that name.</para>
- <para>If any of the usernames begin with a '&amp;' then the name
+ <para>If any of the usernames begin with a '&'then the name
will be looked up only in the NIS netgroups database (if Samba
is compiled with netgroup support) and will expand to a list
of all users in the netgroup group of that name.</para>
@@ -7737,7 +7858,7 @@ let "time++"
<varlistentry>
- <term><anchor id="USERNAMELEVEL"/>username level (G)</term>
+ <term><anchor id="USERNAMELEVEL">username level (G)</term>
<listitem><para>This option helps Samba to try and 'guess' at
the real UNIX username, as many DOS clients send an all-uppercase
username. By default Samba tries all lowercase, followed by the
@@ -7760,7 +7881,7 @@ let "time++"
<varlistentry>
- <term><anchor id="USERNAMEMAP"/>username map (G)</term>
+ <term><anchor id="USERNAMEMAP">username map (G)</term>
<listitem><para>This option allows you to specify a file containing
a mapping of usernames from the clients to the server. This can be
used for several purposes. The most common is to map usernames
@@ -7823,10 +7944,10 @@ let "time++"
'!' to tell Samba to stop processing if it gets a match on
that line.</para>
-<para><programlisting>
-!sys = mary fred
-guest = *
-</programlisting></para>
+ <para><programlisting>
+ !sys = mary fred
+ guest = *
+ </programlisting></para>
<para>Note that the remapping is applied to all occurrences
of usernames. Thus if you connect to \\server\fred and <constant>
@@ -7852,7 +7973,7 @@ guest = *
<varlistentry>
- <term><anchor id="USESENDFILE"/>use sendfile (S)</term>
+ <term><anchor id="USESENDFILE">use sendfile (S)</term>
<listitem><para>If this parameter is <constant>yes</constant>, and Samba
was built with the --with-sendfile-support option, and the underlying operating
system supports sendfile system call, then some SMB read calls (mainly ReadAndX
@@ -7869,7 +7990,7 @@ guest = *
<varlistentry>
- <term><anchor id="UTMP"/>utmp (G)</term>
+ <term><anchor id="UTMP">utmp (G)</term>
<listitem><para>This boolean parameter is only available if
Samba has been configured and compiled with the option <command>
--with-utmp</command>. If set to <constant>yes</constant> then Samba will attempt
@@ -7891,7 +8012,7 @@ guest = *
</varlistentry>
<varlistentry>
- <term><anchor id="UTMPDIRECTORY"/>utmp directory(G)</term>
+ <term><anchor id="UTMPDIRECTORY">utmp directory(G)</term>
<listitem><para>This parameter is only available if Samba has
been configured and compiled with the option <command>
--with-utmp</command>. It specifies a directory pathname that is
@@ -7908,7 +8029,7 @@ guest = *
</varlistentry>
<varlistentry>
- <term><anchor id="WTMPDIRECTORY"/>wtmp directory(G)</term>
+ <term><anchor id="WTMPDIRECTORY">wtmp directory(G)</term>
<listitem><para>This parameter is only available if Samba has
been configured and compiled with the option <command>
--with-utmp</command>. It specifies a directory pathname that is
@@ -7930,9 +8051,9 @@ guest = *
<varlistentry>
- <term><anchor id="VALIDUSERS"/>valid users (S)</term>
+ <term><anchor id="VALIDUSERS">valid users (S)</term>
<listitem><para>This is a list of users that should be allowed
- to login to this service. Names starting with '@', '+' and '&amp;'
+ to login to this service. Names starting with '@', '+' and '&'
are interpreted using the same rules as described in the
<parameter>invalid users</parameter> parameter.</para>
@@ -7957,7 +8078,7 @@ guest = *
<varlistentry>
- <term><anchor id="VETOFILES"/>veto files(S)</term>
+ <term><anchor id="VETOFILES">veto files(S)</term>
<listitem><para>This is a list of files and directories that
are neither visible nor accessible. Each entry in the list must
be separated by a '/', which allows spaces to be included
@@ -8005,7 +8126,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="VETOOPLOCKFILES"/>veto oplock files (S)</term>
+ <term><anchor id="VETOOPLOCKFILES">veto oplock files (S)</term>
<listitem><para>This parameter is only valid when the <link
linkend="OPLOCKS"><parameter>oplocks</parameter></link>
parameter is turned on for a share. It allows the Samba administrator
@@ -8031,7 +8152,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
</varlistentry>
<varlistentry>
- <term><anchor id="VFSPATH"/>vfs path (S)</term>
+ <term><anchor id="VFSPATH">vfs path (S)</term>
<listitem><para>This parameter specifies the directory
to look in for vfs modules. The name of every <command>vfs object
</command> will be prepended by this directory
@@ -8044,7 +8165,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
</varlistentry>
<varlistentry>
- <term><anchor id="VFSOBJECT"/>vfs object (S)</term>
+ <term><anchor id="VFSOBJECT">vfs object (S)</term>
<listitem><para>This parameter specifies a shared object files that
are used for Samba VFS I/O operations. By default, normal
disk I/O operations are used but these can be overloaded
@@ -8058,7 +8179,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="VFSOPTIONS"/>vfs options (S)</term>
+ <term><anchor id="VFSOPTIONS">vfs options (S)</term>
<listitem><para>This parameter allows parameters to be passed
to the vfs layer at initialization time.
See also <link linkend="VFSOBJECT"><parameter>
@@ -8071,7 +8192,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="VOLUME"/>volume (S)</term>
+ <term><anchor id="VOLUME">volume (S)</term>
<listitem><para> This allows you to override the volume label
returned for a share. Useful for CDROMs with installation programs
that insist on a particular volume label.</para>
@@ -8083,7 +8204,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WIDELINKS"/>wide links (S)</term>
+ <term><anchor id="WIDELINKS">wide links (S)</term>
<listitem><para>This parameter controls whether or not links
in the UNIX file system may be followed by the server. Links
that point to areas within the directory tree exported by the
@@ -8102,10 +8223,9 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WINBINDCACHETIME"/>winbind cache time (G)</term>
- <listitem><para>This parameter specifies the number of
- seconds the <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> daemon will cache
+ <term><anchor id="WINBINDCACHETIME">winbind cache time (G)</term>
+ <listitem><para>This parameter specifies the number of seconds the
+ <ulink url="winbindd.8.html">winbindd(8)</ulink> daemon will cache
user and group information before querying a Windows NT server
again.</para>
@@ -8115,10 +8235,11 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WINBINDENUMUSERS"/>winbind enum users (G)</term>
- <listitem><para>On large installations using <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> it may be
- necessary to suppress the enumeration of users through the <command>setpwent()</command>,
+ <term><anchor id="WINBINDENUMUSERS">winbind enum users (G)</term>
+ <listitem><para>On large installations using
+ <ulink url="winbindd.8.html">winbindd(8)</ulink> it may be
+ necessary to suppress the enumeration of users through the
+ <command> setpwent()</command>,
<command>getpwent()</command> and
<command>endpwent()</command> group of system calls. If
the <parameter>winbind enum users</parameter> parameter is
@@ -8136,10 +8257,11 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
</varlistentry>
<varlistentry>
- <term><anchor id="WINBINDENUMGROUPS"/>winbind enum groups (G)</term>
- <listitem><para>On large installations using <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> it may be necessary to suppress
- the enumeration of groups through the <command>setgrent()</command>,
+ <term><anchor id="WINBINDENUMGROUPS">winbind enum groups (G)</term>
+ <listitem><para>On large installations using
+ <ulink url="winbindd.8.html">winbindd(8)</ulink> it may be
+ necessary to suppress the enumeration of groups through the
+ <command> setgrent()</command>,
<command>getgrent()</command> and
<command>endgrent()</command> group of system calls. If
the <parameter>winbind enum groups</parameter> parameter is
@@ -8156,10 +8278,10 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WINBINDGID"/>winbind gid (G)</term>
+ <term><anchor id="WINBINDGID">winbind gid (G)</term>
<listitem><para>The winbind gid parameter specifies the range of group
- ids that are allocated by the <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> daemon. This range of group ids should have no
+ ids that are allocated by the <ulink url="winbindd.8.html">
+ winbindd(8)</ulink> daemon. This range of group ids should have no
existing local or NIS groups within it as strange conflicts can
occur otherwise.</para>
@@ -8172,7 +8294,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WINBINDSEPARATOR"/>winbind separator (G)</term>
+ <term><anchor id="WINBINDSEPARATOR">winbind separator (G)</term>
<listitem><para>This parameter allows an admin to define the character
used when listing a username of the form of <replaceable>DOMAIN
</replaceable>\<replaceable>user</replaceable>. This parameter
@@ -8193,10 +8315,10 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WINBINDUID"/>winbind uid (G)</term>
+ <term><anchor id="WINBINDUID">winbind uid (G)</term>
<listitem><para>The winbind gid parameter specifies the range of group
- ids that are allocated by the <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> daemon. This range of ids should have no
+ ids that are allocated by the <ulink url="winbindd.8.html">
+ winbindd(8)</ulink> daemon. This range of ids should have no
existing local or NIS users within it as strange conflicts can
occur otherwise.</para>
@@ -8209,10 +8331,12 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WINBINDUSEDEFAULTDOMAIN"/>winbind use default domain (G)</term>
- <listitem><para>This parameter specifies whether the <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> daemon should operate on users
- without domain component in their username.
+ <term>winbind use default domain</term>
+
+ <term><anchor id="WINBINDUSEDEFAULTDOMAIN">winbind use default domain (G)</term>
+ <listitem><para>This parameter specifies whether the <ulink url="winbindd.8.html">
+ winbindd(8)</ulink>
+ daemon should operate on users without domain component in their username.
Users without a domain component are treated as is part of the winbindd server's
own domain. While this does not benifit Windows users, it makes SSH, FTP and e-mail
function in a way much closer to the way they would in a native unix system.</para>
@@ -8225,7 +8349,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WINSHOOK"/>wins hook (G)</term>
+ <term><anchor id="WINSHOOK">wins hook (G)</term>
<listitem><para>When Samba is running as a WINS server this
allows you to call an external program for all changes to the
WINS database. The primary use for this option is to allow the
@@ -8273,7 +8397,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WINSPROXY"/>wins proxy (G)</term>
+ <term><anchor id="WINSPROXY">wins proxy (G)</term>
<listitem><para>This is a boolean that controls if <ulink
url="nmbd.8.html">nmbd(8)</ulink> will respond to broadcast name
queries on behalf of other hosts. You may need to set this
@@ -8287,46 +8411,33 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WINSSERVER"/>wins server (G)</term>
+ <term><anchor id="WINSSERVER">wins server (G)</term>
<listitem><para>This specifies the IP address (or DNS name: IP
- address for preference) of the WINS server that <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> should register with. If you have a WINS server on
+ address for preference) of the WINS server that <ulink url="nmbd.8.html">
+ nmbd(8)</ulink> should register with. If you have a WINS server on
your network then you should set this to the WINS server's IP.</para>
<para>You should point this at your WINS server if you have a
multi-subnetted network.</para>
- <para>If you want to work in multiple namespaces, you can
- give every wins server a 'tag'. For each tag, only one
- (working) server will be queried for a name. The tag should be
- seperated from the ip address by a colon.
- </para>
-
- <note><para>You need to set up Samba to point
+ <para><emphasis>NOTE</emphasis>. You need to set up Samba to point
to a WINS server if you have multiple subnets and wish cross-subnet
- browsing to work correctly.</para></note>
-
+ browsing to work correctly.</para>
- <para>See the documentation file <ulink url="improved-browsing.html">Browsing</ulink> in the samba howto collection.</para>
+ <para>See the documentation file <filename>BROWSING.txt</filename>
+ in the docs/ directory of your Samba source distribution.</para>
<para>Default: <emphasis>not enabled</emphasis></para>
- <para>Example: <command>wins server = mary:192.9.200.1 fred:192.168.3.199 mary:192.168.2.61</command></para>
- <para>For this example when querying a certain name, 192.19.200.1 will
- be asked first and if that doesn't respond 192.168.2.61. If either
- of those doesn't know the name 192.168.3.199 will be queried.
- </para>
-
- <para>Example: <command>wins server = 192.9.200.1 192.168.2.61</command></para>
-
+ <para>Example: <command>wins server = 192.9.200.1</command></para>
</listitem>
</varlistentry>
<varlistentry>
- <term><anchor id="WINSSUPPORT"/>wins support (G)</term>
- <listitem><para>This boolean controls if the <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> process in Samba will act as a WINS server. You should
+ <term><anchor id="WINSSUPPORT">wins support (G)</term>
+ <listitem><para>This boolean controls if the <ulink url="nmbd.8.html">
+ nmbd(8)</ulink> process in Samba will act as a WINS server. You should
not set this to <constant>yes</constant> unless you have a multi-subnetted network and
you wish a particular <command>nmbd</command> to be your WINS server.
Note that you should <emphasis>NEVER</emphasis> set this to <constant>yes</constant>
@@ -8339,7 +8450,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WORKGROUP"/>workgroup (G)</term>
+ <term><anchor id="WORKGROUP">workgroup (G)</term>
<listitem><para>This controls what workgroup your server will
appear to be in when queried by clients. Note that this parameter
also controls the Domain name used with the <link
@@ -8355,7 +8466,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WRITABLE"/>writable (S)</term>
+ <term><anchor id="WRITABLE">writable (S)</term>
<listitem><para>Synonym for <link linkend="WRITEABLE"><parameter>
writeable</parameter></link> for people who can't spell :-).</para>
</listitem>
@@ -8364,7 +8475,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WRITECACHESIZE"/>write cache size (S)</term>
+ <term><anchor id="WRITECACHESIZE">write cache size (S)</term>
<listitem><para>If this integer parameter is set to non-zero value,
Samba will create an in-memory cache for each oplocked file
(it does <emphasis>not</emphasis> do this for
@@ -8396,7 +8507,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WRITELIST"/>write list (S)</term>
+ <term><anchor id="WRITELIST">write list (S)</term>
<listitem><para>This is a list of users that are given read-write
access to a service. If the connecting user is in this list then
they will be given write access, no matter what the <link
@@ -8421,7 +8532,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WINSPARTNERS"/>wins partners (G)</term>
+ <term><anchor id="WINSPARTNERS">wins partners (G)</term>
<listitem><para>A space separated list of partners' IP addresses for
WINS replication. WINS partners are always defined as push/pull
partners as defining only one way WINS replication is unreliable.
@@ -8437,7 +8548,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WRITEOK"/>write ok (S)</term>
+ <term><anchor id="WRITEOK">write ok (S)</term>
<listitem><para>Inverted synonym for <link linkend="READONLY"><parameter>
read only</parameter></link>.</para>
</listitem>
@@ -8446,7 +8557,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WRITERAW"/>write raw (G)</term>
+ <term><anchor id="WRITERAW">write raw (G)</term>
<listitem><para>This parameter controls whether or not the server
will support raw write SMB's when transferring data from clients.
You should never need to change this parameter.</para>
@@ -8458,7 +8569,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WRITEABLE"/>writeable (S)</term>
+ <term><anchor id="WRITEABLE">writeable (S)</term>
<listitem><para>Inverted synonym for <link linkend="READONLY"><parameter>
read only</parameter></link>.</para>
</listitem>
@@ -8478,8 +8589,8 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
problem - but be aware of the possibility.</para>
<para>On a similar note, many clients - especially DOS clients -
- limit service names to eight characters. <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> has no such limitation, but attempts to connect from such
+ limit service names to eight characters. <ulink url="smbd.8.html">smbd(8)
+ </ulink> has no such limitation, but attempts to connect from such
clients will fail if they truncate the service names. For this reason
you should probably keep your service names down to eight characters
in length.</para>
@@ -8494,22 +8605,22 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3.0 of the Samba suite.</para>
+ <para>This man page is correct for version 3.0 of
+ the Samba suite.</para>
</refsect1>
<refsect1>
<title>SEE ALSO</title>
- <para>
- <citerefentry><refentrytitle>samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>swat</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmblookup</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>.</para>
+ <para><ulink url="samba.7.html">samba(7)</ulink>,
+ <ulink url="smbpasswd.8.html"><command>smbpasswd(8)</command></ulink>,
+ <ulink url="swat.8.html"><command>swat(8)</command></ulink>,
+ <ulink url="smbd.8.html"><command>smbd(8)</command></ulink>,
+ <ulink url="nmbd.8.html"><command>nmbd(8)</command></ulink>,
+ <ulink url="smbclient.1.html"><command>smbclient(1)</command></ulink>,
+ <ulink url="nmblookup.1.html"><command>nmblookup(1)</command></ulink>,
+ <ulink url="testparm.1.html"><command>testparm(1)</command></ulink>,
+ <ulink url="testprns.1.html"><command>testprns(1)</command></ulink>
+ </para>
</refsect1>
<refsect1>
@@ -8522,11 +8633,11 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2
- for Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/smbcacls.1.sgml b/docs/docbook/manpages/smbcacls.1.sgml
index 445566c5bd..766d2a78b1 100644
--- a/docs/docbook/manpages/smbcacls.1.sgml
+++ b/docs/docbook/manpages/smbcacls.1.sgml
@@ -1,7 +1,5 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-<refentry id="smbcacls.1">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="smbcacls">
<refmeta>
<refentrytitle>smbcacls</refentrytitle>
@@ -19,26 +17,24 @@
<command>smbcacls</command>
<arg choice="req">//server/share</arg>
<arg choice="req">filename</arg>
- <arg choice="opt">-D acls</arg>
- <arg choice="opt">-M acls</arg>
+ <arg choice="opt">-U username</arg>
<arg choice="opt">-A acls</arg>
+ <arg choice="opt">-M acls</arg>
+ <arg choice="opt">-D acls</arg>
<arg choice="opt">-S acls</arg>
<arg choice="opt">-C name</arg>
<arg choice="opt">-G name</arg>
<arg choice="opt">-n</arg>
- <arg choice="opt">-t</arg>
- <arg choice="opt">-U username</arg>
<arg choice="opt">-h</arg>
- <arg choice="opt">-d</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
-
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
+
<para>The <command>smbcacls</command> program manipulates NT Access Control
Lists (ACLs) on SMB file shares. </para>
</refsect1>
@@ -94,8 +90,7 @@
<listitem><para>Specifies a username used to connect to the
specified service. The username may be of the form "username" in
which case the user is prompted to enter in a password and the
- workgroup specified in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file is
+ workgroup specified in the <filename>smb.conf</filename> file is
used, or "username%password" or "DOMAIN\username%password" and the
password and workgroup names are used as provided. </para></listitem>
</varlistentry>
@@ -135,16 +130,13 @@
and masks to a readable string format. </para></listitem>
</varlistentry>
+
+
<varlistentry>
- <term>-t</term>
- <listitem><para>
- Don't actually do anything, only validate the correctness of
- the arguments.
- </para></listitem>
+ <term>-h</term>
+ <listitem><para>Print usage information on the <command>smbcacls
+ </command> program.</para></listitem>
</varlistentry>
-
- &stdarg.help;
- &popt.common.samba;
</variablelist>
</refsect1>
@@ -155,12 +147,12 @@
<para>The format of an ACL is one or more ACL entries separated by
either commas or newlines. An ACL entry is one of the following: </para>
-<para><programlisting>
+ <para><programlisting>
REVISION:&lt;revision number&gt;
OWNER:&lt;sid or name&gt;
GROUP:&lt;sid or name&gt;
ACL:&lt;sid or name&gt;:&lt;type&gt;/&lt;flags&gt;/&lt;mask&gt;
-</programlisting></para>
+ </programlisting></para>
<para>The revision of the ACL specifies the internal Windows
@@ -173,22 +165,24 @@ ACL:&lt;sid or name&gt;:&lt;type&gt;/&lt;flags&gt;/&lt;mask&gt;
otherwise the name specified is resolved using the server on which
the file or directory resides. </para>
- <para>ACLs specify permissions granted to the SID. This SID again
- can be specified in CWS-1-x-y-z format or as a name in which case
- it is resolved against the server on which the file or directory
- resides. The type, flags and mask values determine the type of
- access granted to the SID. </para>
-
- <para>The type can be either 0 or 1 corresponding to ALLOWED or
- DENIED access to the SID. The flags values are generally
- zero for file ACLs and either 9 or 2 for directory ACLs. Some
- common flags are: </para>
-
- <itemizedlist>
- <listitem><para><constant>#define SEC_ACE_FLAG_OBJECT_INHERIT 0x1</constant></para></listitem>
- <listitem><para><constant>#define SEC_ACE_FLAG_CONTAINER_INHERIT 0x2</constant></para></listitem>
- <listitem><para><constant>#define SEC_ACE_FLAG_NO_PROPAGATE_INHERIT 0x4</constant></para></listitem>
- <listitem><para><constant>#define SEC_ACE_FLAG_INHERIT_ONLY 0x8</constant></para></listitem>
+ <para>ACLs specify permissions granted to the SID. This SID again
+ can be specified in CWS-1-x-y-z format or as a name in which case
+ it is resolved against the server on which the file or directory
+ resides. The type, flags and mask values determine the type of
+ access granted to the SID. </para>
+
+ <para>The type can be either 0 or 1 corresponding to ALLOWED or
+ DENIED access to the SID. The flags values are generally
+ zero for file ACLs and either 9 or 2 for directory ACLs. Some
+ common flags are: </para>
+
+ <itemizedlist>
+ <listitem><para>#define SEC_ACE_FLAG_OBJECT_INHERIT 0x1</para></listitem>
+ <listitem><para>#define SEC_ACE_FLAG_CONTAINER_INHERIT 0x2</para></listitem>
+ <listitem><para>#define SEC_ACE_FLAG_NO_PROPAGATE_INHERIT 0x4
+ </para></listitem>
+ <listitem><para>#define SEC_ACE_FLAG_INHERIT_ONLY 0x8</para>
+ </listitem>
</itemizedlist>
<para>At present flags can only be specified as decimal or
@@ -239,7 +233,8 @@ ACL:&lt;sid or name&gt;:&lt;type&gt;/&lt;flags&gt;/&lt;mask&gt;
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3.0 of the Samba suite.</para>
+ <para>This man page is correct for version 2.2 of
+ the Samba suite.</para>
</refsect1>
<refsect1>
@@ -254,8 +249,7 @@ ACL:&lt;sid or name&gt;:&lt;type&gt;/&lt;flags&gt;/&lt;mask&gt;
and Tim Potter.</para>
<para>The conversion to DocBook for Samba 2.2 was done
- by Gerald Carter. The conversion to DocBook XML 4.2 for Samba 3.0 was done
- by Alexander Bokovoy.</para>
+ by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/smbclient.1.sgml b/docs/docbook/manpages/smbclient.1.sgml
index cd513398b9..43994a4529 100644
--- a/docs/docbook/manpages/smbclient.1.sgml
+++ b/docs/docbook/manpages/smbclient.1.sgml
@@ -1,7 +1,5 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-<refentry id="smbclient.1">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="smbclient">
<refmeta>
<refentrytitle>smbclient</refentrytitle>
@@ -40,20 +38,18 @@
<arg choice="opt">-R &lt;name resolve order&gt;</arg>
<arg choice="opt">-s &lt;smb config file&gt;</arg>
<arg choice="opt">-T&lt;c|x&gt;IXFqgbNan</arg>
- <arg choice="opt">-k</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para><command>smbclient</command> is a client that can
'talk' to an SMB/CIFS server. It offers an interface
- similar to that of the ftp program (see <citerefentry><refentrytitle>ftp</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>).
+ similar to that of the ftp program (see <command>ftp(1)</command>).
Operations include things like getting files from the server
to the local machine, putting files from the local machine to
the server, retrieving directory information from the server
@@ -85,9 +81,7 @@
<para>The server name is looked up according to either
the <parameter>-R</parameter> parameter to <command>smbclient</command> or
- using the name resolve order parameter in
- the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file,
+ using the name resolve order parameter in the <filename>smb.conf</filename> file,
allowing an administrator to change the order and methods
by which server names are looked up. </para></listitem>
</varlistentry>
@@ -118,6 +112,21 @@
</varlistentry>
<varlistentry>
+ <term>-s smb.conf</term>
+ <listitem><para>Specifies the location of the all important
+ <filename>smb.conf</filename> file. </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-O socket options</term>
+ <listitem><para>TCP socket options to set on the client
+ socket. See the socket options parameter in the <filename>
+ smb.conf (5)</filename> manpage for the list of valid
+ options. </para></listitem>
+ </varlistentry>
+
+
+ <varlistentry>
<term>-R &lt;name resolve order&gt;</term>
<listitem><para>This option is used by the programs in the Samba
suite to determine what naming services and in what order to resolve
@@ -125,51 +134,44 @@
string of different name resolution options.</para>
<para>The options are :"lmhosts", "host", "wins" and "bcast". They
- cause names to be resolved as follows:</para>
+ cause names to be resolved as follows :</para>
<itemizedlist>
- <listitem><para><constant>lmhosts</constant>: Lookup an IP
+ <listitem><para><constant>lmhosts</constant> : Lookup an IP
address in the Samba lmhosts file. If the line in lmhosts has
- no name type attached to the NetBIOS name (see
- the <citerefentry><refentrytitle>lmhosts</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> for details) then
- any name type matches for lookup.</para>
- </listitem>
-
- <listitem><para><constant>host</constant>: Do a standard host
+ no name type attached to the NetBIOS name (see the <ulink
+ url="lmhosts.5.html">lmhosts(5)</ulink> for details) then
+ any name type matches for lookup.</para></listitem>
+
+ <listitem><para><constant>host</constant> : Do a standard host
name to IP address resolution, using the system <filename>/etc/hosts
</filename>, NIS, or DNS lookups. This method of name resolution
is operating system dependent, for instance on IRIX or Solaris this
may be controlled by the <filename>/etc/nsswitch.conf</filename>
file). Note that this method is only used if the NetBIOS name
type being queried is the 0x20 (server) name type, otherwise
- it is ignored.</para>
- </listitem>
-
- <listitem><para><constant>wins</constant>: Query a name with
+ it is ignored.</para></listitem>
+
+ <listitem><para><constant>wins</constant> : Query a name with
the IP address listed in the <parameter>wins server</parameter>
parameter. If no WINS server has
- been specified this method will be ignored.</para>
- </listitem>
-
- <listitem><para><constant>bcast</constant>: Do a broadcast on
+ been specified this method will be ignored.</para></listitem>
+
+ <listitem><para><constant>bcast</constant> : Do a broadcast on
each of the known local interfaces listed in the
<parameter>interfaces</parameter>
parameter. This is the least reliable of the name resolution
methods as it depends on the target host being on a locally
- connected subnet.</para>
- </listitem>
+ connected subnet.</para></listitem>
</itemizedlist>
<para>If this parameter is not set then the name resolve order
- defined in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file parameter
+ defined in the <filename>smb.conf</filename> file parameter
(name resolve order) will be used. </para>
<para>The default order is lmhosts, host, wins, bcast and without
this parameter or any entry in the <parameter>name resolve order
- </parameter> parameter of the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file the name resolution
+ </parameter> parameter of the <filename>smb.conf</filename> file the name resolution
methods will be attempted in this order. </para></listitem>
</varlistentry>
@@ -200,8 +202,8 @@
<parameter>-I</parameter> options useful, as they allow you to
control the FROM and TO parts of the message. </para>
- <para>See the <parameter>message command</parameter> parameter in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> for a description of how to handle incoming
+ <para>See the message command parameter in the <filename>
+ smb.conf(5)</filename> for a description of how to handle incoming
WinPopup messages in Samba. </para>
<para><emphasis>Note</emphasis>: Copy WinPopup into the startup group
@@ -210,6 +212,70 @@
</varlistentry>
<varlistentry>
+ <term>-i scope</term>
+ <listitem><para>This specifies a NetBIOS scope that smbclient will
+ use to communicate with when generating NetBIOS names. For details
+ on the use of NetBIOS scopes, see <filename>rfc1001.txt</filename>
+ and <filename>rfc1002.txt</filename>.
+ NetBIOS scopes are <emphasis>very</emphasis> rarely used, only set
+ this parameter if you are the system administrator in charge of all
+ the NetBIOS systems you communicate with. </para></listitem>
+ </varlistentry>
+
+
+ <varlistentry>
+ <term>-N</term>
+ <listitem><para>If specified, this parameter suppresses the normal
+ password prompt from the client to the user. This is useful when
+ accessing a service that does not require a password. </para>
+
+ <para>Unless a password is specified on the command line or
+ this parameter is specified, the client will request a
+ password.</para></listitem>
+ </varlistentry>
+
+
+
+ <varlistentry>
+ <term>-n NetBIOS name</term>
+ <listitem><para>By default, the client will use the local
+ machine's hostname (in uppercase) as its NetBIOS name. This parameter
+ allows you to override the host name and use whatever NetBIOS
+ name you wish. </para></listitem>
+ </varlistentry>
+
+
+ <varlistentry>
+ <term>-d debuglevel</term>
+ <listitem><para><replaceable>debuglevel</replaceable> is an integer from 0 to 10, or
+ the letter 'A'. </para>
+
+ <para>The default value if this parameter is not specified
+ is zero. </para>
+
+ <para>The higher this value, the more detail will be logged to
+ the log files about the activities of the
+ client. At level 0, only critical errors and serious warnings will
+ be logged. Level 1 is a reasonable level for day to day running -
+ it generates a small amount of information about operations
+ carried out. </para>
+
+ <para>Levels above 1 will generate considerable amounts of log
+ data, and should only be used when investigating a problem.
+ Levels above 3 are designed for use only by developers and
+ generate HUGE amounts of log data, most of which is extremely
+ cryptic. If <replaceable>debuglevel</replaceable> is set to the letter 'A', then <emphasis>all
+ </emphasis> debug messages will be printed. This setting
+ is for developers only (and people who <emphasis>really</emphasis> want
+ to know how the code works internally). </para>
+
+ <para>Note that specifying this parameter here will override
+ the log level parameter in the <filename>smb.conf (5)</filename>
+ file. </para></listitem>
+ </varlistentry>
+
+
+ <varlistentry>
<term>-p port</term>
<listitem><para>This number is the TCP port number that will be used
when making connections to the server. The standard (well-known)
@@ -235,7 +301,13 @@
</varlistentry>
- &stdarg.help;
+
+ <varlistentry>
+ <term>-h</term><listitem>
+ <para>Print the usage message for the client. </para></listitem>
+ </varlistentry>
+
+
<varlistentry>
<term>-I IP-address</term>
@@ -269,6 +341,59 @@
<varlistentry>
+ <term>-U username[%pass]</term>
+ <listitem><para>Sets the SMB username or username and password.
+ If %pass is not specified, The user will be prompted. The client
+ will first check the <envar>USER</envar> environment variable, then the
+ <envar>LOGNAME</envar> variable and if either exists, the
+ string is uppercased. Anything in these variables following a '%'
+ sign will be treated as the password. If these environment
+ variables are not found, the username <constant>GUEST</constant>
+ is used. </para>
+
+ <para>If the password is not included in these environment
+ variables (using the %pass syntax), <command>smbclient</command> will look for
+ a <envar>PASSWD</envar> environment variable from which
+ to read the password. </para>
+
+ <para>A third option is to use a credentials file which
+ 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
+ on the file restrict access from unwanted users. See the
+ <parameter>-A</parameter> for more details. </para>
+
+ <para>Be cautious about including passwords in scripts or in
+ the <envar>PASSWD</envar> environment variable. Also, on
+ many systems the command line of a running process may be seen
+ via the <command>ps</command> command to be safe always allow
+ <command>smbclient</command> to prompt for a password and type
+ it in directly. </para></listitem>
+ </varlistentry>
+
+
+ <varlistentry>
+ <term>-A filename</term><listitem><para>This option allows
+ 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
+ </para>
+
+ <para><programlisting>
+username = &lt;value&gt;
+password = &lt;value&gt;
+domain = &lt;value&gt;
+ </programlisting></para>
+
+
+ <para>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. </para></listitem>
+ </varlistentry>
+
+
+
+ <varlistentry>
<term>-L</term>
<listitem><para>This option allows you to look at what services
are available on a server. You use it as <command>smbclient -L
@@ -305,9 +430,16 @@
</para></listitem>
</varlistentry>
- &popt.common.samba;
- &popt.common.credentials;
- &popt.common.connection;
+
+
+ <varlistentry>
+ <term>-W WORKGROUP</term>
+ <listitem><para>Override the default workgroup (domain) specified
+ in the workgroup parameter of the <filename>smb.conf</filename>
+ file for this connection. This may be needed to connect to some
+ servers. </para></listitem>
+ </varlistentry>
+
<varlistentry>
<term>-T tar options</term>
@@ -387,7 +519,7 @@
<para><emphasis>Tar Filenames</emphasis></para>
- <para>All file names can be given as DOS path names (with '\\'
+ <para>All file names can be given as DOS path names (with '\'
as the component separator) or as UNIX path names (with '/' as
the component separator). </para>
@@ -455,7 +587,7 @@
<para><prompt>smb:\&gt; </prompt></para>
- <para>The backslash ("\\") indicates the current working directory
+ <para>The backslash ("\") indicates the current working directory
on the server, and will change if the current working directory
is changed. </para>
@@ -908,8 +1040,8 @@
and writeable only by the user. </para>
<para>To test the client, you will need to know the name of a
- running SMB/CIFS server. It is possible to run <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> as an ordinary user - running that server as a daemon
+ running SMB/CIFS server. It is possible to run <command>smbd(8)
+ </command> as an ordinary user - running that server as a daemon
on a user-accessible port (typically any port number over 1024)
would provide a suitable test server. </para>
</refsect1>
@@ -931,7 +1063,8 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 2.2 of the Samba suite.</para>
+ <para>This man page is correct for version 2.2 of
+ the Samba suite.</para>
</refsect1>
@@ -945,11 +1078,11 @@
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 for Samba 3.0
- was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/smbcontrol.1.sgml b/docs/docbook/manpages/smbcontrol.1.sgml
index c118a7b194..166ef63e87 100644
--- a/docs/docbook/manpages/smbcontrol.1.sgml
+++ b/docs/docbook/manpages/smbcontrol.1.sgml
@@ -1,7 +1,5 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-<refentry id="smbcontrol.1">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="smbcontrol">
<refmeta>
<refentrytitle>smbcontrol</refentrytitle>
@@ -18,7 +16,6 @@
<cmdsynopsis>
<command>smbcontrol</command>
<arg>-i</arg>
- <arg>-s</arg>
</cmdsynopsis>
<cmdsynopsis>
@@ -32,14 +29,14 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para><command>smbcontrol</command> is a very small program, which
- sends messages to a <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, a <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, or a <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> daemon running on the system.</para>
+ sends messages to an <ulink url="smbd.8.html">smbd(8)</ulink>,
+ an <ulink url="nmbd.8.html">nmbd(8)</ulink>
+ or a <ulink url="winbindd.8.html">winbindd(8)</ulink>
+ daemon running on the system.</para>
</refsect1>
@@ -47,8 +44,6 @@
<title>OPTIONS</title>
<variablelist>
- &stdarg.help;
- &stdarg.configfile;
<varlistentry>
<term>-i</term>
<listitem><para>Run interactively. Individual commands
@@ -59,7 +54,8 @@
<varlistentry>
<term>destination</term>
- <listitem><para>One of <parameter>nmbd</parameter>, <parameter>smbd</parameter> or a process ID.</para>
+ <listitem><para>One of <parameter>nmbd</parameter>
+ <parameter>smbd</parameter> or a process ID.</para>
<para>The <parameter>smbd</parameter> destination causes the
message to "broadcast" to all smbd daemons.</para>
@@ -75,12 +71,107 @@
<varlistentry>
<term>message-type</term>
- <listitem><para>Type of message to send. See
- the section <constant>MESSAGE-TYPES</constant> for details.
- </para></listitem></varlistentry>
-
+ <listitem><para>One of: <constant>close-share</constant>,
+ <constant>debug</constant>,
+ <constant>force-election</constant>, <constant>ping
+ </constant>, <constant>profile</constant>, <constant>
+ debuglevel</constant>, <constant>profilelevel</constant>,
+ or <constant>printnotify</constant>.</para>
+
+ <para>The <constant>close-share</constant> message-type sends a
+ message to smbd which will then close the client connections to
+ the named share. Note that this doesn't affect client connections
+ to any other shares. This message-type takes an argument of the
+ share name for which client connections will be closed, or the
+ "*" character which will close all currently open shares.
+ This may be useful if you made changes to the access controls on the share.
+ This message can only be sent to <constant>smbd</constant>.</para>
+
+ <para>The <constant>debug</constant> message-type allows
+ the debug level to be set to the value specified by the
+ parameter. This can be sent to any of the destinations.</para>
+
+ <para>The <constant>force-election</constant> message-type can only be
+ sent to the <constant>nmbd</constant> destination. This message
+ causes the <command>nmbd</command> daemon to force a new browse
+ master election.</para>
+
+ <para>The <constant>ping</constant> message-type sends the
+ number of "ping" messages specified by the parameter and waits
+ for the same number of reply "pong" messages. This can be sent to
+ any of the destinations.</para>
+
+ <para>The <constant>profile</constant> message-type sends a
+ message to an smbd to change the profile settings based on the
+ parameter. The parameter can be "on" to turn on profile stats
+ collection, "off" to turn off profile stats collection, "count"
+ to enable only collection of count stats (time stats are
+ disabled), and "flush" to zero the current profile stats. This can
+ be sent to any smbd or nmbd destinations.</para>
+
+ <para>The <constant>debuglevel</constant> message-type sends
+ a "request debug level" message. The current debug level setting
+ is returned by a "debuglevel" message. This can be
+ sent to any of the destinations.</para>
+
+ <para>The <constant>profilelevel</constant> message-type sends
+ a "request profile level" message. The current profile level
+ setting is returned by a "profilelevel" message. This can be sent
+ to any smbd or nmbd destinations.</para>
+
+ <para>The <constant>printnotify</constant> message-type sends a
+ message to smbd which in turn sends a printer notify message to
+ any Windows NT clients connected to a printer. This message-type
+ takes the following arguments:
+
+ <variablelist>
+
+ <varlistentry>
+ <term>queuepause printername</term>
+ <listitem><para>Send a queue pause change notify
+ message to the printer specified.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>queueresume printername</term>
+ <listitem><para>Send a queue resume change notify
+ message for the printer specified.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>jobpause printername unixjobid</term>
+ <listitem><para>Send a job pause change notify
+ message for the printer and unix jobid
+ specified.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>jobresume printername unixjobid</term>
+ <listitem><para>Send a job resume change notify
+ message for the printer and unix jobid
+ specified.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>jobdelete printername unixjobid</term>
+ <listitem><para>Send a job delete change notify
+ message for the printer and unix jobid
+ specified.</para></listitem>
+ </varlistentry>
+
+ </variablelist>
+
+ Note that this message only sends notification that an
+ event has occured. It doesn't actually cause the
+ event to happen.
+
+ This message can only be sent to <constant>smbd</constant>.
+ </para>
+
+ </listitem>
+ </varlistentry>
+
-
<varlistentry>
<term>parameters</term>
<listitem><para>any parameters required for the message-type</para>
@@ -91,181 +182,17 @@
</refsect1>
<refsect1>
- <title>MESSAGE-TYPES</title>
-
- <para>Available message types are:</para>
-
- <variablelist>
- <varlistentry><term>close-share</term>
- <listitem><para>Order smbd to close the client
- connections to the named share. Note that this doesn't affect client
- connections to any other shares. This message-type takes an argument of the
- share name for which client connections will be closed, or the
- "*" character which will close all currently open shares.
- This may be useful if you made changes to the access controls on the share.
- This message can only be sent to <constant>smbd</constant>.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>debug</term>
- <listitem><para>Set debug level to the value specified by the
- parameter. This can be sent to any of the destinations.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>force-election</term>
- <listitem><para>This message causes the <command>nmbd</command> daemon to
- force a new browse master election. </para>
- </listitem></varlistentry>
-
- <varlistentry>
- <term>ping</term>
- <listitem><para>
- Send specified number of "ping" messages and
- wait for the same number of reply "pong" messages. This can be sent to
- any of the destinations.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>profile</term>
- <listitem><para>Change profile settings of a daemon, based on the
- parameter. The parameter can be "on" to turn on profile stats
- collection, "off" to turn off profile stats collection, "count"
- to enable only collection of count stats (time stats are
- disabled), and "flush" to zero the current profile stats. This can
- be sent to any smbd or nmbd destinations.</para>
- </listitem></varlistentry>
-
- <varlistentry>
- <term>debuglevel</term>
- <listitem><para>
- Request debuglevel of a certain daemon and write it to stdout. This
- can be sent to any of the destinations.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>profilelevel</term>
- <listitem><para>
- Request profilelevel of a certain daemon and write it to stdout.
- This can be sent to any smbd or nmbd destinations.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>printnotify</term>
- <listitem><para>
- Order smbd to send a printer notify message to any Windows NT clients
- connected to a printer. This message-type takes the following arguments:
- </para>
-
- <variablelist>
-
- <varlistentry>
- <term>queuepause printername</term>
- <listitem><para>Send a queue pause change notify
- message to the printer specified.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>queueresume printername</term>
- <listitem><para>Send a queue resume change notify
- message for the printer specified.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>jobpause printername unixjobid</term>
- <listitem><para>Send a job pause change notify
- message for the printer and unix jobid
- specified.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>jobresume printername unixjobid</term>
- <listitem><para>Send a job resume change notify
- message for the printer and unix jobid
- specified.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>jobdelete printername unixjobid</term>
- <listitem><para>Send a job delete change notify
- message for the printer and unix jobid
- specified.</para></listitem>
- </varlistentry>
- </variablelist>
-
- <para>
- Note that this message only sends notification that an
- event has occured. It doesn't actually cause the
- event to happen.
- </para>
-
- <para>This message can only be sent to <constant>smbd</constant>. </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>samsync</term>
- <listitem><para>Order smbd to synchronise sam database from PDC (being BDC). Can only be sent to <constant>smbd</constant>. </para>
- <note><para>Not working at the moment</para></note>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>samrepl</term>
- <listitem><para>Send sam replication message, with specified serial. Can only be sent to <constant>smbd</constant>. Should not be used manually.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>dmalloc-mark</term>
- <listitem><para>Set a mark for dmalloc. Can be sent to both smbd and nmbd. Only available if samba is built with dmalloc support. </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>dmalloc-log-changed</term>
- <listitem><para>
- Dump the pointers that have changed since the mark set by dmalloc-mark.
- Can be sent to both smbd and nmbd. Only available if samba is built with dmalloc support. </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>shutdown</term>
- <listitem><para>Shut down specified daemon. Can be sent to both smbd and nmbd.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>pool-usage</term>
- <listitem><para>Print a human-readable description of all
- talloc(pool) memory usage by the specified daemon/process. Available
- for both smbd and nmbd.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>drvupgrade</term>
- <listitem><para>Force clients of printers using specified driver
- to update their local version of the driver. Can only be
- sent to smbd.</para></listitem>
- </varlistentry>
-
-</variablelist>
-</refsect1>
-
-<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3.0 of
+ <para>This man page is correct for version 2.2 of
the Samba suite.</para>
</refsect1>
<refsect1>
<title>SEE ALSO</title>
- <para><citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> and <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>.</para>
+ <para><ulink url="nmbd.8.html"><command>nmbd(8)</command></ulink>,
+ and <ulink url="smbd.8.html"><command>smbd(8)</command></ulink>.
+ </para>
</refsect1>
<refsect1>
@@ -278,11 +205,11 @@
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 for
- Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/smbcquotas.1.sgml b/docs/docbook/manpages/smbcquotas.1.sgml
deleted file mode 100644
index a69312f9d7..0000000000
--- a/docs/docbook/manpages/smbcquotas.1.sgml
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-<refentry id="smbcquotas.1">
-
-<refmeta>
- <refentrytitle>smbcquotas</refentrytitle>
- <manvolnum>1</manvolnum>
-</refmeta>
-
-
-<refnamediv>
- <refname>smbcquotas</refname>
- <refpurpose>Set or get QUOTAs of NTFS 5 shares</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
- <cmdsynopsis>
- <command>smbcquotas</command>
- <arg choice="req">//server/share</arg>
- <arg choice="opt">-u user</arg>
- <arg choice="opt">-L</arg>
- <arg choice="opt">-F</arg>
- <arg choice="opt">-S QUOTA_SET_COMMAND</arg>
- <arg choice="opt">-n</arg>
- <arg choice="opt">-t</arg>
- <arg choice="opt">-v</arg>
-
- <arg choice="opt">-d debuglevel</arg>
- <arg choice="opt">-s configfile</arg>
- <arg choice="opt">-l logfilebase</arg>
- <arg choice="opt">-V</arg>
-
- <arg choice="opt">-U username</arg>
- <arg choice="opt">-N</arg>
- <arg choice="opt">-k</arg>
- <arg choice="opt">-A</arg>
-
-
- </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
- <title>DESCRIPTION</title>
-
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
-
- <para>The <command>smbcquotas</command> program manipulates NT Quotas on SMB file shares. </para>
-</refsect1>
-
-
-<refsect1>
- <title>OPTIONS</title>
-
- <para>The following options are available to the <command>smbcquotas</command> program. </para>
-
-
- <variablelist>
- <varlistentry>
- <term>-u user</term>
- <listitem><para> Specifies the user of whom the quotas are get or set.
- By default the current user's username will be used.</para></listitem>
- </varlistentry>
-
-
-
- <varlistentry>
- <term>-L</term>
- <listitem><para>Lists all quota records of the share.</para></listitem>
- </varlistentry>
-
-
-
- <varlistentry>
- <term>-F</term>
- <listitem><para>Show the share quota status and default limits.</para></listitem>
- </varlistentry>
-
-
-
- <varlistentry>
- <term>-S QUOTA_SET_COMMAND</term>
- <listitem><para>This command set/modify quotas for a user or on the share,
- depending on the QUOTA_SET_COMMAND parameter witch is described later</para></listitem>
- </varlistentry>
-
-
- <varlistentry>
- <term>-n</term>
- <listitem><para>This option displays all QUOTA information in numeric
- format. The default is to convert SIDs to names and QUOTA limits
- to a readable string format. </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-t</term>
- <listitem><para>
- Don't actually do anything, only validate the correctness of
- the arguments.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-v</term>
- <listitem><para>
- Be verbose.
- </para></listitem>
- </varlistentry>
-
- &stdarg.help;
- &popt.common.samba;
- &popt.common.credentials;
- </variablelist>
-</refsect1>
-
-
-<refsect1>
- <title>QUOTA_SET_COMAND</title>
-
- <para>The format of an ACL is one or more ACL entries separated by
- either commas or newlines. An ACL entry is one of the following: </para>
-
- <para>
- for user setting quotas for the specified by -u or the current username:
- </para>
-
- <para><userinput>
- UQLIM:&lt;username&gt;&lt;softlimit&gt;&lt;hardlimit&gt;
- </userinput></para>
-
- <para>
- for setting the share quota defaults limits:
- </para>
-
- <para><userinput>
- FSQLIM:&lt;softlimit&gt;&lt;hardlimit&gt;
- </userinput></para>
-
- <para>
- for changing the share quota settings:
- </para>
-
- <para><userinput>
- FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT
- </userinput></para>
-
-<refsect1>
- <title>EXIT STATUS</title>
-
- <para>The <command>smbcquotas</command> program sets the exit status
- depending on the success or otherwise of the operations performed.
- The exit status may be one of the following values. </para>
-
- <para>If the operation succeeded, smbcquotas returns an exit
- status of 0. If <command>smbcquotas</command> couldn't connect to the specified server,
- or when there was an error getting or setting the quota(s), an exit status
- of 1 is returned. If there was an error parsing any command line
- arguments, an exit status of 2 is returned. </para>
-</refsect1>
-
-<refsect1>
- <title>VERSION</title>
-
- <para>This man page is correct for version 3.0 of the Samba suite.</para>
-</refsect1>
-
-<refsect1>
- <title>AUTHOR</title>
-
- <para>The original Samba software and related utilities
- were created by Andrew Tridgell. Samba is now developed
- by the Samba Team as an Open Source project similar
- to the way the Linux kernel is developed.</para>
-
- <para><command>smbcacls</command> was written by Stefan Metzmacher.</para>
-</refsect1>
-
-</refentry>
diff --git a/docs/docbook/manpages/smbd.8.sgml b/docs/docbook/manpages/smbd.8.sgml
index b31d919a12..9fb80901be 100644
--- a/docs/docbook/manpages/smbd.8.sgml
+++ b/docs/docbook/manpages/smbd.8.sgml
@@ -1,7 +1,5 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-<refentry id="smbd.8">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="smbd">
<refmeta>
<refentrytitle>smbd</refentrytitle>
@@ -34,8 +32,7 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This program is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This program is part of the Samba suite.</para>
<para><command>smbd</command> is the server daemon that
provides filesharing and printing services to Windows clients.
@@ -49,14 +46,15 @@
<para>An extensive description of the services that the
server can provide is given in the man page for the
configuration file controlling the attributes of those
- services (see <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>. This man page will not describe the
+ services (see <ulink url="smb.conf.5.html"><filename>smb.conf(5)
+ </filename></ulink>. This man page will not describe the
services, but will concentrate on the administrative aspects
of running the server.</para>
<para>Please note that there are significant security
- implications to running this server, and the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> manual page should be regarded as mandatory reading before
+ implications to running this server, and the <ulink
+ url="smb.conf.5.html"><filename>smb.conf(5)</filename></ulink>
+ manpage should be regarded as mandatory reading before
proceeding with installation.</para>
<para>A session is created whenever a client requests one.
@@ -124,8 +122,17 @@
</para></listitem>
</varlistentry>
- &popt.common.samba;
- &stdarg.help;
+ <varlistentry>
+ <term>-h</term>
+ <listitem><para>Prints the help information (usage)
+ for <command>smbd</command>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-V</term>
+ <listitem><para>Prints the version number for
+ <command>smbd</command>.</para></listitem>
+ </varlistentry>
<varlistentry>
<term>-b</term>
@@ -134,6 +141,32 @@
</varlistentry>
<varlistentry>
+ <term>-d &lt;debug level&gt;</term>
+ <listitem><para><replaceable>debuglevel</replaceable> is an integer
+ from 0 to 10. The default value if this parameter is
+ not specified is zero.</para>
+
+ <para>The higher this value, the more detail will be
+ logged to the log files about the activities of the
+ server. At level 0, only critical errors and serious
+ warnings will be logged. Level 1 is a reasonable level for
+ day to day running - it generates a small amount of
+ information about operations carried out.</para>
+
+ <para>Levels above 1 will generate considerable
+ amounts of log data, and should only be used when
+ investigating a problem. Levels above 3 are designed for
+ use only by developers and generate HUGE amounts of log
+ data, most of which is extremely cryptic.</para>
+
+ <para>Note that specifying this parameter here will
+ override the <ulink url="smb.conf.5.html#loglevel">log
+ level</ulink> parameter in the <ulink url="smb.conf.5.html">
+ <filename>smb.conf(5)</filename></ulink> file.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-l &lt;log directory&gt;</term>
<listitem><para>If specified,
<replaceable>log directory</replaceable>
@@ -142,9 +175,9 @@
messages from the running server. The log
file generated is never removed by the server although
its size may be controlled by the <ulink
- url="smb.conf.5.html#maxlogsize"><parameter>max log size</parameter></ulink>
- option in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file. <emphasis>Beware:</emphasis>
+ url="smb.conf.5.html#maxlogsize">max log size</ulink>
+ option in the <ulink url="smb.conf.5.html"><filename>
+ smb.conf(5)</filename></ulink> file. <emphasis>Beware:</emphasis>
If the directory specified does not exist, <command>smbd</command>
will log to the default debug log location defined at compile time.
</para>
@@ -154,6 +187,14 @@
</varlistentry>
<varlistentry>
+ <term>-O &lt;socket options&gt;</term>
+ <listitem><para>See the <ulink
+ url="smb.conf.5.html#socketoptions">socket options</ulink>
+ parameter in the <ulink url="smb.conf.5.html"><filename>smb.conf(5)
+ </filename></ulink> file for details.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-p &lt;port number&gt;</term>
<listitem><para><replaceable>port number</replaceable> is a positive integer
value. The default value if this parameter is not
@@ -177,6 +218,19 @@
<para>This parameter is not normally specified except
in the above situation.</para></listitem>
</varlistentry>
+
+ <varlistentry>
+ <term>-s &lt;configuration file&gt;</term>
+ <listitem><para>The file specified contains the
+ configuration details required by the server. The
+ information in this file includes server-specific
+ information such as what printcap file to use, as well
+ as descriptions of all the services that the server is
+ to provide. See <ulink url="smb.conf.5.html"><filename>
+ smb.conf(5)</filename></ulink> for more information.
+ The default configuration file name is determined at
+ compile time.</para></listitem>
+ </varlistentry>
</variablelist>
</refsect1>
@@ -189,7 +243,7 @@
<listitem><para>If the server is to be run by the
<command>inetd</command> meta-daemon, this file
must contain suitable startup information for the
- meta-daemon. See the <ulink url="install.html">"How to Install and Test SAMBA"</ulink>
+ meta-daemon. See the <ulink url="UNIX_INSTALL.html">UNIX_INSTALL.html</ulink>
document for details.
</para></listitem>
</varlistentry>
@@ -201,7 +255,7 @@
<para>If running the server as a daemon at startup,
this file will need to contain an appropriate startup
- sequence for the server. See the <ulink url="install.html">"How to Install and Test SAMBA"</ulink>
+ sequence for the server. See the <ulink url="UNIX_INSTALL.html">UNIX_INSTALL.html</ulink>
document for details.</para></listitem>
</varlistentry>
@@ -211,20 +265,21 @@
meta-daemon <command>inetd</command>, this file
must contain a mapping of service name (e.g., netbios-ssn)
to service port (e.g., 139) and protocol type (e.g., tcp).
- See the <ulink url="install.html">"How to Install and Test SAMBA"</ulink>
+ See the <ulink url="UNIX_INSTALL.html">UNIX_INSTALL.html</ulink>
document for details.</para></listitem>
</varlistentry>
<varlistentry>
<term><filename>/usr/local/samba/lib/smb.conf</filename></term>
- <listitem><para>This is the default location of the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> server configuration file. Other common places that systems
+ <listitem><para>This is the default location of the
+ <ulink url="smb.conf.5.html"><filename>smb.conf</filename></ulink>
+ server configuration file. Other common places that systems
install this file are <filename>/usr/samba/lib/smb.conf</filename>
- and <filename>/etc/samba/smb.conf</filename>.</para>
+ and <filename>/etc/smb.conf</filename>.</para>
<para>This file describes all the services the server
- is to make available to clients. See <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> for more information.</para>
+ is to make available to clients. See <ulink url="smb.conf.5.html">
+ <filename>smb.conf(5)</filename></ulink> for more information.</para>
</listitem>
</varlistentry>
</variablelist>
@@ -262,9 +317,9 @@
<para>Samba uses PAM for authentication (when presented with a plaintext
password), for account checking (is this account disabled?) and for
session management. The degree too which samba supports PAM is restricted
- by the limitations of the SMB protocol and the <ulink url="smb.conf.5.html#OBEYPAMRESRICTIONS"><parameter>obey
- pam restricions</parameter></ulink> <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> paramater. When this is set, the following restrictions apply:
+ by the limitations of the SMB protocol and the
+ <ulink url="smb.conf.5.html#OBEYPAMRESRICTIONS">obey pam restricions</ulink>
+ smb.conf paramater. When this is set, the following restrictions apply:
</para>
<itemizedlist>
@@ -324,9 +379,9 @@
it to die on its own.</para>
<para>The debug log level of <command>smbd</command> may be raised
- or lowered using <citerefentry><refentrytitle>smbcontrol</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry> program (SIGUSR[1|2] signals are no longer
- used since Samba 2.2). This is to allow transient problems to be diagnosed,
+ or lowered using <ulink url="smbcontrol.1.html"><command>smbcontrol(1)
+ </command></ulink> program (SIGUSR[1|2] signals are no longer used in
+ Samba 2.2). This is to allow transient problems to be diagnosed,
whilst still running at a normally low log level.</para>
<para>Note that as the signal handlers send a debug write,
@@ -339,15 +394,14 @@
<refsect1>
<title>SEE ALSO</title>
- <para><citerefentry><refentrytitle>hosts_access</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>inetd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry>, and the
- Internet RFC's <filename>rfc1001.txt</filename>, <filename>rfc1002.txt</filename>.
+ <para>hosts_access(5), <command>inetd(8)</command>,
+ <ulink url="nmbd.8.html"><command>nmbd(8)</command></ulink>,
+ <ulink url="smb.conf.5.html"><filename>smb.conf(5)</filename>
+ </ulink>, <ulink url="smbclient.1.html"><command>smbclient(1)
+ </command></ulink>, <ulink url="testparm.1.html"><command>
+ testparm(1)</command></ulink>, <ulink url="testprns.1.html">
+ <command>testprns(1)</command></ulink>, and the Internet RFC's
+ <filename>rfc1001.txt</filename>, <filename>rfc1002.txt</filename>.
In addition the CIFS (formerly SMB) specification is available
as a link from the Web page <ulink url="http://samba.org/cifs/">
http://samba.org/cifs/</ulink>.</para>
@@ -363,11 +417,11 @@
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 for
- Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/smbmnt.8.sgml b/docs/docbook/manpages/smbmnt.8.sgml
index 8c07ed2eb4..55b66d5d25 100644
--- a/docs/docbook/manpages/smbmnt.8.sgml
+++ b/docs/docbook/manpages/smbmnt.8.sgml
@@ -1,7 +1,5 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-<refentry id="smbmnt.8">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="smbmnt">
<refmeta>
<refentrytitle>smbmnt</refentrytitle>
@@ -25,7 +23,6 @@
<arg choice="opt">-f &lt;mask&gt;</arg>
<arg choice="opt">-d &lt;mask&gt;</arg>
<arg choice="opt">-o &lt;options&gt;</arg>
- <arg choice="opt">-h</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -41,8 +38,8 @@
by the user, and that the user has write permission on.</para>
<para>The <command>smbmnt</command> program is normally invoked
- by <citerefentry><refentrytitle>smbmount</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>. It should not be invoked directly by users. </para>
+ by <ulink url="smbmount.8.html"><command>smbmount(8)</command>
+ </ulink>. It should not be invoked directly by users. </para>
<para>smbmount searches the normal PATH for smbmnt. You must ensure
that the smbmnt version in your path matches the smbmount used.</para>
@@ -91,8 +88,6 @@
</para></listitem>
</varlistentry>
- &stdarg.help;
-
</variablelist>
</refsect1>
@@ -112,8 +107,7 @@
</para>
<para>The conversion of this manpage for Samba 2.2 was performed
- by Gerald Carter. The conversion to DocBook XML 4.2 for Samba 3.0
- was done by Alexander Bokovoy.</para>
+ by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/smbmount.8.sgml b/docs/docbook/manpages/smbmount.8.sgml
index 12f64c7354..c4b91a5572 100644
--- a/docs/docbook/manpages/smbmount.8.sgml
+++ b/docs/docbook/manpages/smbmount.8.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="smbmount.8">
+<refentry id="smbmount">
<refmeta>
<refentrytitle>smbmount</refentrytitle>
@@ -26,8 +26,7 @@
<para><command>smbmount</command> mounts a Linux SMB filesystem. It
is usually invoked as <command>mount.smbfs</command> by
- the <citerefentry><refentrytitle>mount</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> command when using the
+ the <command>mount(8)</command> command when using the
"-t smbfs" option. This command only works in Linux, and the kernel must
support the smbfs filesystem. </para>
@@ -40,12 +39,11 @@
<para><command>smbmount</command> is a daemon. After mounting it keeps running until
the mounted smbfs is umounted. It will log things that happen
when in daemon mode using the "machine name" smbmount, so
- typically this output will end up in <filename>log.smbmount</filename>. The <command>
- smbmount</command> process may also be called mount.smbfs.</para>
+ typically this output will end up in <filename>log.smbmount</filename>. The
+ <command>smbmount</command> process may also be called mount.smbfs.</para>
<para><emphasis>NOTE:</emphasis> <command>smbmount</command>
- calls <citerefentry><refentrytitle>smbmnt</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> to do the actual mount. You
+ calls <command>smbmnt(8)</command> to do the actual mount. You
must make sure that <command>smbmnt</command> is in the path so
that it can be found. </para>
@@ -86,12 +84,15 @@
<varlistentry>
<term>credentials=&lt;filename&gt;</term>
- <listitem><para>specifies a file that contains a username and/or password.
-The format of the file is:
-<programlisting>
-username = &lt;value&gt;
-password = &lt;value&gt;
-</programlisting></para>
+ <listitem><para>specifies a file that contains a username
+ and/or password. The format of the file is:</para>
+
+ <para>
+ <programlisting>
+ username = &lt;value&gt;
+ password = &lt;value&gt;
+ </programlisting>
+ </para>
<para>This is preferred over having passwords in plaintext in a
shared file, such as <filename>/etc/fstab</filename>. Be sure to protect any
@@ -100,11 +101,6 @@ password = &lt;value&gt;
</varlistentry>
<varlistentry>
- <term>krb</term>
- <listitem><para>Use kerberos (Active Directory). </para></listitem>
- </varlistentry>
-
- <varlistentry>
<term>netbiosname=&lt;arg&gt;</term>
<listitem><para>sets the source NetBIOS name. It defaults
to the local hostname. </para></listitem>
@@ -145,7 +141,7 @@ password = &lt;value&gt;
<varlistentry>
<term>dmask=&lt;arg&gt;</term>
- <listitem><para>Sets the directory mask. This determines the
+ <listitem><para>sets the directory mask. This determines the
permissions that remote directories have in the local filesystem.
The default is based on the current umask. </para></listitem>
</varlistentry>
@@ -153,7 +149,7 @@ password = &lt;value&gt;
<varlistentry>
<term>debug=&lt;arg&gt;</term>
- <listitem><para>Sets the debug level. This is useful for
+ <listitem><para>sets the debug level. This is useful for
tracking down SMB connection problems. A suggested value to
start with is 4. If set too high there will be a lot of
output, possibly hiding the useful output.</para></listitem>
@@ -162,7 +158,7 @@ password = &lt;value&gt;
<varlistentry>
<term>ip=&lt;arg&gt;</term>
- <listitem><para>Sets the destination host or IP address.
+ <listitem><para>sets the destination host or IP address.
</para></listitem>
</varlistentry>
@@ -170,30 +166,31 @@ password = &lt;value&gt;
<varlistentry>
<term>workgroup=&lt;arg&gt;</term>
- <listitem><para>Sets the workgroup on the destination </para>
+ <listitem><para>sets the workgroup on the destination </para>
</listitem>
</varlistentry>
<varlistentry>
<term>sockopt=&lt;arg&gt;</term>
- <listitem><para>Sets the TCP socket options. See the <ulink
- url="smb.conf.5.html#SOCKETOPTIONS"><citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry></ulink> <parameter>socket options</parameter> option.
+ <listitem><para>sets the TCP socket options. See the <ulink
+ url="smb.conf.5.html#SOCKETOPTIONS"><filename>smb.conf
+ </filename></ulink> <parameter>socket options</parameter> option.
</para></listitem>
</varlistentry>
<varlistentry>
<term>scope=&lt;arg&gt;</term>
- <listitem><para>Sets the NetBIOS scope </para></listitem>
+ <listitem><para>sets the NetBIOS scope </para></listitem>
</varlistentry>
<varlistentry>
<term>guest</term>
- <listitem><para>Don't prompt for a password </para></listitem>
+ <listitem><para>don't prompt for a password </para></listitem>
</varlistentry>
+
<varlistentry>
<term>ro</term>
<listitem><para>mount read-only </para></listitem>
@@ -301,9 +298,10 @@ password = &lt;value&gt;
<para>FreeBSD also has a smbfs, but it is not related to smbmount</para>
- <para>For Solaris, HP-UX and others you may want to look at <citerefentry><refentrytitle>smbsh</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry> or at other solutions, such as
- Sharity or perhaps replacing the SMB server with a NFS server.</para>
+ <para>For Solaris, HP-UX and others you may want to look at
+ <ulink url="smbsh.1.html"><command>smbsh(1)</command></ulink> or at other
+ solutions, such as sharity or perhaps replacing the SMB server with
+ a NFS server.</para>
</refsect1>
@@ -323,8 +321,7 @@ password = &lt;value&gt;
</para>
<para>The conversion of this manpage for Samba 2.2 was performed
- by Gerald Carter. The conversion to DocBook XML 4.2 for Samba 3.0
- was done by Alexander Bokovoy.</para>
+ by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/smbpasswd.5.sgml b/docs/docbook/manpages/smbpasswd.5.sgml
index f78e986bef..5c80ac4c06 100644
--- a/docs/docbook/manpages/smbpasswd.5.sgml
+++ b/docs/docbook/manpages/smbpasswd.5.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="smbpasswd.5">
+<refentry id="smbpasswd">
<refmeta>
<refentrytitle>smbpasswd</refentrytitle>
@@ -19,8 +19,8 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para>smbpasswd is the Samba encrypted password file. It contains
the username, Unix user id and the SMB hashed passwords of the
@@ -122,7 +122,7 @@
the attributes of the users account. In the Samba 2.2 release
this field is bracketed by '[' and ']' characters and is always
13 characters in length (including the '[' and ']' characters).
- The contents of this field may be any of the following characters:
+ The contents of this field may be any of the characters.
</para>
<itemizedlist>
@@ -136,11 +136,12 @@
Password Hash and NT Password Hash are ignored). Note that this
will only allow users to log on with no password if the <parameter>
null passwords</parameter> parameter is set in the <ulink
- url="smb.conf.5.html#NULLPASSWORDS"><citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry></ulink> config file. </para></listitem>
+ url="smb.conf.5.html#NULLPASSWORDS"><filename>smb.conf(5)
+ </filename></ulink> config file. </para></listitem>
<listitem><para><emphasis>D</emphasis> - This means the account
- is disabled and no SMB/CIFS logins will be allowed for this user. </para></listitem>
+ is disabled and no SMB/CIFS logins will be allowed for
+ this user. </para></listitem>
<listitem><para><emphasis>W</emphasis> - This means this account
is a "Workstation Trust" account. This kind of account is used
@@ -177,9 +178,8 @@
<refsect1>
<title>SEE ALSO</title>
- <para><citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry>, and
+ <para><ulink url="smbpasswd.8.html"><command>smbpasswd(8)</command></ulink>,
+ <ulink url="samba.7.html">samba(7)</ulink>, and
the Internet RFC1321 for details on the MD4 algorithm.
</para>
</refsect1>
@@ -194,11 +194,11 @@
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2
- for Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/smbpasswd.8.sgml b/docs/docbook/manpages/smbpasswd.8.sgml
index 5d475cf08c..8e6d925ae0 100644
--- a/docs/docbook/manpages/smbpasswd.8.sgml
+++ b/docs/docbook/manpages/smbpasswd.8.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="smbpasswd.8">
+<refentry id="smbpasswd">
<refmeta>
<refentrytitle>smbpasswd</refentrytitle>
@@ -37,27 +37,25 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para>The smbpasswd program has several different
- functions, depending on whether it is run by the <emphasis>root</emphasis> user
- or not. When run as a normal user it allows the user to change
+ functions, depending on whether it is run by the <emphasis>root</emphasis>
+ user or not. When run as a normal user it allows the user to change
the password used for their SMB sessions on any machines that store
SMB passwords. </para>
<para>By default (when run with no arguments) it will attempt to
change the current user's SMB password on the local machine. This is
- similar to the way the <command>passwd(1)</command> program works. <command>
- smbpasswd</command> differs from how the passwd program works
+ similar to the way the <command>passwd(1)</command> program works.
+ <command>smbpasswd</command> differs from how the passwd program works
however in that it is not <emphasis>setuid root</emphasis> but works in
- a client-server mode and communicates with a
- locally running <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>. As a consequence in order for this to
+ a client-server mode and communicates with a locally running
+ <command>smbd(8)</command>. As a consequence in order for this to
succeed the smbd daemon must be running on the local machine. On a
UNIX machine the encrypted SMB passwords are usually stored in
- the <citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file. </para>
+ the <filename>smbpasswd(5)</filename> file. </para>
<para>When run by an ordinary user with no options, smbpasswd
will prompt them for their old SMB password and then ask them
@@ -69,13 +67,12 @@
<para>smbpasswd can also be used by a normal user to change their
SMB password on remote machines, such as Windows NT Primary Domain
- Controllers. See the (<parameter>-r</parameter>) and <parameter>-U</parameter> options
- below. </para>
+ Controllers. See the (-r) and -U options below. </para>
<para>When run by root, smbpasswd allows new users to be added
and deleted in the smbpasswd file, as well as allows changes to
- the attributes of the user in this file to be made. When run by root, <command>
- smbpasswd</command> accesses the local smbpasswd file
+ the attributes of the user in this file to be made. When run by root,
+ <command>smbpasswd</command> accesses the local smbpasswd file
directly, thus enabling changes to be made even if smbd is not
running. </para>
</refsect1>
@@ -124,8 +121,8 @@
<para>If the smbpasswd file is in the 'old' format (pre-Samba 2.0
format) there is no space in the user's password entry to write
- this information and the command will FAIL. See <citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> for details on the 'old' and new password file formats.
+ this information and the command will FAIL. See <command>smbpasswd(5)
+ </command> for details on the 'old' and new password file formats.
</para>
<para>This option is only available when running smbpasswd as
@@ -143,8 +140,7 @@
<para>If the smbpasswd file is in the 'old' format, then <command>
smbpasswd</command> will FAIL to enable the account.
- See <citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> for
+ See <command>smbpasswd (5)</command> for
details on the 'old' and new password file formats. </para>
<para>This option is only available when running smbpasswd as root.
@@ -230,15 +226,15 @@
name of the host being connected to. </para>
<para>The options are :"lmhosts", "host", "wins" and "bcast". They
- cause names to be resolved as follows: </para>
+ cause names to be resolved as follows : </para>
<itemizedlist>
- <listitem><para><constant>lmhosts</constant>: Lookup an IP
+ <listitem><para><constant>lmhosts</constant> : Lookup an IP
address in the Samba lmhosts file. If the line in lmhosts has
- no name type attached to the NetBIOS name (see the <citerefentry><refentrytitle>lmhosts</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> for details) then
+ no name type attached to the NetBIOS name (see the <ulink
+ url="lmhosts.5.html">lmhosts(5)</ulink> for details) then
any name type matches for lookup.</para></listitem>
- <listitem><para><constant>host</constant>: Do a standard host
+ <listitem><para><constant>host</constant> : Do a standard host
name to IP address resolution, using the system <filename>/etc/hosts
</filename>, NIS, or DNS lookups. This method of name resolution
is operating system depended for instance on IRIX or Solaris this
@@ -247,12 +243,12 @@
type being queried is the 0x20 (server) name type, otherwise
it is ignored.</para></listitem>
- <listitem><para><constant>wins</constant>: Query a name with
+ <listitem><para><constant>wins</constant> : Query a name with
the IP address listed in the <parameter>wins server</parameter>
parameter. If no WINS server has been specified this method
will be ignored.</para></listitem>
- <listitem><para><constant>bcast</constant>: Do a broadcast on
+ <listitem><para><constant>bcast</constant> : Do a broadcast on
each of the known local interfaces listed in the
<parameter>interfaces</parameter> parameter. This is the least
reliable of the name resolution methods as it depends on the
@@ -260,8 +256,8 @@
</itemizedlist>
<para>The default order is <command>lmhosts, host, wins, bcast</command>
- and without this parameter or any entry in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file the name resolution methods will
+ and without this parameter or any entry in the
+ <filename>smb.conf</filename> file the name resolution methods will
be attempted in this order. </para></listitem>
</varlistentry>
@@ -296,6 +292,7 @@
</varlistentry>
+
<varlistentry>
<term>-s</term>
<listitem><para>This option causes smbpasswd to be silent (i.e.
@@ -315,7 +312,7 @@
switch is used to specify the password to be used with the
<ulink url="smb.conf.5.html#LDAPADMINDN"><parameter>ldap admin
dn</parameter></ulink>. Note that the password is stored in
- the <filename>secrets.tdb</filename> and is keyed off
+ the <filename>private/secrets.tdb</filename> and is keyed off
of the admin's DN. This means that if the value of <parameter>ldap
admin dn</parameter> ever changes, the password will need to be
manually updated as well.
@@ -358,15 +355,14 @@
mode communicating with a local smbd for a non-root user then
the smbd daemon must be running for this to work. A common problem
is to add a restriction to the hosts that may access the <command>
- smbd</command> running on the local machine by specifying either <parameter>allow
- hosts</parameter> or <parameter>deny hosts</parameter> entry in
- the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file and neglecting to
+ smbd</command> running on the local machine by specifying a
+ <parameter>allow hosts</parameter> or <parameter>deny hosts</parameter>
+ entry in the <filename>smb.conf</filename> file and neglecting to
allow "localhost" access to the smbd. </para>
<para>In addition, the smbpasswd command is only useful if Samba
- has been set up to use encrypted passwords. See the document <ulink url="pwencrypt.html">
- "LanMan and NT Password Encryption in Samba"</ulink> in the docs directory for details
+ has been set up to use encrypted passwords. See the file
+ <filename>ENCRYPTION.txt</filename> in the docs directory for details
on how to do this. </para>
</refsect1>
@@ -374,14 +370,15 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3.0 of the Samba suite.</para>
+ <para>This man page is correct for version 3.0 of
+ the Samba suite.</para>
</refsect1>
<refsect1>
<title>SEE ALSO</title>
- <para><citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry>.</para>
+ <para><ulink url="smbpasswd.5.html"><filename>smbpasswd(5)</filename></ulink>,
+ <ulink url="samba.7.html">samba(7)</ulink>
+ </para>
</refsect1>
<refsect1>
@@ -394,11 +391,11 @@
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2
- for Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/smbsh.1.sgml b/docs/docbook/manpages/smbsh.1.sgml
index f51b5eb34f..c40609be4f 100644
--- a/docs/docbook/manpages/smbsh.1.sgml
+++ b/docs/docbook/manpages/smbsh.1.sgml
@@ -1,7 +1,5 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-<refentry id="smbsh.1">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="smbsh">
<refmeta>
<refentrytitle>smbsh</refentrytitle>
@@ -31,8 +29,8 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para><command>smbsh</command> allows you to access an NT filesystem
using UNIX commands such as <command>ls</command>, <command>
@@ -48,8 +46,7 @@
<varlistentry>
<term>-W WORKGROUP</term>
<listitem><para>Override the default workgroup specified in the
- workgroup parameter of the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file
+ workgroup parameter of the <filename>smb.conf</filename> file
for this session. This may be needed to connect to some
servers. </para></listitem>
</varlistentry>
@@ -64,17 +61,91 @@
</varlistentry>
<varlistentry>
- <term>-P prefix</term>
- <listitem><para>This option allows
+ <term>-P prefix</term><listitem><para>This option allows
the user to set the directory prefix for SMB access. The
default value if this option is not specified is
<emphasis>smb</emphasis>.
</para></listitem>
</varlistentry>
- &stdarg.configfile;
- &stdarg.debug;
- &stdarg.resolve.order;
+ <varlistentry>
+ <term>-R &lt;name resolve order&gt;</term>
+ <listitem><para>This option is used to determine what naming
+ services and in what order to resolve
+ host names to IP addresses. The option takes a space-separated
+ string of different name resolution options.</para>
+
+ <para>The options are :"lmhosts", "host", "wins" and "bcast".
+ They cause names to be resolved as follows :</para>
+
+ <itemizedlist>
+ <listitem><para><constant>lmhosts</constant> :
+ Lookup an IP address in the Samba lmhosts file. If the
+ line in lmhosts has no name type attached to the
+ NetBIOS name
+ (see the <ulink url="lmhosts.5.html">lmhosts(5)</ulink>
+ for details) then any name type matches for lookup.
+ </para></listitem>
+
+ <listitem><para><constant>host</constant> :
+ Do a standard host name to IP address resolution, using
+ the system <filename>/etc/hosts</filename>, NIS, or DNS
+ lookups. This method of name resolution is operating
+ system dependent, for instance on IRIX or Solaris this
+ may be controlled by the <filename>/etc/nsswitch.conf
+ </filename> file). Note that this method is only used
+ if the NetBIOS name type being queried is the 0x20
+ (server) name type, otherwise it is ignored.
+ </para></listitem>
+
+ <listitem><para><constant>wins</constant> :
+ Query a name with the IP address listed in the
+ <parameter>wins server</parameter> parameter. If no
+ WINS server has been specified this method will be
+ ignored.
+ </para></listitem>
+
+ <listitem><para><constant>bcast</constant> :
+ Do a broadcast on each of the known local interfaces
+ listed in the <parameter>interfaces</parameter>
+ parameter. This is the least reliable of the name
+ resolution methods as it depends on the target host
+ being on a locally connected subnet.
+ </para></listitem>
+ </itemizedlist>
+
+ <para>If this parameter is not set then the name resolve order
+ defined in the <filename>smb.conf</filename> file parameter
+ (name resolve order) will be used. </para>
+
+ <para>The default order is lmhosts, host, wins, bcast. Without
+ this parameter or any entry in the <parameter>name resolve order
+ </parameter> parameter of the <filename>smb.conf</filename>
+ file, the name resolution methods will be attempted in this
+ order. </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-d &lt;debug level&gt;</term>
+ <listitem><para>debug level is an integer from 0 to 10.</para>
+
+ <para>The default value if this parameter is not specified
+ is zero.</para>
+
+ <para>The higher this value, the more detail will be logged
+ about the activities of <command>nmblookup</command>. At level
+ 0, only critical errors and serious warnings will be logged.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-l logfilename</term>
+ <listitem><para>If specified causes all debug messages to be
+ written to the file specified by <replaceable>logfilename
+ </replaceable>. If not specified then all messages will be
+ written to<replaceable>stderr</replaceable>.
+ </para></listitem>
+ </varlistentry>
<varlistentry>
<term>-L libdir</term>
@@ -93,12 +164,13 @@
<para>To use the <command>smbsh</command> command, execute <command>
smbsh</command> from the prompt and enter the username and password
that authenticates you to the machine running the Windows NT
- operating system.
-<programlisting>
-<prompt>system% </prompt><userinput>smbsh</userinput>
-<prompt>Username: </prompt><userinput>user</userinput>
-<prompt>Password: </prompt><userinput>XXXXXXX</userinput>
-</programlisting></para>
+ operating system.</para>
+
+ <para><programlisting>
+ <prompt>system% </prompt><userinput>smbsh</userinput>
+ <prompt>Username: </prompt><userinput>user</userinput>
+ <prompt>Password: </prompt><userinput>XXXXXXX</userinput>
+ </programlisting></para>
<para>Any dynamically linked command you execute from
@@ -116,7 +188,8 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3.0 of the Samba suite.</para>
+ <para>This man page is correct for version 3.0 of
+ the Samba suite.</para>
</refsect1>
<refsect1>
@@ -137,9 +210,9 @@
<refsect1>
<title>SEE ALSO</title>
- <para><citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry></para>
+ <para><ulink url="smbd.8.html"><command>smbd(8)</command></ulink>,
+ <ulink url="smb.conf.5.html">smb.conf(5)</ulink>
+ </para>
</refsect1>
<refsect1>
@@ -152,11 +225,11 @@
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2
- for Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/smbspool.8.sgml b/docs/docbook/manpages/smbspool.8.sgml
index dabdcced01..d164cb0864 100644
--- a/docs/docbook/manpages/smbspool.8.sgml
+++ b/docs/docbook/manpages/smbspool.8.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="smbspool.8">
+<refentry id="smbspool">
<refmeta>
<refentrytitle>smbspool</refentrytitle>
@@ -15,20 +15,20 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>smbspool</command>
- <arg choice="req">job</arg>
- <arg choice="req">user</arg>
- <arg choice="req">title</arg>
- <arg choice="req">copies</arg>
- <arg choice="req">options</arg>
- <arg choice="opt">filename</arg>
+ <arg>job</arg>
+ <arg>user</arg>
+ <arg>title</arg>
+ <arg>copies</arg>
+ <arg>options</arg>
+ <arg>filename</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para>smbspool is a very small print spooling program that
sends a print file to an SMB printer. The command-line arguments
@@ -45,8 +45,10 @@
<itemizedlist>
<listitem><para>smb://server/printer</para></listitem>
<listitem><para>smb://workgroup/server/printer</para></listitem>
- <listitem><para>smb://username:password@server/printer</para></listitem>
- <listitem><para>smb://username:password@workgroup/server/printer</para></listitem>
+ <listitem><para>smb://username:password@server/printer</para>
+ </listitem>
+ <listitem><para>smb://username:password@workgroup/server/printer
+ </para></listitem>
</itemizedlist>
<para>smbspool tries to get the URI from argv[0]. If argv[0]
@@ -95,14 +97,15 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3.0 of the Samba suite.</para>
+ <para>This man page is correct for version 2.2 of
+ the Samba suite.</para>
</refsect1>
<refsect1>
<title>SEE ALSO</title>
- <para><citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> and <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry>.</para>
+ <para><ulink url="smbd.8.html"><command>smbd(8)</command></ulink>,
+ and <ulink url="samba.7.html">samba(7)</ulink>.
+ </para>
</refsect1>
<refsect1>
@@ -118,11 +121,11 @@
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2
- for Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/smbstatus.1.sgml b/docs/docbook/manpages/smbstatus.1.sgml
index 98f7e864f6..99963a4bec 100644
--- a/docs/docbook/manpages/smbstatus.1.sgml
+++ b/docs/docbook/manpages/smbstatus.1.sgml
@@ -1,8 +1,5 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-
-<refentry id="smbstatus.1">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="smbstatus">
<refmeta>
<refentrytitle>smbstatus</refentrytitle>
@@ -34,8 +31,8 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para><command>smbstatus</command> is a very simple program to
list the current Samba connections.</para>
@@ -57,7 +54,13 @@
<listitem><para>gives brief output.</para></listitem>
</varlistentry>
- &popt.common.samba;
+
+ <varlistentry>
+ <term>-d|--debug=&lt;debuglevel&gt;</term>
+ <listitem><para>sets debugging to specified level</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term>-v|--verbose</term>
@@ -81,8 +84,8 @@
<varlistentry>
<term>-p|--processes</term>
- <listitem><para>print a list of <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> processes and exit.
+ <listitem><para>print a list of <ulink url="smbd.8.html">
+ <command>smbd(8)</command></ulink> processes and exit.
Useful for scripting.</para></listitem>
</varlistentry>
@@ -93,7 +96,18 @@
</listitem>
</varlistentry>
- &stdarg.help;
+
+
+ <varlistentry>
+ <term>-s|--conf=&lt;configuration file&gt;</term>
+ <listitem><para>The default configuration file name is
+ determined at compile time. The file specified contains the
+ configuration details required by the server. See <ulink
+ url="smb.conf.5.html"><filename>smb.conf(5)</filename>
+ </ulink> for more information.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term>-u|--user=&lt;username&gt;</term>
@@ -114,9 +128,8 @@
<refsect1>
<title>SEE ALSO</title>
- <para><citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> and <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>.</para>
+ <para><ulink url="smbd.8.html"><command>smbd(8)</command></ulink> and
+ <ulink url="smb.conf.5.html">smb.conf(5)</ulink>.</para>
</refsect1>
<refsect1>
@@ -129,11 +142,11 @@
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2
- for Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/smbtar.1.sgml b/docs/docbook/manpages/smbtar.1.sgml
index 0492a3a574..bd70493b6b 100644
--- a/docs/docbook/manpages/smbtar.1.sgml
+++ b/docs/docbook/manpages/smbtar.1.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="smbtar.1">
+<refentry id="smbtar">
<refmeta>
<refentrytitle>smbtar</refentrytitle>
@@ -16,20 +16,20 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>smbtar</command>
- <arg choice="opt">-r</arg>
- <arg choice="opt">-i</arg>
- <arg choice="opt">-a</arg>
- <arg choice="opt">-v</arg>
<arg choice="req">-s server</arg>
<arg choice="opt">-p password</arg>
<arg choice="opt">-x services</arg>
<arg choice="opt">-X</arg>
- <arg choice="opt">-N filename</arg>
- <arg choice="opt">-b blocksize</arg>
<arg choice="opt">-d directory</arg>
- <arg choice="opt">-l loglevel</arg>
<arg choice="opt">-u user</arg>
<arg choice="opt">-t tape</arg>
+ <arg choice="opt">-t tape</arg>
+ <arg choice="opt">-b blocksize</arg>
+ <arg choice="opt">-N filename</arg>
+ <arg choice="opt">-i</arg>
+ <arg choice="opt">-r</arg>
+ <arg choice="opt">-l loglevel</arg>
+ <arg choice="opt">-v</arg>
<arg choice="req">filenames</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -37,12 +37,12 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para><command>smbtar</command> is a very small shell script on top
- of <citerefentry><refentrytitle>smbclient</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry> which dumps SMB shares directly to tape.</para>
+ of <ulink url="smbclient.1.html"><command>smbclient(1)</command></ulink>
+ which dumps SMB shares directly to tape. </para>
</refsect1>
<refsect1>
@@ -100,11 +100,6 @@
</varlistentry>
- <varlistentry>
- <term>-a</term>
- <listitem><para>Reset DOS archive bit mode to
- indicate file has been archived. </para></listitem>
- </varlistentry>
<varlistentry>
<term>-t tape</term>
@@ -149,9 +144,8 @@
<varlistentry>
<term>-l log level</term>
<listitem><para>Log (debug) level. Corresponds to the
- <parameter>-d</parameter> flag of <citerefentry>
- <refentrytitle>smbclient</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry>.</para></listitem>
+ <parameter>-d</parameter> flag of <command>smbclient(1)
+ </command>. </para></listitem>
</varlistentry>
</variablelist>
</refsect1>
@@ -187,9 +181,9 @@
<refsect1>
<title>DIAGNOSTICS</title>
- <para>See the <emphasis>DIAGNOSTICS</emphasis> section for the <citerefentry>
- <refentrytitle>smbclient</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry> command.</para>
+ <para>See the <emphasis>DIAGNOSTICS</emphasis> section for the
+ <ulink url="smbclient.1.html"><command>smbclient(1)</command>
+ </ulink> command.</para>
</refsect1>
@@ -202,11 +196,10 @@
<refsect1>
<title>SEE ALSO</title>
- <para><citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry>
- <refentrytitle>smbclient</refentrytitle><manvolnum>1</manvolnum>
- </citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>.</para>
+ <para><ulink url="smbd.8.html"><command>smbd(8)</command></ulink>,
+ <ulink url="smbclient.1.html"><command>smbclient(1)</command></ulink>,
+ <ulink url="smb.conf.5.html">smb.conf(5)</ulink>,
+ </para>
</refsect1>
<refsect1>
@@ -223,11 +216,11 @@
url="mailto:Martin.Kraemer@mch.sni.de">Martin Kraemer</ulink>. Many
thanks to everyone who suggested extensions, improvements, bug
fixes, etc. The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 for
- Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter.</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/smbtree.1.sgml b/docs/docbook/manpages/smbtree.1.sgml
deleted file mode 100644
index 3677695d5a..0000000000
--- a/docs/docbook/manpages/smbtree.1.sgml
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-<refentry id="smbtree.1">
-
-<refmeta>
- <refentrytitle>smbtree</refentrytitle>
- <manvolnum>1</manvolnum>
-</refmeta>
-
-
-<refnamediv>
- <refname>smbtree</refname>
- <refpurpose>A text based smb network browser
- </refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
- <cmdsynopsis>
- <command>smbtree</command>
- <arg choice="opt">-b</arg>
- <arg choice="opt">-D</arg>
- <arg choice="opt">-S</arg>
- </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
- <title>DESCRIPTION</title>
-
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
-
- <para><command>smbtree</command> is a smb browser program
- in text mode. It is similar to the "Network Neighborhood" found
- on Windows computers. It prints a tree with all
- the known domains, the servers in those domains and
- the shares on the servers.
- </para>
-</refsect1>
-
-
-<refsect1>
- <title>OPTIONS</title>
-
- <variablelist>
- <varlistentry>
- <term>-b</term>
- <listitem><para>Query network nodes by sending requests
- as broadcasts instead of querying the (domain) master browser.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-D</term>
- <listitem><para>Only print a list of all
- the domains known on broadcast or by the
- master browser</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-S</term>
- <listitem><para>Only print a list of
- all the domains and servers responding on broadcast or
- known by the master browser.
- </para></listitem>
- </varlistentry>
-
- &popt.common.samba;
- &popt.common.credentials;
- &stdarg.help;
-
- </variablelist>
-</refsect1>
-
-<refsect1>
- <title>VERSION</title>
-
- <para>This man page is correct for version 3.0 of the Samba
- suite.</para>
-</refsect1>
-
-<refsect1>
- <title>AUTHOR</title>
-
- <para>The original Samba software and related utilities
- were created by Andrew Tridgell. Samba is now developed
- by the Samba Team as an Open Source project similar
- to the way the Linux kernel is developed.</para>
-
- <para>The smbtree man page was written by Jelmer Vernooij. </para>
-</refsect1>
-
-</refentry>
diff --git a/docs/docbook/manpages/smbumount.8.sgml b/docs/docbook/manpages/smbumount.8.sgml
index 089ede79ea..d6a1b65b57 100644
--- a/docs/docbook/manpages/smbumount.8.sgml
+++ b/docs/docbook/manpages/smbumount.8.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="smbumount.8">
+<refentry id="smbumount">
<refmeta>
<refentrytitle>smbumount</refentrytitle>
@@ -47,8 +47,8 @@
<refsect1>
<title>SEE ALSO</title>
- <para><citerefentry><refentrytitle>smbmount</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></para>
+ <para><ulink url="smbmount.8.html"><command>smbmount(8)</command>
+ </ulink></para>
</refsect1>
@@ -67,8 +67,7 @@
</para>
<para>The conversion of this manpage for Samba 2.2 was performed
- by Gerald Carter. The conversion to DocBook XML 4.2 for Samba 3.0
- was done by Alexander Bokovoy.</para>
+ by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/swat.8.sgml b/docs/docbook/manpages/swat.8.sgml
index 72b3cd65c8..c0052f3d53 100644
--- a/docs/docbook/manpages/swat.8.sgml
+++ b/docs/docbook/manpages/swat.8.sgml
@@ -1,7 +1,5 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-<refentry id="swat.8">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="swat">
<refmeta>
<refentrytitle>swat</refentrytitle>
@@ -25,13 +23,13 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para><command>swat</command> allows a Samba administrator to
- configure the complex <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file via a Web browser. In addition,
+ configure the complex <ulink url="smb.conf.5.html"><filename>
+ smb.conf(5)</filename></ulink> file via a Web browser. In addition,
a <command>swat</command> configuration page has help links
to all the configurable options in the <filename>smb.conf</filename> file allowing an
administrator to easily look up the effects of any change. </para>
@@ -48,9 +46,8 @@
<term>-s smb configuration file</term>
<listitem><para>The default configuration file path is
determined at compile time. The file specified contains
- the configuration details required by the <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> server. This is the file
- that <command>swat</command> will modify.
+ the configuration details required by the <command>smbd
+ </command> server. This is the file that <command>swat</command> will modify.
The information in this file includes server-specific
information such as what printcap file to use, as well as
descriptions of all the services that the server is to provide.
@@ -68,10 +65,6 @@
<para><emphasis>WARNING: Do NOT enable this option on a production
server. </emphasis></para></listitem>
</varlistentry>
-
- &popt.common.samba;
- &stdarg.help;
-
</variablelist>
</refsect1>
@@ -80,12 +73,6 @@
<title>INSTALLATION</title>
- <para>Swat is included as binary package with most distributions. The
- package manager in this case takes care of the installation and
- configuration. This section is only for those who have compiled
- swat from scratch.
- </para>
-
<para>After you compile SWAT you need to run <command>make install
</command> to install the <command>swat</command> binary
and the various help files and images. A default install would put
@@ -109,7 +96,7 @@
<para><command>swat 901/tcp</command></para>
- <para>Note for NIS/YP and LDAP users - you may need to rebuild the
+ <para>Note for NIS/YP users - you may need to rebuild the
NIS service maps rather than alter your local <filename>
/etc/services</filename> file. </para>
@@ -133,19 +120,17 @@
</refsect2>
+ <refsect2>
+ <title>Launching</title>
-</refsect1>
-
-<refsect1>
- <title>LAUNCHING</title>
-
- <para>To launch SWAT just run your favorite web browser and
- point it at "http://localhost:901/".</para>
+ <para>To launch SWAT just run your favorite web browser and
+ point it at "http://localhost:901/".</para>
- <para>Note that you can attach to SWAT from any IP connected
- machine but connecting from a remote machine leaves your
- connection open to password sniffing as passwords will be sent
- in the clear over the wire. </para>
+ <para>Note that you can attach to SWAT from any IP connected
+ machine but connecting from a remote machine leaves your
+ connection open to password sniffing as passwords will be sent
+ in the clear over the wire. </para>
+ </refsect2>
</refsect1>
<refsect1>
@@ -167,9 +152,8 @@
<varlistentry>
<term><filename>/usr/local/samba/lib/smb.conf</filename></term>
- <listitem><para>This is the default location of the <citerefentry>
- <refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry> server configuration file that swat edits. Other
+ <listitem><para>This is the default location of the <filename>smb.conf(5)
+ </filename> server configuration file that swat edits. Other
common places that systems install this file are <filename>
/usr/samba/lib/smb.conf</filename> and <filename>/etc/smb.conf
</filename>. This file describes all the services the server
@@ -182,9 +166,8 @@
<refsect1>
<title>WARNINGS</title>
- <para><command>swat</command> will rewrite your <citerefentry>
- <refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry> file. It will rearrange the entries and delete all
+ <para><command>swat</command> will rewrite your <filename>smb.conf
+ </filename> file. It will rearrange the entries and delete all
comments, <parameter>include=</parameter> and <parameter>copy=
</parameter> options. If you have a carefully crafted <filename>
smb.conf</filename> then back it up or don't use swat! </para>
@@ -194,15 +177,16 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3.0 of the Samba suite.</para>
+ <para>This man page is correct for version 2.2 of
+ the Samba suite.</para>
</refsect1>
<refsect1>
<title>SEE ALSO</title>
- <para><command>inetd(5)</command>, <citerefentry>
- <refentrytitle>smbd</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry></para>
+ <para><command>inetd(5)</command>,
+ <ulink url="smbd.8.html"><command>smbd(8)</command></ulink>,
+ <ulink url="smb.conf.5.html">smb.conf(5)</ulink>
+ </para>
</refsect1>
<refsect1>
@@ -215,11 +199,11 @@
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 for
- Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/testparm.1.sgml b/docs/docbook/manpages/testparm.1.sgml
index 31a9549416..f34528a43d 100644
--- a/docs/docbook/manpages/testparm.1.sgml
+++ b/docs/docbook/manpages/testparm.1.sgml
@@ -1,7 +1,5 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-<refentry id="testparm.1">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="testparm">
<refmeta>
<refentrytitle>testparm</refentrytitle>
@@ -31,12 +29,11 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para><command>testparm</command> is a very simple test program
- to check an <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> configuration file for
+ to check an <command>smbd</command> configuration file for
internal correctness. If this program reports no problems, you
can use the configuration file with confidence that <command>smbd
</command> will successfully load the configuration file.</para>
@@ -67,9 +64,13 @@
will prompt for a carriage return after printing the service
names and before dumping the service definitions.</para></listitem>
</varlistentry>
-
- &stdarg.help;
- &stdarg.version;
+
+
+ <varlistentry>
+ <term>-h</term>
+ <listitem><para>Print usage message </para></listitem>
+ </varlistentry>
+
<varlistentry>
<term>-L servername</term>
@@ -81,9 +82,9 @@
<varlistentry>
<term>-v</term>
<listitem><para>If this option is specified, testparm
- will also output all options that were not used in <citerefentry>
- <refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry> and are thus set to their defaults.</para></listitem>
+ will also output all options that were not used in
+ <filename>smb.conf</filename> and are thus set to
+ their defaults.</para></listitem>
</varlistentry>
<varlistentry>
@@ -97,8 +98,7 @@
<term>configfilename</term>
<listitem><para>This is the name of the configuration file
to check. If this parameter is not present then the
- default <citerefentry><refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry> file will be checked.
+ default <filename>smb.conf</filename> file will be checked.
</para></listitem>
</varlistentry>
@@ -108,9 +108,7 @@
<listitem><para>If this parameter and the following are
specified, then <command>testparm</command> will examine the <parameter>hosts
allow</parameter> and <parameter>hosts deny</parameter>
- parameters in the <citerefentry>
- <refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry> file to
+ parameters in the <filename>smb.conf</filename> file to
determine if the hostname with this IP address would be
allowed access to the <command>smbd</command> server. If
this parameter is supplied, the hostIP parameter must also
@@ -132,11 +130,9 @@
<variablelist>
<varlistentry>
- <term><citerefentry><refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry></term>
+ <term><filename>smb.conf</filename></term>
<listitem><para>This is usually the name of the configuration
- file used by <citerefentry><refentrytitle>smbd</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry>.
+ file used by <command>smbd</command>.
</para></listitem>
</varlistentry>
</variablelist>
@@ -162,11 +158,9 @@
<refsect1>
<title>SEE ALSO</title>
- <para><citerefentry>
- <refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry>, <citerefentry>
- <refentrytitle>smbd</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry></para>
+ <para><ulink url="smb.conf.5.html"><filename>smb.conf(5)</filename></ulink>,
+ <ulink url="smbd.8.html"><command>smbd(8)</command></ulink>
+ </para>
</refsect1>
<refsect1>
@@ -179,11 +173,11 @@
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2
- for Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/testprns.1.sgml b/docs/docbook/manpages/testprns.1.sgml
index 3ff1d85055..cd99494a9a 100644
--- a/docs/docbook/manpages/testprns.1.sgml
+++ b/docs/docbook/manpages/testprns.1.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="testprns.1">
+<refentry id="testprns">
<refmeta>
<refentrytitle>testprns</refentrytitle>
@@ -23,13 +23,13 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para><command>testprns</command> is a very simple test program
to determine whether a given printer name is valid for use in
- a service to be provided by <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>.</para>
+ a service to be provided by <ulink url="smbd.8.html"><command>
+ smbd(8)</command></ulink>. </para>
<para>"Valid" in this context means "can be found in the
printcap specified". This program is very stupid - so stupid in
@@ -54,9 +54,8 @@
done beyond that required to extract the printer name. It may
be that the print spooling system is more forgiving or less
forgiving than <command>testprns</command>. However, if
- <command>testprns</command> finds the printer then <citerefentry>
- <refentrytitle>smbd</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry> should do so as well. </para></listitem>
+ <command>testprns</command> finds the printer then
+ <command>smbd</command> should do so as well. </para></listitem>
</varlistentry>
<varlistentry>
@@ -111,16 +110,16 @@
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3.0 of
+ <para>This man page is correct for version 2.2 of
the Samba suite.</para>
</refsect1>
<refsect1>
<title>SEE ALSO</title>
<para><filename>printcap(5)</filename>,
- <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
- <manvolnum>1</manvolnum></citerefentry></para>
+ <ulink url="smbd.8.html"><command>smbd(8)</command></ulink>,
+ <ulink url="smbclient.1.html"><command>smbclient(1)</command></ulink>
+ </para>
</refsect1>
<refsect1>
@@ -133,11 +132,11 @@
<para>The original Samba man pages were written by Karl Auer.
The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+ excellent piece of Open Source software, available at
+ <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2
- for Samba 3.0 was done by Alexander Bokovoy.</para>
+ Samba 2.2 was done by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/vfstest.1.sgml b/docs/docbook/manpages/vfstest.1.sgml
index 8be9271679..d6c7e5f142 100644
--- a/docs/docbook/manpages/vfstest.1.sgml
+++ b/docs/docbook/manpages/vfstest.1.sgml
@@ -1,7 +1,8 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
]>
-<refentry id="vfstest.1">
+
+<refentry id="vfstest">
<refmeta>
<refentrytitle>vfstest</refentrytitle>
@@ -27,8 +28,8 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para><command>vfstest</command> is a small command line
utility that has the ability to test dso samba VFS modules. It gives the
@@ -50,6 +51,7 @@
</para> </listitem>
</varlistentry>
+ &stdarg.debuglevel;
&stdarg.help;
<varlistentry>
@@ -60,8 +62,6 @@
</para></listitem>
</varlistentry>
- &popt.common.samba;
-
</variablelist>
</refsect1>
diff --git a/docs/docbook/manpages/wbinfo.1.sgml b/docs/docbook/manpages/wbinfo.1.sgml
index 2e9a811bcb..a6ca244243 100644
--- a/docs/docbook/manpages/wbinfo.1.sgml
+++ b/docs/docbook/manpages/wbinfo.1.sgml
@@ -1,7 +1,5 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-<refentry id="wbinfo.1">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="wbinfo">
<refmeta>
<refentrytitle>wbinfo</refentrytitle>
@@ -19,8 +17,8 @@
<command>wbinfo</command>
<arg choice="opt">-u</arg>
<arg choice="opt">-g</arg>
+ <arg choice="opt">-i ip</arg>
<arg choice="opt">-N netbios-name</arg>
- <arg choice="opt">-I ip</arg>
<arg choice="opt">-n name</arg>
<arg choice="opt">-s sid</arg>
<arg choice="opt">-U uid</arg>
@@ -29,11 +27,9 @@
<arg choice="opt">-Y sid</arg>
<arg choice="opt">-t</arg>
<arg choice="opt">-m</arg>
- <arg choice="opt">--sequence</arg>
<arg choice="opt">-r user</arg>
<arg choice="opt">-a user%password</arg>
<arg choice="opt">-A user%password</arg>
- <arg choice="opt">--get-auth-user</arg>
<arg choice="opt">-p</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -41,15 +37,14 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This tool is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This tool is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para>The <command>wbinfo</command> program queries and returns information
- created and used by the <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> daemon. </para>
+ created and used by the <ulink url="winbindd.8.html"><command>
+ winbindd(8)</command></ulink> daemon. </para>
- <para>The <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> daemon must be configured
+ <para>The <command>winbindd(8)</command> daemon must be configured
and running for the <command>wbinfo</command> program to be able
to return information.</para>
</refsect1>
@@ -61,30 +56,27 @@
<varlistentry>
<term>-u</term>
<listitem><para>This option will list all users available
- in the Windows NT domain for which the <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> daemon is operating in. Users in all trusted domains
+ in the Windows NT domain for which the <command>winbindd(8)
+ </command> daemon is operating in. Users in all trusted domains
will also be listed. Note that this operation does not assign
- user ids to any users that have not already been seen by <citerefentry>
- <refentrytitle>winbindd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
- .</para></listitem>
+ user ids to any users that have not already been seen by
+ <command>winbindd(8)</command>.</para></listitem>
</varlistentry>
<varlistentry>
<term>-g</term>
<listitem><para>This option will list all groups available
- in the Windows NT domain for which the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> daemon is operating in. Groups in all trusted domains
+ in the Windows NT domain for which the <command>winbindd(8)
+ </command> daemon is operating in. Groups in all trusted domains
will also be listed. Note that this operation does not assign
- group ids to any groups that have not already been
- seen by <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>. </para></listitem>
+ group ids to any groups that have not already been seen by
+ <command>winbindd(8)</command>. </para></listitem>
</varlistentry>
<varlistentry>
<term>-N name</term>
<listitem><para>The <parameter>-N</parameter> option
- queries <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> to query the WINS
+ queries <command>winbindd(8)</command> to query the WINS
server for the IP address associated with the NetBIOS name
specified by the <parameter>name</parameter> parameter.
</para></listitem>
@@ -94,8 +86,7 @@
<varlistentry>
<term>-I ip</term>
<listitem><para>The <parameter>-I</parameter> option
- queries <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> to send a node status
+ queries <command>winbindd(8)</command> to send a node status
request to get the NetBIOS name associated with the IP address
specified by the <parameter>ip</parameter> parameter.
</para></listitem>
@@ -105,15 +96,13 @@
<varlistentry>
<term>-n name</term>
<listitem><para>The <parameter>-n</parameter> option
- queries <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> for the SID
+ queries <command>winbindd(8)</command> for the SID
associated with the name specified. Domain names can be specified
before the user name by using the winbind separator character.
For example CWDOM1/Administrator refers to the Administrator
user in the domain CWDOM1. If no domain is specified then the
- domain used is the one specified in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> <parameter>workgroup
- </parameter> parameter. </para></listitem>
+ domain used is the one specified in the <filename>smb.conf</filename>
+ <parameter>workgroup</parameter> parameter. </para></listitem>
</varlistentry>
@@ -146,18 +135,16 @@
<varlistentry>
<term>-S sid</term>
<listitem><para>Convert a SID to a UNIX user id. If the SID
- does not correspond to a UNIX user mapped by <citerefentry>
- <refentrytitle>winbindd</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry> then the operation will fail. </para></listitem>
+ does not correspond to a UNIX user mapped by <command>
+ winbindd(8)</command> then the operation will fail. </para></listitem>
</varlistentry>
<varlistentry>
<term>-Y sid</term>
<listitem><para>Convert a SID to a UNIX group id. If the SID
- does not correspond to a UNIX group mapped by <citerefentry>
- <refentrytitle>winbindd</refentrytitle><manvolnum>8</manvolnum></citerefentry> then
- the operation will fail. </para></listitem>
+ does not correspond to a UNIX group mapped by <command>
+ winbindd(8)</command> then the operation will fail. </para></listitem>
</varlistentry>
@@ -173,18 +160,12 @@
<varlistentry>
<term>-m</term>
<listitem><para>Produce a list of domains trusted by the
- Windows NT server <citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> contacts
+ Windows NT server <command>winbindd(8)</command> contacts
when resolving names. This list does not include the Windows
NT domain the server is a Primary Domain Controller for.
</para></listitem>
</varlistentry>
- <varlistentry>
- <term>--sequence</term>
- <listitem><para>Show sequence numbers of
- all known domains</para></listitem>
- </varlistentry>
<varlistentry>
<term>-r username</term>
@@ -212,25 +193,6 @@
Windows 2000 servers only).
</para></listitem>
</varlistentry>
-
- <varlistentry>
- <term>--get-auth-user</term>
- <listitem><para>Print username and password used by winbindd
- during session setup to a domain controller. Username
- and password can be set using '-A'. Only available for
- root.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-p</term>
- <listitem><para>Check whether winbindd is still alive.
- Prints out either 'succeeded' or 'failed'.
- </para></listitem>
- </varlistentry>
-
- &stdarg.version;
- &stdarg.help;
-
</variablelist>
</refsect1>
@@ -239,9 +201,8 @@
<title>EXIT STATUS</title>
<para>The wbinfo program returns 0 if the operation
- succeeded, or 1 if the operation failed. If the <citerefentry>
- <refentrytitle>winbindd</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry> daemon is not working <command>wbinfo</command> will always return
+ succeeded, or 1 if the operation failed. If the <command>winbindd(8)
+ </command> daemon is not working <command>wbinfo</command> will always return
failure. </para>
</refsect1>
@@ -255,8 +216,8 @@
<refsect1>
<title>SEE ALSO</title>
- <para><citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></para>
+ <para><ulink url="winbindd.8.html"><command>winbindd(8)</command>
+ </ulink></para>
</refsect1>
<refsect1>
@@ -271,8 +232,7 @@
were written by Tim Potter.</para>
<para>The conversion to DocBook for Samba 2.2 was done
- by Gerald Carter. The conversion to DocBook XML 4.2 for Samba
- 3.0 was done by Alexander Bokovoy.</para>
+ by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/manpages/winbindd.8.sgml b/docs/docbook/manpages/winbindd.8.sgml
index e0489c43c4..ccef2fa623 100644
--- a/docs/docbook/manpages/winbindd.8.sgml
+++ b/docs/docbook/manpages/winbindd.8.sgml
@@ -1,7 +1,5 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-]>
-<refentry id="winbindd.8">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="winbindd">
<refmeta>
<refentrytitle>winbindd</refentrytitle>
@@ -31,8 +29,8 @@
<refsect1>
<title>DESCRIPTION</title>
- <para>This program is part of the <citerefentry><refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para>This program is part of the <ulink url="samba.7.html">
+ Samba</ulink> suite.</para>
<para><command>winbindd</command> is a daemon that provides
a service for the Name Service Switch capability that is present
@@ -90,11 +88,12 @@
<filename>/etc/nsswitch.conf</filename> file can be used to initially
resolve user and group information from <filename>/etc/passwd
</filename> and <filename>/etc/group</filename> and then from the
- Windows NT server.
-<programlisting>
+ Windows NT server. </para>
+
+ <para><programlisting>
passwd: files winbind
group: files winbind
-</programlisting></para>
+ </programlisting></para>
<para>The following simple configuration in the
<filename>/etc/nsswitch.conf</filename> file can be used to initially
@@ -130,8 +129,13 @@ group: files winbind
than a file.</para></listitem>
</varlistentry>
- &popt.common.samba;
- &stdarg.help;
+ <varlistentry>
+ <term>-d debuglevel</term>
+ <listitem><para>Sets the debuglevel to an integer between
+ 0 and 100. 0 is for no debugging and 100 is for reams and
+ reams. To submit a bug report to the Samba Team, use debug
+ level 100 (see BUGS.txt). </para></listitem>
+ </varlistentry>
<varlistentry>
<term>-i</term>
@@ -161,10 +165,15 @@ group: files winbind
as 2 threads. The first will answer all requests from the cache,
thus making responses to clients faster. The other will
update the cache for the query that the first has just responded.
- Advantage of this is that responses stay accurate and are faster.
+ Advantage of this is that responses are accurate and fast.
</para></listitem>
</varlistentry>
+ <varlistentry>
+ <term>-s|--conf=smb.conf</term>
+ <listitem><para>Specifies the location of the all-important
+ <filename>smb.conf</filename> file. </para></listitem>
+ </varlistentry>
</variablelist>
</refsect1>
@@ -199,9 +208,8 @@ group: files winbind
<title>CONFIGURATION</title>
<para>Configuration of the <command>winbindd</command> daemon
- is done through configuration parameters in the <citerefentry>
- <refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry> file. All parameters should be specified in the
+ is done through configuration parameters in the <filename>smb.conf(5)
+ </filename> file. All parameters should be specified in the
[global] section of smb.conf. </para>
<itemizedlist>
@@ -235,24 +243,27 @@ group: files winbind
following setup. This was tested on a RedHat 6.2 Linux box. </para>
<para>In <filename>/etc/nsswitch.conf</filename> put the
- following:
-<programlisting>
+ following:</para>
+
+ <para><programlisting>
passwd: files winbind
group: files winbind
-</programlisting></para>
+ </programlisting></para>
+
+ <para>In <filename>/etc/pam.d/*</filename> replace the
+ <parameter>auth</parameter> lines with something like this: </para>
- <para>In <filename>/etc/pam.d/*</filename> replace the <parameter>
- auth</parameter> lines with something like this:
-<programlisting>
+
+ <para><programlisting>
auth required /lib/security/pam_securetty.so
auth required /lib/security/pam_nologin.so
auth sufficient /lib/security/pam_winbind.so
auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok
-</programlisting></para>
+ </programlisting></para>
- <para>Note in particular the use of the <parameter>sufficient
- </parameter> keyword and the <parameter>use_first_pass</parameter> keyword. </para>
+ <para>Note in particular the use of the <parameter>sufficient</parameter>
+ keyword and the <parameter>use_first_pass</parameter> keyword. </para>
<para>Now replace the account lines with this: </para>
@@ -260,26 +271,28 @@ auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok
</command></para>
<para>The next step is to join the domain. To do that use the
- <command>net</command> program like this: </para>
+ <command>smbpasswd</command> program like this: </para>
- <para><command>net join -S PDC -U Administrator</command></para>
+ <para><command>smbpasswd -j DOMAIN -r PDC -U
+ Administrator</command></para>
<para>The username after the <parameter>-U</parameter> can be any
Domain user that has administrator privileges on the machine.
- Substitute the name or IP of your PDC for "PDC".</para>
+ Substitute your domain name for "DOMAIN" and the name of your PDC
+ for "PDC".</para>
<para>Next copy <filename>libnss_winbind.so</filename> to
- <filename>/lib</filename> and <filename>pam_winbind.so
- </filename> to <filename>/lib/security</filename>. A symbolic link needs to be
+ <filename>/lib</filename> and <filename>pam_winbind.so</filename>
+ to <filename>/lib/security</filename>. A symbolic link needs to be
made from <filename>/lib/libnss_winbind.so</filename> to
<filename>/lib/libnss_winbind.so.2</filename>. If you are using an
older version of glibc then the target of the link should be
<filename>/lib/libnss_winbind.so.1</filename>.</para>
- <para>Finally, setup a <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> containing directives like the
- following:
-<programlisting>
+ <para>Finally, setup a <filename>smb.conf</filename> containing directives like the
+ following: </para>
+
+ <para><programlisting>
[global]
winbind separator = +
winbind cache time = 10
@@ -290,7 +303,7 @@ auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok
workgroup = DOMAIN
security = domain
password server = *
-</programlisting></para>
+ </programlisting></para>
<para>Now start winbindd and you should find that your user and
@@ -308,14 +321,19 @@ auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok
<para>The following notes are useful when configuring and
running <command>winbindd</command>: </para>
- <para><citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> must be running on the local machine
- for <command>winbindd</command> to work. <command>winbindd</command> queries
- the list of trusted domains for the Windows NT server
+ <para><command>nmbd</command> must be running on the local machine
+ for <command>winbindd</command> to work. <command>winbindd</command>
+ queries the list of trusted domains for the Windows NT server
on startup and when a SIGHUP is received. Thus, for a running <command>
winbindd</command> to become aware of new trust relationships between
servers, it must be sent a SIGHUP signal. </para>
+ <para>Client processes resolving names through the <command>winbindd</command>
+ nsswitch module read an environment variable named <envar>
+ $WINBINDD_DOMAIN</envar>. If this variable contains a comma separated
+ list of Windows NT domain names, then winbindd will only resolve users
+ and groups within those Windows NT domains. </para>
+
<para>PAM is really easy to misconfigure. Make sure you know what
you are doing when modifying PAM configuration files. It is possible
to set up PAM such that you can no longer log into your system. </para>
@@ -339,9 +357,8 @@ auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok
<variablelist>
<varlistentry>
<term>SIGHUP</term>
- <listitem><para>Reload the <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file and
- apply any parameter changes to the running
+ <listitem><para>Reload the <filename>smb.conf(5)</filename>
+ file and apply any parameter changes to the running
version of winbindd. This signal also clears any cached
user and group information. The list of other domains trusted
by winbindd is also reloaded. </para></listitem>
@@ -381,21 +398,6 @@ auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok
</varlistentry>
<varlistentry>
- <term>$LOCKDIR/winbindd_privilaged/pipe</term>
- <listitem><para>The UNIX pipe over which 'privilaged' clients
- communicate with the <command>winbindd</command> program. For security
- reasons, access to some winbindd functions - like those needed by
- the <command>ntlm_auth</command> utility - is restricted. By default,
- only users in the 'root' group will get this access, however the administrator
- may change the group permissions on $LOCKDIR/winbindd_privilaged to allow
- programs like 'squid' to use ntlm_auth.
- Note that the winbind client will only attempt to connect to the winbindd daemon
- if both the <filename>$LOCKDIR/winbindd_privilaged</filename> directory
- and <filename>$LOCKDIR/winbindd_privilaged/pipe</filename> file are owned by
- root. </para></listitem>
- </varlistentry>
-
- <varlistentry>
<term>/lib/libnss_winbind.so.X</term>
<listitem><para>Implementation of name service switch library.
</para></listitem>
@@ -429,13 +431,10 @@ auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok
<refsect1>
<title>SEE ALSO</title>
- <para><filename>nsswitch.conf(5)</filename>, <citerefentry>
- <refentrytitle>Samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry>, <citerefentry>
- <refentrytitle>wbinfo</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry>
- <refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry></para>
+ <para><filename>nsswitch.conf(5)</filename>,
+ <ulink url="samba.7.html">samba(7)</ulink>,
+ <ulink url="wbinfo.1.html">wbinfo(1)</ulink>,
+ <ulink url="smb.conf.5.html">smb.conf(5)</ulink></para>
</refsect1>
<refsect1>
@@ -446,12 +445,11 @@ auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok
by the Samba Team as an Open Source project similar
to the way the Linux kernel is developed.</para>
- <para><command>wbinfo</command> and <command>winbindd</command> were
- written by Tim Potter.</para>
+ <para><command>wbinfo</command> and <command>winbindd</command>
+ were written by Tim Potter.</para>
<para>The conversion to DocBook for Samba 2.2 was done
- by Gerald Carter. The conversion to DocBook XML 4.2 for
- Samba 3.0 was done by Alexander Bokovoy.</para>
+ by Gerald Carter</para>
</refsect1>
</refentry>
diff --git a/docs/docbook/projdoc/Bugs.sgml b/docs/docbook/projdoc/Bugs.sgml
index d782920457..e7ebde788b 100644
--- a/docs/docbook/projdoc/Bugs.sgml
+++ b/docs/docbook/projdoc/Bugs.sgml
@@ -15,7 +15,10 @@
<sect1>
<title>Introduction</title>
-<para>Please report bugs using <ulink url="https://bugzilla.samba.org/">bugzilla</ulink>.</para>
+<para>
+The email address for bug reports for stable releases is <ulink url="mailto:samba@samba.org">samba@samba.org</ulink>.
+Bug reports for alpha releases should go to <ulink url="mailto:samba-technical@samba.org">samba-technical@samba.org</ulink>.
+</para>
<para>
Please take the time to read this file before you submit a bug
diff --git a/docs/docbook/samba.dsl b/docs/docbook/samba.dsl
index 5a424a551f..7c530ce424 100644
--- a/docs/docbook/samba.dsl
+++ b/docs/docbook/samba.dsl
@@ -68,11 +68,7 @@
; === Books only ===
(define %generate-book-titlepage% #t)
(define %generate-book-toc% #t)
-(define %generate-part-toc% #f)
-(define %generate-part-titlepage% #t)
-(define %generate-chapter-toc% #f)
-(define %number-screen-lines% #t)
-(define %generate-partintro-on-titlepage% #f)
+(define ($generate-chapter-toc$) #f) ;; never generate a chapter TOC in books
; === Articles only ===
(define %generate-article-titlepage% #t)
diff --git a/docs/docbook/smbdotconf/.cvsignore b/docs/docbook/smbdotconf/.cvsignore
deleted file mode 100644
index 0f8c6cb0ed..0000000000
--- a/docs/docbook/smbdotconf/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-parameters.all.xml
-parameters.global.xml
-parameters.service.xml
-
diff --git a/docs/docbook/smbdotconf/expand-smb.conf.xsl b/docs/docbook/smbdotconf/expand-smb.conf.xsl
deleted file mode 100644
index 87b4898cf7..0000000000
--- a/docs/docbook/smbdotconf/expand-smb.conf.xsl
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version='1.0'?>
-<!-- vim:set sts=2 shiftwidth=2 syntax=xml: -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:exsl="http://exslt.org/common"
- xmlns:samba="http://samba.org/common"
- version="1.1"
- extension-element-prefixes="exsl">
-
-<xsl:output method="xml"/>
-
-<!-- Generates one big XML file for smb.conf -->
-
-<xsl:param name="xmlSambaNsUri" select="'http://samba.org/common'"/>
-
-<!-- This is needed to copy content unchanged -->
-<xsl:template match="@*|node()">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
-</xsl:template>
-
-
-<xsl:template match="//samba:parameter">
- <!-- reconstruct varlistentry - not all of them will go into separate files
- and also we must repair the main varlistentry itself.
- -->
- <xsl:message>
- <xsl:text>Processing samba:parameter (</xsl:text>
- <xsl:value-of select="@name"/>
- <xsl:text>)</xsl:text>
- </xsl:message>
-
- <xsl:variable name="name"><xsl:value-of select="translate(translate(string(@name),' ',''),
- 'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
- </xsl:variable>
-
- <xsl:variable name="anchor">
- <xsl:element name="anchor">
- <xsl:attribute name="id">
- <xsl:value-of select="$name"/>
- </xsl:attribute>
- </xsl:element>
- </xsl:variable>
-
- <xsl:variable name="context">
- <xsl:text> (</xsl:text>
- <xsl:value-of select="@context"/>
- <xsl:text>)</xsl:text>
- </xsl:variable>
-
- <xsl:variable name="term">
- <xsl:element name="term">
- <xsl:copy-of select="$anchor"/>
- <xsl:value-of select="@name"/>
- <xsl:value-of select="$context"/>
- </xsl:element>
- </xsl:variable>
-
- <xsl:variable name="content">
- <xsl:apply-templates/>
- </xsl:variable>
-
- <xsl:element name="varlistentry">
- <xsl:text>
-</xsl:text>
- <xsl:copy-of select="$term"/>
- <xsl:copy-of select="$content"/>
- <xsl:text>
-</xsl:text>
- </xsl:element>
-
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/docs/docbook/smbdotconf/man.xsl b/docs/docbook/smbdotconf/man.xsl
deleted file mode 100644
index a7ae76bbd8..0000000000
--- a/docs/docbook/smbdotconf/man.xsl
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version='1.0'?>
-<!-- vim:set sts=2 shiftwidth=2 syntax=xml: -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version='1.0'>
-
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
-
-<xsl:param name="chunk.section.depth" select="0"/>
-<xsl:param name="chunk.first.sections" select="1"/>
-<xsl:param name="use.id.as.filename" select="1"/>
-<xsl:param name="base.dir" select="'../../manpages/'"/>
-
-<!--
- Our ulink stylesheet omits @url part if content was specified
--->
-<xsl:template match="ulink">
- <xsl:variable name="content">
- <xsl:apply-templates/>
- </xsl:variable>
- <xsl:if test="$content = ''">
- <xsl:text>: </xsl:text>
- </xsl:if>
- <xsl:if test="$content != ''">
- <xsl:value-of select="$content" />
- </xsl:if>
- <xsl:if test="$content = ''">
- <xsl:apply-templates mode="italic" select="@url" />
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="refentry">
-
- <xsl:variable name="section" select="refmeta/manvolnum"/>
- <xsl:variable name="name" select="refnamediv/refname[1]"/>
- <xsl:variable name="base.dir" select="$base.dir"/>
- <!-- standard man page width is 64 chars; 6 chars needed for the two
- (x) volume numbers, and 2 spaces, leaves 56 -->
- <xsl:variable name="twidth" select="(74 - string-length(refmeta/refentrytitle)) div 2"/>
-
- <xsl:variable name="reftitle"
- select="substring(refmeta/refentrytitle, 1, $twidth)"/>
-
- <xsl:variable name="title">
- <xsl:choose>
- <xsl:when test="refentryinfo/title">
- <xsl:value-of select="refentryinfo/title"/>
- </xsl:when>
- <xsl:when test="../referenceinfo/title">
- <xsl:value-of select="../referenceinfo/title"/>
- </xsl:when>
- </xsl:choose>
- </xsl:variable>
-
- <xsl:variable name="date">
- <xsl:choose>
- <xsl:when test="refentryinfo/date">
- <xsl:value-of select="refentryinfo/date"/>
- </xsl:when>
- <xsl:when test="../referenceinfo/date">
- <xsl:value-of select="../referenceinfo/date"/>
- </xsl:when>
- </xsl:choose>
- </xsl:variable>
-
- <xsl:variable name="productname">
- <xsl:choose>
- <xsl:when test="refentryinfo/productname">
- <xsl:value-of select="refentryinfo/productname"/>
- </xsl:when>
- <xsl:when test="../referenceinfo/productname">
- <xsl:value-of select="../referenceinfo/productname"/>
- </xsl:when>
- </xsl:choose>
- </xsl:variable>
-
- <xsl:call-template name="write.text.chunk">
- <xsl:with-param name="filename"
- select="concat($base.dir, normalize-space ($name), '.', $section)"/>
- <xsl:with-param name="content">
- <xsl:text>.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "</xsl:text>
- <xsl:value-of select="translate($reftitle,'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
- <xsl:text>" </xsl:text>
- <xsl:value-of select="refmeta/manvolnum[1]"/>
- <xsl:text> "</xsl:text>
- <xsl:value-of select="normalize-space($date)"/>
- <xsl:text>" "</xsl:text>
- <xsl:value-of select="normalize-space($productname)"/>
- <xsl:text>" "</xsl:text>
- <xsl:value-of select="$title"/>
- <xsl:text>"
-</xsl:text>
- <xsl:apply-templates/>
- <xsl:text>&#10;</xsl:text>
-
- <!-- Author section -->
- <xsl:choose>
- <xsl:when test="refentryinfo//author">
- <xsl:apply-templates select="refentryinfo" mode="authorsect"/>
- </xsl:when>
- </xsl:choose>
- </xsl:with-param>
- </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="informalexample|screen|programlisting">
- <xsl:text>.nf&#10;</xsl:text>
- <xsl:apply-templates/>
- <xsl:text>.fi&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="//emphasis">
- <xsl:text>\fB</xsl:text>
- <xsl:apply-templates/>
- <xsl:text>\fR</xsl:text>
-</xsl:template>
-
-<xsl:template match="para|simpara|remark" mode="list">
- <xsl:variable name="foo">
- <xsl:apply-templates/>
- </xsl:variable>
- <xsl:choose match="node()">
- <!-- Don't normalize-space() for verbatim paragraphs -->
- <xsl:when test="informalexample|screen|programlisting">
- <xsl:value-of select="$foo"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="normalize-space($foo)"/>
- <xsl:text>&#10;</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:text>&#10;</xsl:text>
- <xsl:if test="following-sibling::para or following-sibling::simpara or
- following-sibling::remark">
- <!-- Make sure multiple paragraphs within a list item don't -->
- <!-- merge together. -->
- <xsl:text>&#10;</xsl:text>
- </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/docs/docbook/smbdotconf/process-all.sh b/docs/docbook/smbdotconf/process-all.sh
deleted file mode 100755
index 6d8c9941b4..0000000000
--- a/docs/docbook/smbdotconf/process-all.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-sh generate-file-list.sh >parameters.all.xml
-
-xsltproc --xinclude \
- --param smb.context "'G'" \
- --output parameters.global.xml \
- generate-context.xsl parameters.all.xml
-
-xsltproc --xinclude \
- --param smb.context "'S'" \
- --output parameters.service.xml \
- generate-context.xsl parameters.all.xml
-
-xsltproc --xinclude expand-smb.conf.xsl smb.conf.5.xml | \
-xsltproc http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl -
diff --git a/docs/docbook/smbdotconf/security/restrictanonymous.xml b/docs/docbook/smbdotconf/security/restrictanonymous.xml
deleted file mode 100644
index 7f78f94a99..0000000000
--- a/docs/docbook/smbdotconf/security/restrictanonymous.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<samba:parameter name="restrict anonymous"
- context="G"
- advanced="1" developer="1"
- xmlns:samba="http://samba.org/common">
-<listitem>
- <para>This is a integer parameter, and mirrors as much as possible the functinality the
- <constant>RestrictAnonymous</constant> registry key does on NT/Win2k.
- </para>
-
- <para>Default: <command moreinfo="none">restrict anonymous = 0</command></para>
-</listitem>
-</samba:parameter>