diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2007-07-24 08:40:19 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2007-07-24 08:40:19 +0200 |
| commit | 58c040f93c5d4ed769149def21110f30473618a5 (patch) | |
| tree | f71509f83c5dac5cf6dcd5c85369d7882015720c /nslcd/cfg.c | |
| parent | f7987dfc5745fb6255fdbd2f095f3f17d8a676d6 (diff) | |
get rid of dnsconfig stuff since that probably didn't work anyway and it cleans up some stuff
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@323 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/cfg.c')
| -rw-r--r-- | nslcd/cfg.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/nslcd/cfg.c b/nslcd/cfg.c index 5b7847b..6fae4b8 100644 --- a/nslcd/cfg.c +++ b/nslcd/cfg.c @@ -36,7 +36,6 @@ #include "ldap-nss.h" #include "util.h" #include "log.h" -#include "dnsconfig.h" struct ldap_config *nslcd_cfg=NULL; @@ -97,7 +96,6 @@ struct ldap_config *nslcd_cfg=NULL; #define NSS_LDAP_KEY_PAGED_RESULTS "nss_paged_results" #define NSS_LDAP_KEY_SCHEMA "nss_schema" -#define NSS_LDAP_KEY_SRV_DOMAIN "nss_srv_domain" #define NSS_LDAP_KEY_CONNECT_POLICY "nss_connect_policy" /* @@ -154,7 +152,6 @@ static enum nss_status _nss_ldap_init_config(struct ldap_config *result) result->ldc_idle_timelimit = 0; result->ldc_reconnect_pol = LP_RECONNECT_HARD_OPEN; result->ldc_sasl_secprops = NULL; - result->ldc_srv_domain = NULL; result->ldc_logdir = NULL; result->ldc_debug = 0; result->ldc_pagesize = LDAP_PAGESIZE; @@ -880,10 +877,6 @@ static enum nss_status _nss_ldap_readconfig(struct ldap_config ** presult, char result->ldc_flags &= ~(NSS_LDAP_FLAGS_CONNECT_POLICY_ONESHOT); } } - else if (!strcasecmp (k, NSS_LDAP_KEY_SRV_DOMAIN)) - { - t = &result->ldc_srv_domain; - } else { /* @@ -981,11 +974,6 @@ int cfg_init(void) configbufp=configbuf; configbuflen=sizeof(configbuf); retv=_nss_ldap_readconfig(&nslcd_cfg,&configbufp,&configbuflen); - if (retv==NSS_STATUS_NOTFOUND) - { - /* config was read but no host information specified; try DNS */ - retv=_nss_ldap_mergeconfigfromdns(nslcd_cfg,&configbufp,&configbuflen); - } if (retv!=NSS_STATUS_SUCCESS) { log_log(LOG_DEBUG,"cfg_init() failed to read config"); |