diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-11-12 17:11:34 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-11-13 22:48:19 +0100 |
| commit | d6c7e9b1ed6f7befbb2239350bba4547ef781e58 (patch) | |
| tree | ff40ee12b658dbae88128852588f82b74d6f958d /lib | |
| parent | 236977bf4642c035bb22cfcd1cee481c5f6c6da1 (diff) | |
| download | samba-d6c7e9b1ed6f7befbb2239350bba4547ef781e58.tar.gz samba-d6c7e9b1ed6f7befbb2239350bba4547ef781e58.tar.bz2 samba-d6c7e9b1ed6f7befbb2239350bba4547ef781e58.zip | |
smbd: Remove NT4 compatability handling in posix -> NT ACL conversion
NT4 is long dead, and we should not change which ACL we return based
on what we think the client is. The reason we should not do this, is
that if we are using vfs_acl_xattr then the hash will break if we do.
Additionally, it would require that the python VFS interface set the
global remote_arch to fake up being a modern client.
This instead seems cleaner and removes untested code (the tests are
updated to then handle the results of the modern codepath).
The supporting 'acl compatability' parameter is also removed.
Andrew Bartlett
Reviewed by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/param/param_functions.c | 1 | ||||
| -rw-r--r-- | lib/param/param_table.c | 19 |
2 files changed, 0 insertions, 20 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index d5cd0181c5..94652fad89 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -266,7 +266,6 @@ FN_GLOBAL_CONST_STRING(winbindd_socket_directory, szWinbinddSocketDirectory) FN_GLOBAL_CONST_STRING(winbind_separator, szWinbindSeparator) FN_GLOBAL_CONST_STRING(workgroup, szWorkgroup) FN_GLOBAL_CONST_STRING(wtmpdir, szWtmpDir) -FN_GLOBAL_INTEGER(acl_compatibility, iAclCompat) FN_GLOBAL_INTEGER(afs_token_lifetime, iAfsTokenLifetime) FN_GLOBAL_INTEGER(algorithmic_rid_base, AlgorithmicRidBase) FN_GLOBAL_INTEGER(allow_dns_updates, allow_dns_updates) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 01f65fef97..a73cd966bc 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -180,16 +180,6 @@ static const struct enum_list enum_kerberos_method[] = { {-1, NULL} }; - -/* ACL compatibility options. */ -static const struct enum_list enum_acl_compat_vals[] = { - { ACL_COMPAT_AUTO, "auto" }, - { ACL_COMPAT_WINNT, "winnt" }, - { ACL_COMPAT_WIN2K, "win2k" }, - { -1, NULL} -}; - - static const struct enum_list enum_printing[] = { {PRINT_SYSV, "sysv"}, {PRINT_AIX, "aix"}, @@ -1459,15 +1449,6 @@ static struct parm_struct parm_table[] = { .flags = FLAG_ADVANCED, }, { - .label = "acl compatibility", - .type = P_ENUM, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(iAclCompat), - .special = NULL, - .enum_list = enum_acl_compat_vals, - .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, - }, - { .label = "defer sharing violations", .type = P_BOOL, .p_class = P_GLOBAL, |