diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2008-04-04 23:26:23 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2008-04-04 23:26:23 +0200 |
| commit | 9faded4d9b891dc7c26dcd5862680fe99c81c412 (patch) | |
| tree | e613dfa7c717542c266ed3339c1fa2835d630074 /nslcd/cfg.c | |
| parent | 255b5eb1289823ffaaabe93445bd232c8dc8144a (diff) | |
remove code that handles special cases when calling as root (removing rootbinddn, rootbindpw, rootuse_sasl and rootsasl_authid options)
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@653 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/cfg.c')
| -rw-r--r-- | nslcd/cfg.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/nslcd/cfg.c b/nslcd/cfg.c index e114b7c..21b8d56 100644 --- a/nslcd/cfg.c +++ b/nslcd/cfg.c @@ -71,13 +71,9 @@ static void cfg_defaults(struct ldap_config *cfg) #endif /* not LDAP_VERSION3 */ cfg->ldc_binddn=NULL; cfg->ldc_bindpw=NULL; - cfg->ldc_rootbinddn=NULL; - cfg->ldc_rootbindpw=NULL; cfg->ldc_saslid=NULL; - cfg->ldc_rootsaslid=NULL; cfg->ldc_sasl_secprops=NULL; cfg->ldc_usesasl=0; - cfg->ldc_rootusesasl=0; cfg->ldc_base=NULL; cfg->ldc_scope=LDAP_SCOPE_SUBTREE; cfg->ldc_deref=LDAP_DEREF_NEVER; @@ -620,18 +616,6 @@ static void cfg_read(const char *filename,struct ldap_config *cfg) { get_restdup(filename,lnr,keyword,&line,&cfg->ldc_bindpw); } - else if (strcasecmp(keyword,"rootbinddn")==0) - { - log_log(LOG_ERR,"%s:%d: option %s is currently unsupported",filename,lnr,keyword); - exit(EXIT_FAILURE); - get_restdup(filename,lnr,keyword,&line,&cfg->ldc_rootbinddn); - } - else if (strcasecmp(keyword,"rootbindpw")==0) - { - log_log(LOG_ERR,"%s:%d: option %s is currently unsupported",filename,lnr,keyword); - exit(EXIT_FAILURE); - get_restdup(filename,lnr,keyword,&line,&cfg->ldc_rootbinddn); - } /* SASL authentication options */ else if (strcasecmp(keyword,"sasl_authid")==0) { @@ -639,13 +623,6 @@ static void cfg_read(const char *filename,struct ldap_config *cfg) get_strdup(filename,lnr,keyword,&line,&cfg->ldc_saslid); get_eol(filename,lnr,keyword,&line); } - else if (strcasecmp(keyword,"rootsasl_authid")==0) - { - log_log(LOG_ERR,"%s:%d: option %s is currently unsupported",filename,lnr,keyword); - exit(EXIT_FAILURE); - get_strdup(filename,lnr,keyword,&line,&cfg->ldc_rootsaslid); - get_eol(filename,lnr,keyword,&line); - } else if (strcasecmp(keyword,"sasl_secprops")==0) { log_log(LOG_WARNING,"%s:%d: option %s is currently untested (please report any successes)",filename,lnr,keyword); @@ -658,13 +635,6 @@ static void cfg_read(const char *filename,struct ldap_config *cfg) get_boolean(filename,lnr,keyword,&line,&cfg->ldc_usesasl); get_eol(filename,lnr,keyword,&line); } - else if (strcasecmp(keyword,"rootuse_sasl")==0) - { - log_log(LOG_ERR,"%s:%d: option %s is currently unsupported",filename,lnr,keyword); - exit(EXIT_FAILURE); - get_boolean(filename,lnr,keyword,&line,&cfg->ldc_rootusesasl); - get_eol(filename,lnr,keyword,&line); - } /* Kerberos authentication options */ else if (strcasecmp(keyword,"krb5_ccname")==0) { |