diff options
| author | Sumit Bose <sbose@redhat.com> | 2010-11-05 12:20:21 +0100 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-11-05 08:15:08 -0400 |
| commit | d64940d823b7d860ef65e000f084fd3f62b51d81 (patch) | |
| tree | 318a06dd51d9c26ab6af4eea352ef8917290ca40 | |
| parent | 999d9250e7efc15f38448c2929bbe6d19dbb8013 (diff) | |
| download | sssd-d64940d823b7d860ef65e000f084fd3f62b51d81.tar.gz sssd-d64940d823b7d860ef65e000f084fd3f62b51d81.tar.bz2 sssd-d64940d823b7d860ef65e000f084fd3f62b51d81.zip | |
Review comments for namingContexts patches
| -rw-r--r-- | src/man/sssd-ldap.5.xml | 12 | ||||
| -rw-r--r-- | src/providers/ldap/sdap.c | 10 | ||||
| -rw-r--r-- | src/providers/ldap/sdap_async.c | 18 |
3 files changed, 17 insertions, 23 deletions
diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml index 2762362b..2123ffd1 100644 --- a/src/man/sssd-ldap.5.xml +++ b/src/man/sssd-ldap.5.xml @@ -1056,9 +1056,7 @@ ldap_access_filter = memberOf=cn=allowedusers,ou=Groups,dc=example,dc=com </para> <para> Default: the value of - <emphasis>ldap_search_base</emphasis> or the value - of the defaultNamingContext or namingContexts - attribute of the RootDSE of the LDAP server. + <emphasis>ldap_search_base</emphasis> </para> </listitem> </varlistentry> @@ -1072,9 +1070,7 @@ ldap_access_filter = memberOf=cn=allowedusers,ou=Groups,dc=example,dc=com </para> <para> Default: the value of - <emphasis>ldap_search_base</emphasis> or the value - of the defaultNamingContext or namingContexts - attribute of the RootDSE of the LDAP server. + <emphasis>ldap_search_base</emphasis> </para> </listitem> </varlistentry> @@ -1088,9 +1084,7 @@ ldap_access_filter = memberOf=cn=allowedusers,ou=Groups,dc=example,dc=com </para> <para> Default: the value of - <emphasis>ldap_search_base</emphasis> or the value - of the defaultNamingContext or namingContexts - attribute of the RootDSE of the LDAP server. + <emphasis>ldap_search_base</emphasis> </para> </listitem> </varlistentry> diff --git a/src/providers/ldap/sdap.c b/src/providers/ldap/sdap.c index cf4e9edc..95b63d17 100644 --- a/src/providers/ldap/sdap.c +++ b/src/providers/ldap/sdap.c @@ -474,11 +474,11 @@ errno_t sdap_set_config_options_with_rootdse(struct sysdb_attrs *rootdse, SDAP_GROUP_SEARCH_BASE, SDAP_NETGROUP_SEARCH_BASE, -1 }; - int o; + size_t c; - for (o = 0; search_base_options[o] != -1; o++) { - if (dp_opt_get_string(opts->basic, search_base_options[o]) == NULL) { + for (c = 0; search_base_options[c] != -1; c++) { + if (dp_opt_get_string(opts->basic, search_base_options[c]) == NULL) { if (naming_context == NULL) { naming_context = get_naming_context(opts->basic, rootdse); if (naming_context == NULL) { @@ -489,9 +489,9 @@ errno_t sdap_set_config_options_with_rootdse(struct sysdb_attrs *rootdse, } DEBUG(3, ("Setting option [%s] to [%s].\n", - opts->basic[search_base_options[o]].opt_name, + opts->basic[search_base_options[c]].opt_name, naming_context)); - ret = dp_opt_set_string(opts->basic, search_base_options[o], + ret = dp_opt_set_string(opts->basic, search_base_options[c], naming_context); if (ret != EOK) { DEBUG(1, ("dp_opt_set_string failed.\n")); diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c index 01cd9670..6808ceaa 100644 --- a/src/providers/ldap/sdap_async.c +++ b/src/providers/ldap/sdap_async.c @@ -646,16 +646,16 @@ struct tevent_req *sdap_get_rootdse_send(TALLOC_CTX *memctx, struct tevent_req *req, *subreq; struct sdap_get_rootdse_state *state; const char *attrs[] = { - "*", - "altServer", - SDAP_ROOTDSE_ATTR_NAMING_CONTEXTS, - "supportedControl", - "supportedExtension", - "supportedFeatures", - "supportedLDAPVersion", - "supportedSASLMechanisms", + "*", + "altServer", + SDAP_ROOTDSE_ATTR_NAMING_CONTEXTS, + "supportedControl", + "supportedExtension", + "supportedFeatures", + "supportedLDAPVersion", + "supportedSASLMechanisms", SDAP_ROOTDSE_ATTR_DEFAULT_NAMING_CONTEXT, - NULL + NULL }; DEBUG(9, ("Getting rootdse\n")); |