diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2010-06-18 20:20:12 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2010-06-18 20:20:12 +0000 |
| commit | 12ca65c54bf78cedb22a5c03f3efa59a765c5b4a (patch) | |
| tree | 034e5fec993e9dc1751e7c431a4247304efa4ab0 | |
| parent | e76b65c41797a184183fa75e4ec02e2600d8c6b9 (diff) | |
remove the use_sasl option and instead rely on sasl_mech being specified
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1148 ef36b2f9-881f-0410-afb5-c4e39611909c
| -rw-r--r-- | man/nslcd.conf.5.xml | 9 | ||||
| -rw-r--r-- | nslcd/cfg.c | 5 | ||||
| -rw-r--r-- | nslcd/cfg.h | 2 | ||||
| -rw-r--r-- | nslcd/myldap.c | 2 |
4 files changed, 2 insertions, 16 deletions
diff --git a/man/nslcd.conf.5.xml b/man/nslcd.conf.5.xml index 19f56ec..cc529e6 100644 --- a/man/nslcd.conf.5.xml +++ b/man/nslcd.conf.5.xml @@ -207,15 +207,6 @@ <variablelist> <varlistentry> - <term><option>use_sasl</option> yes|no</term> - <listitem> - <para> - Specifies whether <acronym>SASL</acronym> authentication should be used. - </para> - </listitem> - </varlistentry> - - <varlistentry> <term><option>sasl_mech</option> <replaceable>MECHANISM</replaceable></term> <listitem> <para> diff --git a/nslcd/cfg.c b/nslcd/cfg.c index b18f673..0717fca 100644 --- a/nslcd/cfg.c +++ b/nslcd/cfg.c @@ -102,7 +102,6 @@ static void cfg_defaults(struct ldap_config *cfg) cfg->ldc_sasl_secprops=NULL; cfg->ldc_sasl_mech=NULL; cfg->ldc_sasl_realm=NULL; - cfg->ldc_usesasl=0; for (i=0;i<NSS_LDAP_CONFIG_MAX_BASES;i++) cfg->ldc_bases[i]=NULL; cfg->ldc_scope=LDAP_SCOPE_SUBTREE; @@ -851,9 +850,7 @@ static void cfg_read(const char *filename,struct ldap_config *cfg) } 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_boolean(filename,lnr,keyword,&line,&cfg->ldc_usesasl); - 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); } /* Kerberos authentication options */ else if (strcasecmp(keyword,"krb5_ccname")==0) diff --git a/nslcd/cfg.h b/nslcd/cfg.h index 8b30c14..c7674e3 100644 --- a/nslcd/cfg.h +++ b/nslcd/cfg.h @@ -105,8 +105,6 @@ struct ldap_config char *ldc_sasl_mech; /* sasl realm */ char *ldc_sasl_realm; - /* do we use sasl when binding? */ - int ldc_usesasl; /* base DN, eg. dc=gnu,dc=org */ const char *ldc_bases[NSS_LDAP_CONFIG_MAX_BASES]; /* scope for searches */ diff --git a/nslcd/myldap.c b/nslcd/myldap.c index 8d6d0c8..8b92fc2 100644 --- a/nslcd/myldap.c +++ b/nslcd/myldap.c @@ -397,7 +397,7 @@ static int do_bind(MYLDAP_SESSION *session,const char *uri) } #ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S /* TODO: store this information in the session */ - if (!nslcd_cfg->ldc_usesasl) + if (nslcd_cfg->ldc_sasl_mech==NULL) { #endif /* HAVE_LDAP_SASL_INTERACTIVE_BIND_S */ /* do a simple bind */ |