sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

Merge from 2_2.

Browse Source 
Volker
This commit is contained in:
Volker Lendecke 0001-01-01 00:00:00 +00:00
parent 245468dbab
commit 8973a01f5e
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/docbook/manpages/smb.conf.5.sgml
View File

@ -8101,8 +8101,12 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
and <filename>nss_winbind.so</filename> modules for UNIX services. and <filename>nss_winbind.so</filename> modules for UNIX services.
</para> </para>
<para>Example: <command>winbind separator = \</command></para> <para>Please note that setting this parameter to + causes problems
<para>Example: <command>winbind separator = +</command></para> with group membership at least on glibc systems, as the character +
is used as a special character for NIS in /etc/group.</para>
<para>Example: <command>winbind separator = \\</command></para>
<para>Example: <command>winbind separator = /</command></para>
</listitem> </listitem>
</varlistentry> </varlistentry>

9
source/utils/testparm.c
View File

@ -152,6 +152,15 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
} }
} }
if (strlen(lp_winbind_separator()) != 1) {
printf("ERROR: the 'winbind separator' parameter must be a single character.\n");
ret = 1;
}
if (*lp_winbind_separator() == '+') {
printf("'winbind separator = +' might cause problems with group membership.\n");
}
return ret; return ret;
} }