diff options
| author | Tim Potter <tpot@samba.org> | 2002-12-20 01:23:58 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-12-20 01:23:58 +0000 |
| commit | 1f2622f5ccae3ac2102a736cdc60b44d5aad5b07 (patch) | |
| tree | aa9c5051163dea178733f4e6cbc33a5517baeb8c /source | |
| parent | adb34ee5b183d17ec0c26ec2cf4f591822c59900 (diff) | |
| download | samba-1f2622f5ccae3ac2102a736cdc60b44d5aad5b07.tar.gz samba-1f2622f5ccae3ac2102a736cdc60b44d5aad5b07.tar.xz samba-1f2622f5ccae3ac2102a736cdc60b44d5aad5b07.zip | |
Merge from HEAD. lp_winbind_separator() is now a const string.
Diffstat (limited to 'source')
| -rw-r--r-- | source/param/loadparm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/param/loadparm.c b/source/param/loadparm.c index de91e7e2a51..831aab0305e 100644 --- a/source/param/loadparm.c +++ b/source/param/loadparm.c @@ -1584,7 +1584,7 @@ FN_GLOBAL_STRING(lp_wins_hook, &Globals.szWINSHook) FN_GLOBAL_STRING(lp_wins_partners, &Globals.szWINSPartners) FN_GLOBAL_STRING(lp_template_homedir, &Globals.szTemplateHomedir) FN_GLOBAL_STRING(lp_template_shell, &Globals.szTemplateShell) -FN_GLOBAL_STRING(lp_winbind_separator, &Globals.szWinbindSeparator) +FN_GLOBAL_CONST_STRING(lp_winbind_separator, &Globals.szWinbindSeparator) FN_GLOBAL_STRING(lp_acl_compatibility, &Globals.szAclCompat) FN_GLOBAL_BOOL(lp_winbind_enum_users, &Globals.bWinbindEnumUsers) FN_GLOBAL_BOOL(lp_winbind_enum_groups, &Globals.bWinbindEnumGroups) |