nss-pam-ldapd commit: r1889 - nss-pam-ldapd/nslcd

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Sun Dec 30 15:14:34 2012
New Revision: 1889
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1889&view=revision

Log:
remove undocumented restart configuration option

Modified:
   nss-pam-ldapd/nslcd/cfg.c
   nss-pam-ldapd/nslcd/cfg.h
   nss-pam-ldapd/nslcd/myldap.c

Modified: nss-pam-ldapd/nslcd/cfg.c
==============================================================================
--- nss-pam-ldapd/nslcd/cfg.c   Sun Dec 30 15:13:35 2012        (r1888)
+++ nss-pam-ldapd/nslcd/cfg.c   Sun Dec 30 15:14:34 2012        (r1889)
@@ -138,7 +138,6 @@
   for (i = 0; i < NSS_LDAP_CONFIG_MAX_AUTHZ_SEARCHES; i++)
     cfg->pam_authz_searches[i] = NULL;
   cfg->pam_password_prohibit_message = NULL;
-  cfg->restart = 1;
 }
 
 /* simple strdup wrapper */
@@ -1197,13 +1196,6 @@
     }
 #endif /* LDAP_OPT_X_TLS */
     /* other options */
-    else if (strcasecmp(keyword, "restart") == 0)
-    {
-      log_log(LOG_WARNING, "%s:%d: option %s is currently untested (and may be 
removed in an upcoming release)",
-              filename, lnr, keyword);
-      get_boolean(filename, lnr, keyword, &line, &cfg->restart);
-      get_eol(filename, lnr, keyword, &line);
-    }
     else if (strcasecmp(keyword, "pagesize") == 0)
     {
       get_int(filename, lnr, keyword, &line, &cfg->pagesize);

Modified: nss-pam-ldapd/nslcd/cfg.h
==============================================================================
--- nss-pam-ldapd/nslcd/cfg.h   Sun Dec 30 15:13:35 2012        (r1888)
+++ nss-pam-ldapd/nslcd/cfg.h   Sun Dec 30 15:14:34 2012        (r1889)
@@ -123,8 +123,6 @@
   int ignorecase; /* whether or not case should be ignored in lookups */
   char *pam_authz_searches[NSS_LDAP_CONFIG_MAX_AUTHZ_SEARCHES]; /* the 
searches that should be performed to do autorisation checks */
   char *pam_password_prohibit_message;   /* whether password changing should 
be denied and user prompted with this message */
-
-  int restart;  /* whether the LDAP library should restart the select(2) 
system call when interrupted */
 };
 
 /* this is a pointer to the global configuration, it should be available

Modified: nss-pam-ldapd/nslcd/myldap.c
==============================================================================
--- nss-pam-ldapd/nslcd/myldap.c        Sun Dec 30 15:13:35 2012        (r1888)
+++ nss-pam-ldapd/nslcd/myldap.c        Sun Dec 30 15:14:34 2012        (r1889)
@@ -670,10 +670,8 @@
           nslcd_cfg->referrals ? "LDAP_OPT_ON" : "LDAP_OPT_OFF");
   LDAP_SET_OPTION(session->ld, LDAP_OPT_REFERRALS,
                   nslcd_cfg->referrals ? LDAP_OPT_ON : LDAP_OPT_OFF);
-  log_log(LOG_DEBUG, "ldap_set_option(LDAP_OPT_RESTART,%s)",
-          nslcd_cfg->restart ? "LDAP_OPT_ON" : "LDAP_OPT_OFF");
-  LDAP_SET_OPTION(session->ld, LDAP_OPT_RESTART,
-                  nslcd_cfg->restart ? LDAP_OPT_ON : LDAP_OPT_OFF);
+  log_log(LOG_DEBUG, "ldap_set_option(LDAP_OPT_RESTART,%s)", LDAP_OPT_ON);
+  LDAP_SET_OPTION(session->ld, LDAP_OPT_RESTART, LDAP_OPT_ON);
 #ifdef LDAP_OPT_CONNECT_CB
   /* register a connection callback */
   cb.lc_add = connect_cb;
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/