diff options
| author | Gerald Carter <jerry@samba.org> | 2006-06-07 12:01:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:17:20 -0500 |
| commit | 6b1b66904dfea2060dbce5c403211c195abd0604 (patch) | |
| tree | 40100066c60fced608f7c27861fa70d84838606f /source3/param | |
| parent | f897e7094f9630a808b9d4622bb542ac676a8fb2 (diff) | |
| download | samba-6b1b66904dfea2060dbce5c403211c195abd0604.tar.gz samba-6b1b66904dfea2060dbce5c403211c195abd0604.tar.bz2 samba-6b1b66904dfea2060dbce5c403211c195abd0604.zip | |
r16078: Patch from Aleksey Fedoseev <fedoseev@ru.ibm.com> to correctly
set the type of 'acl compatibility from string to integer
after the changes in r14207.
(This used to be commit b01f289f1a788fe8f62a213b67a73a9bfee01bb1)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index fadd4d0ee3..61d2ccf9cd 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -234,7 +234,7 @@ typedef struct { int ldap_ssl; char *szLdapSuffix; char *szLdapAdminDn; - char *szAclCompat; + int iAclCompat; char *szCupsServer; char *szIPrintServer; int ldap_passwd_sync; @@ -967,7 +967,7 @@ static struct parm_struct parm_table[] = { {"disable netbios", P_BOOL, P_GLOBAL, &Globals.bDisableNetbios, NULL, NULL, FLAG_ADVANCED}, {"reset on zero vc", P_BOOL, P_GLOBAL, &Globals.bResetOnZeroVC, NULL, NULL, FLAG_ADVANCED}, - {"acl compatibility", P_STRING, P_GLOBAL, &Globals.szAclCompat, NULL, enum_acl_compat_vals, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL}, + {"acl compatibility", P_ENUM, P_GLOBAL, &Globals.iAclCompat, NULL, enum_acl_compat_vals, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL}, {"defer sharing violations", P_BOOL, P_GLOBAL, &Globals.bDeferSharingViolations, NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL}, {"ea support", P_BOOL, P_LOCAL, &sDefault.bEASupport, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL}, {"nt acl support", P_BOOL, P_LOCAL, &sDefault.bNTAclSupport, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL}, @@ -1822,7 +1822,7 @@ FN_GLOBAL_STRING(lp_wins_hook, &Globals.szWINSHook) FN_GLOBAL_CONST_STRING(lp_template_homedir, &Globals.szTemplateHomedir) FN_GLOBAL_CONST_STRING(lp_template_shell, &Globals.szTemplateShell) FN_GLOBAL_CONST_STRING(lp_winbind_separator, &Globals.szWinbindSeparator) -FN_GLOBAL_INTEGER(lp_acl_compatibility, &Globals.szAclCompat) +FN_GLOBAL_INTEGER(lp_acl_compatibility, &Globals.iAclCompat) FN_GLOBAL_BOOL(lp_winbind_enum_users, &Globals.bWinbindEnumUsers) FN_GLOBAL_BOOL(lp_winbind_enum_groups, &Globals.bWinbindEnumGroups) FN_GLOBAL_BOOL(lp_winbind_use_default_domain, &Globals.bWinbindUseDefaultDomain) |