nss-pam-ldapd commit: r1089 - in nss-pam-ldapd: man nslcd

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

Author: arthur
Date: Sat May  8 12:34:06 2010
New Revision: 1089
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1089

Log:
rename authz_search option to pam_authz_search

Modified:
   nss-pam-ldapd/man/nslcd.conf.5.xml
   nss-pam-ldapd/nslcd/cfg.c
   nss-pam-ldapd/nslcd/cfg.h
   nss-pam-ldapd/nslcd/pam.c

Modified: nss-pam-ldapd/man/nslcd.conf.5.xml
==============================================================================
--- nss-pam-ldapd/man/nslcd.conf.5.xml  Fri May  7 23:45:06 2010        (r1088)
+++ nss-pam-ldapd/man/nslcd.conf.5.xml  Sat May  8 12:34:06 2010        (r1089)
@@ -643,7 +643,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>authz_search</option>
+     <term><option>pam_authz_search</option>
            <replaceable>FILTER</replaceable></term>
      <listitem>
       <para>

Modified: nss-pam-ldapd/nslcd/cfg.c
==============================================================================
--- nss-pam-ldapd/nslcd/cfg.c   Fri May  7 23:45:06 2010        (r1088)
+++ nss-pam-ldapd/nslcd/cfg.c   Sat May  8 12:34:06 2010        (r1089)
@@ -119,7 +119,7 @@
   cfg->ldc_restart=1;
   cfg->ldc_pagesize=0;
   cfg->ldc_nss_initgroups_ignoreusers=NULL;
-  cfg->ldc_authz_search=NULL;
+  cfg->ldc_pam_authz_search=NULL;
 }
 
 /* simple strdup wrapper */
@@ -1021,10 +1021,10 @@
     {
       
parse_nss_initgroups_ignoreusers_statement(filename,lnr,keyword,line,cfg);
     }
-    else if (strcasecmp(keyword,"authz_search")==0)
+    else if (strcasecmp(keyword,"pam_authz_search")==0)
     {
       check_argumentcount(filename,lnr,keyword,(line!=NULL)&&(*line!='\0'));
-      cfg->ldc_authz_search=xstrdup(line);
+      cfg->ldc_pam_authz_search=xstrdup(line);
     }
 #ifdef ENABLE_CONFIGFILE_CHECKING
     /* fallthrough */

Modified: nss-pam-ldapd/nslcd/cfg.h
==============================================================================
--- nss-pam-ldapd/nslcd/cfg.h   Fri May  7 23:45:06 2010        (r1088)
+++ nss-pam-ldapd/nslcd/cfg.h   Sat May  8 12:34:06 2010        (r1089)
@@ -137,7 +137,7 @@
      Note: because we use a set here comparisons will be case-insensitive */
   SET *ldc_nss_initgroups_ignoreusers;
   /* the search that should be performed to do autorisation checks */
-  char *ldc_authz_search;
+  char *ldc_pam_authz_search;
 };
 
 /* this is a pointer to the global configuration, it should be available

Modified: nss-pam-ldapd/nslcd/pam.c
==============================================================================
--- nss-pam-ldapd/nslcd/pam.c   Fri May  7 23:45:06 2010        (r1088)
+++ nss-pam-ldapd/nslcd/pam.c   Sat May  8 12:34:06 2010        (r1089)
@@ -294,7 +294,7 @@
     WRITE_INT32(fp,NSLCD_RESULT_END);
     return -1;
   }
-  if (nslcd_cfg->ldc_authz_search)
+  if (nslcd_cfg->ldc_pam_authz_search)
   {
     /* TODO: perform any authorisation checks */
     dict=dict_new();
@@ -308,7 +308,7 @@
     /* TODO: fqdn */
     autzsearch_var_add(dict,"dn",userdn);
     autzsearch_var_add(dict,"uid",username);
-    if (try_autzsearch(session,dict,nslcd_cfg->ldc_authz_search))
+    if (try_autzsearch(session,dict,nslcd_cfg->ldc_pam_authz_search))
     {
       log_log(LOG_DEBUG,"LDAP authorisation check failed");
       WRITE_INT32(fp,NSLCD_RESULT_BEGIN);
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits