summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Müller <lmuelle@samba.org>2006-01-20 20:22:23 +0000
committerLars Müller <lmuelle@samba.org>2006-01-20 20:22:23 +0000
commit5822cc275ac5d6af0635b20e48393015279c5d07 (patch)
treedbc2f4fa222527431b0ada3f3716f175aaeeb82a
parent39af5278974fc8603e9c914608b94cc32e39084c (diff)
downloadsamba-5822cc275ac5d6af0635b20e48393015279c5d07.tar.gz
samba-5822cc275ac5d6af0635b20e48393015279c5d07.tar.xz
samba-5822cc275ac5d6af0635b20e48393015279c5d07.zip
r13058: Add %w macro for the winbind seperator which allows us for example
valid users = %S, %D%w%S
-rw-r--r--source/lib/substitute.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/lib/substitute.c b/source/lib/substitute.c
index 4d22518230f..344f6e06fdf 100644
--- a/source/lib/substitute.c
+++ b/source/lib/substitute.c
@@ -448,6 +448,9 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len)
case 'v' :
string_sub(p,"%v", SAMBA_VERSION_STRING,l);
break;
+ case 'w' :
+ string_sub(p,"%w", lp_winbind_separator(),l);
+ break;
case '$' :
p += expand_env_var(p,l);
break; /* Expand environment variables */
@@ -615,6 +618,9 @@ char *alloc_sub_basic(const char *smb_name, const char *str)
case 'v' :
t = realloc_string_sub(t, "%v", SAMBA_VERSION_STRING);
break;
+ case 'w' :
+ t = realloc_string_sub(t, "%w", lp_winbind_separator());
+ break;
case '$' :
t = realloc_expand_env_var(t, p); /* Expand environment variables */
break;