mirror of
https://github.com/samba-team/samba.git
synced 2024-12-24 21:34:56 +03:00
r13058: Add %w macro for the winbind seperator which allows us for example
valid users = %S, %D%w%S
(This used to be commit 6ff25eb840
)
This commit is contained in:
parent
4183c1824c
commit
0c42f4a5c0
@ -448,6 +448,9 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len)
|
|||||||
case 'v' :
|
case 'v' :
|
||||||
string_sub(p,"%v", SAMBA_VERSION_STRING,l);
|
string_sub(p,"%v", SAMBA_VERSION_STRING,l);
|
||||||
break;
|
break;
|
||||||
|
case 'w' :
|
||||||
|
string_sub(p,"%w", lp_winbind_separator(),l);
|
||||||
|
break;
|
||||||
case '$' :
|
case '$' :
|
||||||
p += expand_env_var(p,l);
|
p += expand_env_var(p,l);
|
||||||
break; /* Expand environment variables */
|
break; /* Expand environment variables */
|
||||||
@ -615,6 +618,9 @@ char *alloc_sub_basic(const char *smb_name, const char *str)
|
|||||||
case 'v' :
|
case 'v' :
|
||||||
t = realloc_string_sub(t, "%v", SAMBA_VERSION_STRING);
|
t = realloc_string_sub(t, "%v", SAMBA_VERSION_STRING);
|
||||||
break;
|
break;
|
||||||
|
case 'w' :
|
||||||
|
t = realloc_string_sub(t, "%w", lp_winbind_separator());
|
||||||
|
break;
|
||||||
case '$' :
|
case '$' :
|
||||||
t = realloc_expand_env_var(t, p); /* Expand environment variables */
|
t = realloc_expand_env_var(t, p); /* Expand environment variables */
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user