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 | 71647364a03eb2014bdcee0c99974ec019cf287d (patch) | |
| tree | da04523932f427c3e54e94ee6080a7a76fe957c6 /source3/param | |
| parent | 4413a3cfea3e18d5f8407127381e57e61e219a43 (diff) | |
| download | samba-71647364a03eb2014bdcee0c99974ec019cf287d.tar.gz samba-71647364a03eb2014bdcee0c99974ec019cf287d.tar.bz2 samba-71647364a03eb2014bdcee0c99974ec019cf287d.zip | |
Merge from HEAD. lp_winbind_separator() is now a const string.
(This used to be commit 1f2622f5ccae3ac2102a736cdc60b44d5aad5b07)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index de91e7e2a5..831aab0305 100644 --- a/source3/param/loadparm.c +++ b/source3/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) |