From 5bce1be447b864ba6e788754c71d479a8aedc9e3 Mon Sep 17 00:00:00 2001
From: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun, 28 Oct 2007 11:39:27 +0000
Subject: remove support for nss_connect_policy configfile option and remove
 some supporting code for it

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@469 ef36b2f9-881f-0410-afb5-c4e39611909c
---
 man/nss-ldapd.conf.5.xml |  9 ---------
 nslcd/cfg.c              | 15 ---------------
 nslcd/cfg.h              |  8 --------
 nslcd/ldap-nss.c         |  2 --
 4 files changed, 34 deletions(-)

diff --git a/man/nss-ldapd.conf.5.xml b/man/nss-ldapd.conf.5.xml
index 62385b8..278e707 100644
--- a/man/nss-ldapd.conf.5.xml
+++ b/man/nss-ldapd.conf.5.xml
@@ -436,15 +436,6 @@
       policies block with exponential backoff before retrying.</para>
      </listitem>
     </varlistentry>
-
-    <varlistentry>
-     <term><emphasis remap="B">nss_connect_policy &lt;persist|oneshot&gt;</emphasis></term>
-     <listitem>
-      <para>Determines whether nss_ldap persists connections. The default
-      is for the connection to the LDAP server to remain open after
-      the first request.</para>
-     </listitem>
-    </varlistentry>
 -->
 
     <varlistentry>
diff --git a/nslcd/cfg.c b/nslcd/cfg.c
index b328efa..82f8090 100644
--- a/nslcd/cfg.c
+++ b/nslcd/cfg.c
@@ -58,12 +58,6 @@ struct ldap_config *nslcd_cfg=NULL;
 /* the maximum number of keywords/options on the line */
 #define MAX_LINE_OPTIONS         10
 
-int _nss_ldap_test_config_flag(unsigned int flag)
-{
-  return nslcd_cfg != NULL &&
-         (nslcd_cfg->ldc_flags&flag);
-}
-
 /* clear the configuration information back to the defaults */
 static void cfg_defaults(struct ldap_config *cfg)
 {
@@ -578,15 +572,6 @@ static void cfg_read(const char *filename,struct ldap_config *cfg)
       else if (strcasecmp(opts[1],"soft")==0)
         cfg->ldc_reconnect_pol=LP_RECONNECT_SOFT;
     }
-    else if (strcasecmp(opts[0],"nss_connect_policy")==0)
-    {
-      log_log(LOG_WARNING,"%s:%d: option %s is currently untested (and may be removed in an upcoming release)",filename,lnr,opts[0]);
-      check_argumentcount(filename,lnr,opts[0],nopts==2);
-      if (!strcasecmp(opts[1],"oneshot"))
-        cfg->ldc_flags|=NSS_LDAP_FLAGS_CONNECT_POLICY_ONESHOT;
-      else if (!strcasecmp(opts[1],"persist"))
-        cfg->ldc_flags&=~(NSS_LDAP_FLAGS_CONNECT_POLICY_ONESHOT);
-    }
     else if (strcasecmp(opts[0],"idle_timelimit")==0)
     {
       check_argumentcount(filename,lnr,opts[0],nopts==2);
diff --git a/nslcd/cfg.h b/nslcd/cfg.h
index 4b98681..960714c 100644
--- a/nslcd/cfg.h
+++ b/nslcd/cfg.h
@@ -163,14 +163,6 @@ struct ldap_config
    once cfg_init() was called */
 extern struct ldap_config *nslcd_cfg;
 
-/*
- * Flags that are exposed via _nss_ldap_test_config_flag()
- */
-#define NSS_LDAP_FLAGS_CONNECT_POLICY_ONESHOT   0x0008
-
-int _nss_ldap_test_config_flag(unsigned int flag)
-  MUST_USE;
-
 /* Initialize the configuration in nslcd_cfg. This method
    will read the default configuration file and call exit()
    if an error occurs. */
diff --git a/nslcd/ldap-nss.c b/nslcd/ldap-nss.c
index 917fa21..a088216 100644
--- a/nslcd/ldap-nss.c
+++ b/nslcd/ldap-nss.c
@@ -723,8 +723,6 @@ void _nss_ldap_ent_context_cleanup(struct ent_context *context)
     context->ec_cookie=NULL;
   }
   LS_INIT(context->ec_state);
-  if (_nss_ldap_test_config_flag(NSS_LDAP_FLAGS_CONNECT_POLICY_ONESHOT))
-    do_close(context->session);
 }
 
 /*
-- 
cgit v1.2.3