diff options
| author | Lars Müller <lmuelle@samba.org> | 2006-01-20 20:22:23 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:06:12 -0500 |
| commit | 0c42f4a5c0cc9ff6a6dc715cc5a70f2a589579ae (patch) | |
| tree | 025e04c4150e62af9f53ff3560ed90da22832f1a /source3 | |
| parent | 4183c1824cf1dd2813766a469929f82972635b7c (diff) | |
| download | samba-0c42f4a5c0cc9ff6a6dc715cc5a70f2a589579ae.tar.gz samba-0c42f4a5c0cc9ff6a6dc715cc5a70f2a589579ae.tar.bz2 samba-0c42f4a5c0cc9ff6a6dc715cc5a70f2a589579ae.zip | |
r13058: Add %w macro for the winbind seperator which allows us for example
valid users = %S, %D%w%S
(This used to be commit 6ff25eb8402ed006ac5e081f64bd9e074fe22295)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/substitute.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index 4d22518230..344f6e06fd 100644 --- a/source3/lib/substitute.c +++ b/source3/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; |