diff options
| author | Jan Zeleny <jzeleny@redhat.com> | 2011-11-15 07:39:17 -0500 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2011-11-23 14:19:53 -0500 |
| commit | 9f761434e5fbc5c033a85fb69d6e360e3ba4db58 (patch) | |
| tree | e5dee8d40c3e09c13bcb428eefce9ad6681a522b /src/providers/ldap/ldap_common.c | |
| parent | 7d9f54f5ec7c72336c4f69dbf20d55f1f64b88d2 (diff) | |
| download | sssd-9f761434e5fbc5c033a85fb69d6e360e3ba4db58.tar.gz sssd-9f761434e5fbc5c033a85fb69d6e360e3ba4db58.tar.xz sssd-9f761434e5fbc5c033a85fb69d6e360e3ba4db58.zip | |
Modified sdap_parse_search_base()
Diffstat (limited to 'src/providers/ldap/ldap_common.c')
| -rw-r--r-- | src/providers/ldap/ldap_common.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c index 9e2c2a4ae..6b4e1b95f 100644 --- a/src/providers/ldap/ldap_common.c +++ b/src/providers/ldap/ldap_common.c @@ -273,25 +273,25 @@ int ldap_get_options(TALLOC_CTX *memctx, } /* Default search */ - ret = sdap_parse_search_base(opts, opts, + ret = sdap_parse_search_base(opts, opts->basic, SDAP_SEARCH_BASE, &opts->search_bases); if (ret != EOK && ret != ENOENT) goto done; /* User search */ - ret = sdap_parse_search_base(opts, opts, + ret = sdap_parse_search_base(opts, opts->basic, SDAP_USER_SEARCH_BASE, &opts->user_search_bases); if (ret != EOK && ret != ENOENT) goto done; /* Group search base */ - ret = sdap_parse_search_base(opts, opts, + ret = sdap_parse_search_base(opts, opts->basic, SDAP_GROUP_SEARCH_BASE, &opts->group_search_bases); if (ret != EOK && ret != ENOENT) goto done; /* Netgroup search */ - ret = sdap_parse_search_base(opts, opts, + ret = sdap_parse_search_base(opts, opts->basic, SDAP_NETGROUP_SEARCH_BASE, &opts->netgroup_search_bases); if (ret != EOK && ret != ENOENT) goto done; @@ -495,8 +495,7 @@ done: } errno_t sdap_parse_search_base(TALLOC_CTX *mem_ctx, - struct sdap_options *opts, - enum sdap_basic_opt class, + struct dp_option *opts, int class, struct sdap_search_base ***_search_bases) { errno_t ret; @@ -521,11 +520,11 @@ errno_t sdap_parse_search_base(TALLOC_CTX *mem_ctx, break; case SDAP_USER_SEARCH_BASE: class_name = "USER"; - old_filter = dp_opt_get_string(opts->basic, SDAP_USER_SEARCH_FILTER); + old_filter = dp_opt_get_string(opts, SDAP_USER_SEARCH_FILTER); break; case SDAP_GROUP_SEARCH_BASE: class_name = "GROUP"; - old_filter = dp_opt_get_string(opts->basic, SDAP_GROUP_SEARCH_FILTER); + old_filter = dp_opt_get_string(opts, SDAP_GROUP_SEARCH_FILTER); break; case SDAP_NETGROUP_SEARCH_BASE: class_name = "NETGROUP"; @@ -537,7 +536,7 @@ errno_t sdap_parse_search_base(TALLOC_CTX *mem_ctx, /* Non-fatal */ } - unparsed_base = dp_opt_get_string(opts->basic, class); + unparsed_base = dp_opt_get_string(opts, class); if (!unparsed_base || unparsed_base[0] == '\0') return ENOENT; tmp_ctx = talloc_new(NULL); |