summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
authorDr. Thomas Orgis <thomas.orgis@uni-hamburg.de>2017-07-27 12:54:28 +0200
committerAndrew Bartlett <abartlet@samba.org>2018-01-08 03:34:17 +0100
commitca66efc24181ba6a7a4c13397af514b0972b4855 (patch)
treee6bd0940b1bd43a72a733b21bcd67de3bc0c6e1d /docs-xml
parentd39664fc66dafaf5cce2b830033df52da4d81695 (diff)
downloadsamba-ca66efc24181ba6a7a4c13397af514b0972b4855.tar.gz
Add substitutions %t, %j, and %J as path-safe variants of %T, %i, and %I.
Rationale: Using the existing substitutions in construction of paths (dynamic shares, created on client connect) results in directory names with colons and dots in them. Those can be hard to use when accessed from a different share, as Windows does not allow : in paths and has some ideas about dots. Signed-off-by: Dr. Thomas Orgis <thomas.orgis@uni-hamburg.de> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/manpages/smb.conf.5.xml19
1 files changed, 19 insertions, 0 deletions
diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index 976f988629d..1e84b6b9062 100644
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -512,6 +512,13 @@ chmod 1770 /usr/local/samba/lib/usershares
</varlistentry>
<varlistentry>
+ <term>%J</term>
+ <listitem><para>the IP address of the client machine,
+ colons/dots replaced by underscores.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>%i</term>
<listitem><para>the local IP address to which a client connected.</para>
<para>Before 4.0.0 it could contain IPv4 mapped IPv6 addresses,
@@ -520,11 +527,23 @@ chmod 1770 /usr/local/samba/lib/usershares
</varlistentry>
<varlistentry>
+ <term>%j</term>
+ <listitem><para>the local IP address to which a client connected,
+ colons/dots replaced by underscores.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>%T</term>
<listitem><para>the current date and time.</para></listitem>
</varlistentry>
<varlistentry>
+ <term>%t</term>
+ <listitem><para>the current date and time in a minimal format without colons (YYYYYmmdd_HHMMSS).</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>%D</term>
<listitem><para>name of the domain or workgroup of the current user.</para></listitem>
</varlistentry>