From 010e444fd934b3df6840ce9f015627ef2bf389a0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 18 Oct 2002 20:31:13 +0000 Subject: Document %D. Make a difference between sub_basic and sub_advanced substitutions (This used to be commit 7fe52d378d7e4ce6381be3544d865088a7659009) --- docs/docbook/manpages/smb.conf.5.sgml | 113 ++++++++++++++++++---------------- 1 file changed, 59 insertions(+), 54 deletions(-) (limited to 'docs') diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml index 5ce8691076..b87564e622 100644 --- a/docs/docbook/manpages/smb.conf.5.sgml +++ b/docs/docbook/manpages/smb.conf.5.sgml @@ -333,29 +333,6 @@ might be relevant. These are: - - %S - the name of the current service, if any. - - - - - %P - the root directory of the current service, - if any. - - - - %u - user name of the current service, if any. - - - - - %g - primary group name of %u. - - %U session user name (the user name that the client @@ -367,17 +344,6 @@ primary group name of %U. - - %H - the home directory of the user given - by %u. - - - - %v - the Samba version. - - %h the Internet hostname that Samba is running @@ -408,22 +374,6 @@ - - %N - the name of your NIS home directory server. - This is obtained from your NIS auto.map entry. If you have - not compiled Samba with the --with-automount - option then this value will be the same as %L. - - - - - %p - the path of the service's home directory, - obtained from your NIS auto.map entry. The NIS auto.map entry - is split up as "%N:%p". - - %R the selected protocol level after @@ -458,6 +408,11 @@ %T the current date and time. + + + %D + Name of the domain or workgroup of the current user. + %$(envvar) @@ -466,6 +421,56 @@ + The following substitutes apply only to some configuration options(only those + that are used when a connection has been established): + + + + %S + the name of the current service, if any. + + + + + %P + the root directory of the current service, + if any. + + + + %u + user name of the current service, if any. + + + + + %g + primary group name of %u. + + + + %H + the home directory of the user given + by %u. + + + + %N + the name of your NIS home directory server. + This is obtained from your NIS auto.map entry. If you have + not compiled Samba with the --with-automount + option then this value will be the same as %L. + + + + + %p + the path of the service's home directory, + obtained from your NIS auto.map entry. The NIS auto.map entry + is split up as "%N:%p". + + + There are some quite creative things that can be done with these substitutions and other smb.conf options. @@ -528,7 +533,7 @@ - By default, Samba 2.2 has the same semantics as a Windows + By default, Samba 3.0 has the same semantics as a Windows NT server, in that it is case insensitive but case preserving. @@ -1393,12 +1398,12 @@ request has a time limit associated with it. If this parameter is set and the lock range requested - cannot be immediately satisfied, Samba 2.2 will internally + cannot be immediately satisfied, samba will internally queue the lock request, and periodically attempt to obtain the lock until the timeout period expires. If this parameter is set to no, then - Samba 2.2 will behave as previous versions of Samba would and + samba will behave as previous versions of Samba would and will fail the lock request immediately if the lock range cannot be obtained. @@ -1746,7 +1751,7 @@ debug timestamp (G) - Samba 2.2 debug log messages are timestamped + Samba debug log messages are timestamped by default. If you are running at a high debug level these timestamps can be distracting. This boolean parameter allows timestamping -- cgit