diff options
| -rw-r--r-- | lib/param/loadparm.c | 12 | ||||
| -rw-r--r-- | source4/winbind/idmap.c | 6 |
2 files changed, 0 insertions, 18 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 6f66d0b1c8..f6156bd0e0 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1248,16 +1248,6 @@ static struct parm_struct parm_table[] = { .flags = FLAG_ADVANCED, }, { - .label = "idmap trusted only", - .type = P_BOOL, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(bIdmapTrustedOnly), - .special = NULL, - .enum_list = NULL, - .flags = FLAG_ADVANCED, - }, - - { .label = "ntp signd socket directory", .type = P_STRING, .p_class = P_GLOBAL, @@ -1533,7 +1523,6 @@ static struct loadparm_context *global_loadparm_context; #include "lib/param/param_functions.c" /* These functions remain only in lib/param for now */ -FN_GLOBAL_BOOL(idmap_trusted_only, bIdmapTrustedOnly) FN_GLOBAL_BOOL(readraw, bReadRaw) FN_GLOBAL_BOOL(unicode, bUnicode) FN_GLOBAL_BOOL(writeraw, bWriteRaw) @@ -3396,7 +3385,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) #endif lpcfg_do_global_parameter(lp_ctx, "template shell", "/bin/false"); lpcfg_do_global_parameter(lp_ctx, "template homedir", "/home/%WORKGROUP%/%ACCOUNTNAME%"); - lpcfg_do_global_parameter(lp_ctx, "idmap trusted only", "False"); lpcfg_do_global_parameter(lp_ctx, "client signing", "default"); lpcfg_do_global_parameter(lp_ctx, "server signing", "default"); diff --git a/source4/winbind/idmap.c b/source4/winbind/idmap.c index 354507ca6f..b4aa62e237 100644 --- a/source4/winbind/idmap.c +++ b/source4/winbind/idmap.c @@ -368,9 +368,6 @@ failed: * * If no mapping exists, a new mapping will be created. * - * \todo Check if SIDs can be resolved if lpcfg_idmap_trusted_only() == true - * \todo Fix backwards compatibility for Samba3 - * * \param idmap_ctx idmap context to use * \param mem_ctx talloc context to use * \param sid SID to map to an unixid struct @@ -549,9 +546,6 @@ static NTSTATUS idmap_sid_to_xid(struct idmap_context *idmap_ctx, goto failed; } - /*FIXME: if lpcfg_idmap_trusted_only() == true, check if SID can be - * resolved here. */ - ret = idmap_get_bounds(idmap_ctx, &low, &high); if (ret != LDB_SUCCESS) { status = NT_STATUS_NONE_MAPPED; |