diff options
| -rw-r--r-- | source3/nsswitch/idmap.c | 59 |
1 files changed, 30 insertions, 29 deletions
diff --git a/source3/nsswitch/idmap.c b/source3/nsswitch/idmap.c index 7a74f744b4..7589ee66ab 100644 --- a/source3/nsswitch/idmap.c +++ b/source3/nsswitch/idmap.c @@ -289,40 +289,42 @@ NTSTATUS idmap_init(void) dom_list = lp_idmap_domains(); - if ( dom_list && lp_idmap_backend() ) { - DEBUG(0, ("WARNING: idmap backend and idmap domains are " - "mutually excusive!\n")); - DEBUGADD(0,("idmap backend option will be IGNORED!\n")); - } else if ( lp_idmap_backend() ) { - const char **compat_list = lp_idmap_backend(); + if ( lp_idmap_backend() ) { + const char **compat_list = lp_idmap_backend(); char *p = NULL; const char *q = NULL; - compat = 1; + if ( dom_list ) { + DEBUG(0, ("WARNING: idmap backend and idmap domains are " + "mutually excusive!\n")); + DEBUGADD(0,("idmap backend option will be IGNORED!\n")); + } else { + compat = 1; - if ( (compat_backend = talloc_strdup( idmap_ctx, *compat_list )) == NULL ) { - ret = NT_STATUS_NO_MEMORY; - goto done; - } + if ( (compat_backend = talloc_strdup( idmap_ctx, *compat_list )) == NULL ) { + ret = NT_STATUS_NO_MEMORY; + goto done; + } - /* strip any leading idmap_ prefix of */ - if (strncmp(*compat_list, "idmap_", 6) == 0 ) { - q = *compat_list += 6; - DEBUG(0, ("WARNING: idmap backend uses obsolete and " - "deprecated 'idmap_' prefix.\n" - "Please replace 'idmap_%s' by '%s' in %s\n", - q, q, dyn_CONFIGFILE)); - compat_backend = talloc_strdup( idmap_ctx, q); - } else { - compat_backend = talloc_strdup( idmap_ctx, *compat_list); - } + /* strip any leading idmap_ prefix of */ + if (strncmp(*compat_list, "idmap_", 6) == 0 ) { + q = *compat_list += 6; + DEBUG(0, ("WARNING: idmap backend uses obsolete and " + "deprecated 'idmap_' prefix.\n" + "Please replace 'idmap_%s' by '%s' in %s\n", + q, q, dyn_CONFIGFILE)); + compat_backend = talloc_strdup( idmap_ctx, q); + } else { + compat_backend = talloc_strdup( idmap_ctx, *compat_list); + } - /* separate the backend and module arguements */ - if ((p = strchr(compat_backend, ':')) != NULL) { - *p = '\0'; - compat_params = p + 1; - } - } else { + /* separate the backend and module arguements */ + if ((p = strchr(compat_backend, ':')) != NULL) { + *p = '\0'; + compat_params = p + 1; + } + } + } else if ( !dom_list ) { /* Back compatible: without idmap domains and explicit idmap backend. Taking default idmap backend: tdb */ @@ -331,7 +333,6 @@ NTSTATUS idmap_init(void) compat_params = compat_backend; } - if ( ! dom_list) { dom_list = idmap_default_domain; } |