diff options
| author | Volker Lendecke <vlendec@samba.org> | 2002-04-14 12:14:52 +0000 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2002-04-14 12:14:52 +0000 |
| commit | 26152050bb9f327d67360fa2997344787d9073c7 (patch) | |
| tree | d08e8aec49c2d5cc374987bf2e05eeda9e8a7f41 | |
| parent | d0386372b2f491cd9281fc6466b1b5d2f5cf59a9 (diff) | |
| download | samba-26152050bb9f327d67360fa2997344787d9073c7.tar.gz samba-26152050bb9f327d67360fa2997344787d9073c7.tar.bz2 samba-26152050bb9f327d67360fa2997344787d9073c7.zip | |
Merge from 2_2.
Volker
(This used to be commit 8973a01f5efa547ed356e27fe1660da732b24cdd)
| -rw-r--r-- | docs/docbook/manpages/smb.conf.5.sgml | 8 | ||||
| -rw-r--r-- | source3/utils/testparm.c | 9 |
2 files changed, 15 insertions, 2 deletions
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml index 2adab907dc..384aacb998 100644 --- a/docs/docbook/manpages/smb.conf.5.sgml +++ b/docs/docbook/manpages/smb.conf.5.sgml @@ -8101,8 +8101,12 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/ and <filename>nss_winbind.so</filename> modules for UNIX services. </para> - <para>Example: <command>winbind separator = \</command></para> - <para>Example: <command>winbind separator = +</command></para> + <para>Please note that setting this parameter to + causes problems + 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> </varlistentry> diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index defde6cb2c..c6e417a2bc 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -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; } |