diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2010-06-18 22:28:56 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2010-06-18 22:28:56 +0200 |
| commit | 5545bb74968914a9fea5f30166238f9f54c8a04c (patch) | |
| tree | fdf53ef7a5319be35365f6298db06163b0c75815 /nslcd | |
| parent | d7e172414b5e003c5eec8e0768071172543d04a2 (diff) | |
remove warning messages from parsing the sasl_* options and document them in the nslcd.conf(5) manual page (they should be functional)
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1150 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd')
| -rw-r--r-- | nslcd/cfg.c | 33 | ||||
| -rw-r--r-- | nslcd/cfg.h | 8 |
2 files changed, 18 insertions, 23 deletions
diff --git a/nslcd/cfg.c b/nslcd/cfg.c index 0717fca..52a10b8 100644 --- a/nslcd/cfg.c +++ b/nslcd/cfg.c @@ -97,11 +97,11 @@ static void cfg_defaults(struct ldap_config *cfg) cfg->ldc_binddn=NULL; cfg->ldc_bindpw=NULL; cfg->ldc_rootpwmoddn=NULL; + cfg->ldc_sasl_mech=NULL; + cfg->ldc_sasl_realm=NULL; cfg->ldc_sasl_authcid=NULL; cfg->ldc_sasl_authzid=NULL; cfg->ldc_sasl_secprops=NULL; - cfg->ldc_sasl_mech=NULL; - cfg->ldc_sasl_realm=NULL; for (i=0;i<NSS_LDAP_CONFIG_MAX_BASES;i++) cfg->ldc_bases[i]=NULL; cfg->ldc_scope=LDAP_SCOPE_SUBTREE; @@ -818,39 +818,34 @@ static void cfg_read(const char *filename,struct ldap_config *cfg) get_restdup(filename,lnr,keyword,&line,&cfg->ldc_rootpwmoddn); } /* SASL authentication options */ - else if (strcasecmp(keyword,"sasl_authcid")==0) - { - log_log(LOG_WARNING,"%s:%d: option %s is currently not fully supported (please report any successes)",filename,lnr,keyword); - get_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_authcid); - get_eol(filename,lnr,keyword,&line); - } - else if (strcasecmp(keyword,"sasl_authzid")==0) + else if (strcasecmp(keyword,"use_sasl")==0) { - log_log(LOG_WARNING,"%s:%d: option %s is currently not fully supported (please report any successes)",filename,lnr,keyword); - get_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_authzid); - get_eol(filename,lnr,keyword,&line); + log_log(LOG_WARNING,"%s:%d: option %s is deprecated (and will be removed in an upcoming release), use sasl_mech instead",filename,lnr,keyword); } else if (strcasecmp(keyword,"sasl_mech")==0) { - log_log(LOG_WARNING,"%s:%d: option %s is currently not fully supported (please report any successes)",filename,lnr,keyword); get_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_mech); get_eol(filename,lnr,keyword,&line); } else if (strcasecmp(keyword,"sasl_realm")==0) { - log_log(LOG_WARNING,"%s:%d: option %s is currently not fully supported (please report any successes)",filename,lnr,keyword); get_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_realm); get_eol(filename,lnr,keyword,&line); } - else if (strcasecmp(keyword,"sasl_secprops")==0) + else if (strcasecmp(keyword,"sasl_authcid")==0) { - log_log(LOG_WARNING,"%s:%d: option %s is currently not fully supported (please report any successes)",filename,lnr,keyword); - get_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_secprops); + get_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_authcid); get_eol(filename,lnr,keyword,&line); } - else if (strcasecmp(keyword,"use_sasl")==0) + else if (strcasecmp(keyword,"sasl_authzid")==0) { - log_log(LOG_WARNING,"%s:%d: option %s is deprecated (and will be removed in an upcoming release), use sasl_mech instead",filename,lnr,keyword); + get_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_authzid); + get_eol(filename,lnr,keyword,&line); + } + else if (strcasecmp(keyword,"sasl_secprops")==0) + { + get_strdup(filename,lnr,keyword,&line,&cfg->ldc_sasl_secprops); + get_eol(filename,lnr,keyword,&line); } /* Kerberos authentication options */ else if (strcasecmp(keyword,"krb5_ccname")==0) diff --git a/nslcd/cfg.h b/nslcd/cfg.h index c7674e3..1028870 100644 --- a/nslcd/cfg.h +++ b/nslcd/cfg.h @@ -95,16 +95,16 @@ struct ldap_config char *ldc_bindpw; /* bind DN for password modification by administrator */ char *ldc_rootpwmoddn; + /* sasl mech */ + char *ldc_sasl_mech; + /* sasl realm */ + char *ldc_sasl_realm; /* sasl authentication id */ char *ldc_sasl_authcid; /* sasl authorization id */ char *ldc_sasl_authzid; /* sasl security */ char *ldc_sasl_secprops; - /* sasl mech */ - char *ldc_sasl_mech; - /* sasl realm */ - char *ldc_sasl_realm; /* base DN, eg. dc=gnu,dc=org */ const char *ldc_bases[NSS_LDAP_CONFIG_MAX_BASES]; /* scope for searches */ |