From f89d9ac364ffdd00352d55a5f9ed840c22332dab Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 17 Dec 2014 21:30:39 -0500
Subject: remove unused cfg stuff

---
 man/nslcd.conf.5.xml.in | 28 +++-------------------------
 nslcd.conf              |  2 --
 nslcd/cfg.c             |  7 -------
 nslcd/cfg.h             |  1 -
 4 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/man/nslcd.conf.5.xml.in b/man/nslcd.conf.5.xml.in
index b660aa1..42b6cfb 100644
--- a/man/nslcd.conf.5.xml.in
+++ b/man/nslcd.conf.5.xml.in
@@ -86,14 +86,11 @@
     </varlistentry>
 
     <varlistentry id="log"> <!-- since 0.9 -->
-     <term><option>log</option> <replaceable>SCHEME</replaceable> <optional><replaceable>LEVEL</replaceable></optional></term>
+     <term><option>log</option> <replaceable>LEVEL</replaceable></term>
      <listitem>
       <para>
        This option controls the way logging is done.
-       The <replaceable>SCHEME</replaceable> argument may either be
-       <literal>none</literal>, <literal>syslog</literal> or an absolute
-       file name.
-       The <replaceable>LEVEL</replaceable> argument is optional and specifies
+       The <replaceable>LEVEL</replaceable> argument specifies
        the log level.
        The log level may be one of: <literal>crit</literal>,
        <literal>error</literal>, <literal>warning</literal>,
@@ -101,7 +98,7 @@
        <literal>debug</literal>. The default log level is <literal>info</literal>.
        All messages with the specified loglevel or higher are logged.
        This option can be supplied multiple times.
-       If this option is omitted <literal>syslog info</literal> is assumed.
+       If this option is omitted <literal>info</literal> is assumed.
       </para>
      </listitem>
     </varlistentry>
@@ -129,25 +126,6 @@
    <title>Other options</title>
    <variablelist>
 
-    <varlistentry id="pagesize"> <!-- since 0.3 -->
-     <term><option>pagesize</option> <replaceable>NUMBER</replaceable></term>
-     <listitem>
-      <para>
-       Set this to a number greater than 0 to request paged results from
-       the <acronym>LDAP</acronym> server in accordance with RFC2696.
-       The default (0) is to not request paged results.
-      </para>
-      <para>
-       This is useful for <acronym>LDAP</acronym> servers that contain a
-       lot of entries (e.g. more than 500) and limit the number of entries
-       that are returned with one request.
-       For OpenLDAP servers you may need to set
-       <option>sizelimit size.prtotal=unlimited</option>
-       for allowing more entries to be returned over multiple pages.
-      </para>
-     </listitem>
-    </varlistentry>
-
     <varlistentry id="nss_initgroups_ignoreusers"> <!-- since 0.7.4 -->
      <term><option>nss_initgroups_ignoreusers</option> user1,user2,...</term>
      <listitem>
diff --git a/nslcd.conf b/nslcd.conf
index 9ee5853..5f1be5f 100644
--- a/nslcd.conf
+++ b/nslcd.conf
@@ -3,5 +3,3 @@
 # between NSS names (see /etc/nsswitch.conf) and LDAP
 # information in the directory.
 # See the manual page nslcd.conf(5) for more information.
-
-yamldir /var/cache/parabola-hackers
diff --git a/nslcd/cfg.c b/nslcd/cfg.c
index 97c4a1b..dc31c6b 100644
--- a/nslcd/cfg.c
+++ b/nslcd/cfg.c
@@ -458,7 +458,6 @@ static void cfg_defaults(struct nslcd_config *cfg)
   memset(cfg, 0, sizeof(struct nslcd_config));
   handle_yamldir(__FILE__, __LINE__, "", "/var/cache/parabola-hackers/users", cfg);
   cfg->threads = 5;
-  cfg->pagesize = 0;
   cfg->nss_initgroups_ignoreusers = NULL;
   cfg->nss_min_uid = 0;
   cfg->nss_nested_groups = 0;
@@ -526,11 +525,6 @@ static void cfg_read(const char *filename, struct nslcd_config *cfg)
       handle_yamldir(filename, lnr, keyword, line, cfg);
     }
     /* other options */
-    else if (strcasecmp(keyword, "pagesize") == 0)
-    {
-      cfg->pagesize = get_int(filename, lnr, keyword, &line);
-      get_eol(filename, lnr, keyword, &line);
-    }
     else if (strcasecmp(keyword, "nss_initgroups_ignoreusers") == 0)
     {
       handle_nss_initgroups_ignoreusers(filename, lnr, keyword, line,
@@ -585,7 +579,6 @@ static void cfg_dump(void)
   log_log(LOG_DEBUG, "CFG: threads %d", nslcd_cfg->threads);
   log_log_config();
 
-  log_log(LOG_DEBUG, "CFG: pagesize %d", nslcd_cfg->pagesize);
   if (nslcd_cfg->nss_initgroups_ignoreusers != NULL)
   {
     /* allocate memory for a comma-separated list */
diff --git a/nslcd/cfg.h b/nslcd/cfg.h
index 9a76084..e03240f 100644
--- a/nslcd/cfg.h
+++ b/nslcd/cfg.h
@@ -54,7 +54,6 @@ struct nslcd_config {
 
   int threads;    /* the number of threads to start */
 
-  int pagesize; /* set to a greater than 0 to enable handling of paged results with the specified size */
   SET *nss_initgroups_ignoreusers;  /* the users for which no initgroups() searches should be done */
   uid_t nss_min_uid;  /* minimum uid for users retrieved */
   bool nss_nested_groups; /* whether to expand nested groups */
-- 
cgit v1.2.2