remove some unused configuration file options

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@516 ef36b2f9-881f-0410-afb5-c4e39611909c

2 files changed, 2 insertions, 45 deletions

diff --git a/nslcd/cfg.c b/nslcd/cfg.c
index 76c14c3..7c8c3ba 100644
--- a/nslcd/cfg.c
+++ b/nslcd/cfg.c
@@ -95,7 +95,6 @@ static void cfg_defaults(struct ldap_config *cfg)
   cfg->ldc_timelimit=LDAP_NO_LIMIT;
   cfg->ldc_bind_timelimit=30;
   cfg->ldc_reconnect_pol=LP_RECONNECT_HARD_OPEN;
-  cfg->ldc_flags=0;
   cfg->ldc_idle_timelimit=0;
   cfg->ldc_ssl_on=SSL_OFF;
   cfg->ldc_sslpath=NULL;
@@ -112,8 +111,6 @@ static void cfg_defaults(struct ldap_config *cfg)
   cfg->ldc_reconnect_sleeptime=LDAP_NSS_SLEEPTIME;
   cfg->ldc_reconnect_maxsleeptime=LDAP_NSS_MAXSLEEPTIME;
   cfg->ldc_debug=0;
-  cfg->ldc_password_type=LU_RFC2307_USERPASSWORD;
-  cfg->ldc_shadow_type=LS_RFC2307_SHADOW;
 }
 
 /* simple strdup wrapper */
@@ -439,32 +436,13 @@ static void parse_filter_statement(const char *filename,int lnr,
 
 /* this function modifies the statement argument passed */
 static void parse_map_statement(const char *filename,int lnr,
-                                const char **opts,int nopts,
-                                struct ldap_config *cfg)
+                                const char **opts,int nopts)
 {
   enum ldap_map_selector map;
   const char **var;
   check_argumentcount(filename,lnr,opts[0],nopts==4);
   /* get the map */
   map=parse_map(filename,lnr,opts[1]);
-  /* special handling for some attribute mappings */
-  /* TODO: move this stuff to passwd.c or shadow.c or wherever it's used */
-  if ((map==LM_PASSWD)&&(strcasecmp(opts[2],"userPassword")==0))
-  {
-    if (strcasecmp(opts[3],"userPassword")==0)
-      cfg->ldc_password_type=LU_RFC2307_USERPASSWORD;
-    else if (strcasecmp(opts[3],"authPassword")==0)
-      cfg->ldc_password_type=LU_RFC3112_AUTHPASSWORD;
-    else
-      cfg->ldc_password_type=LU_OTHER_PASSWORD;
-  }
-  else if ((map==LM_SHADOW)&&(strcasecmp(opts[2],"shadowLastChange")==0))
-  {
-    if (strcasecmp(opts[3],"shadowLastChange")==0)
-      cfg->ldc_shadow_type=LS_RFC2307_SHADOW;
-    else if (strcasecmp(opts[3],"pwdLastSet")==0)
-      cfg->ldc_shadow_type=LS_AD_SHADOW;
-  }
   /* get the attribute variable to set */
   var=attmap_get_var(map,opts[2]);
   if (var==NULL)
@@ -679,7 +657,7 @@ static void cfg_read(const char *filename,struct ldap_config *cfg)
     }
     else if (strcasecmp(opts[0],"map")==0)
     {
-      parse_map_statement(filename,lnr,opts,nopts,cfg);
+      parse_map_statement(filename,lnr,opts,nopts);
     }
     /* timing/reconnect options */
     else if (strcasecmp(opts[0],"timelimit")==0)
diff --git a/nslcd/cfg.h b/nslcd/cfg.h
index 57505e5..fa3bfda 100644
--- a/nslcd/cfg.h
+++ b/nslcd/cfg.h
@@ -45,19 +45,6 @@ enum ldap_reconnect_policy
   LP_RECONNECT_SOFT
 };
 
-enum ldap_userpassword_selector
-{
-  LU_RFC2307_USERPASSWORD,
-  LU_RFC3112_AUTHPASSWORD,
-  LU_OTHER_PASSWORD
-};
-
-enum ldap_shadow_selector
-{
-  LS_RFC2307_SHADOW,
-  LS_AD_SHADOW
-};
-
 /* selectors for different maps */
 enum ldap_map_selector
 {
@@ -113,8 +100,6 @@ struct ldap_config
   int ldc_bind_timelimit;
   /* reconnect policy */
   enum ldap_reconnect_policy ldc_reconnect_pol;
-  /* for nss_connect_policy */
-  unsigned int ldc_flags;
   /* idle timeout */
   time_t ldc_idle_timelimit;
   /* SSL enabled */
@@ -147,12 +132,6 @@ struct ldap_config
   int ldc_reconnect_maxsleeptime;
   /* LDAP debug level */
   int ldc_debug;
-  /* is userPassword "userPassword" or not? ie. do we need {crypt} to be stripped
-     (silently set when mapping is done) TODO: replace this with some runtime detection */
-  enum ldap_userpassword_selector ldc_password_type;
-  /* Use active directory time offsets?
-     (silently set when mapping is done) TODO: replace this with some runtime detection */
-  enum ldap_shadow_selector ldc_shadow_type;
 };
 
 /* this is a pointer to the global configuration, it should be available