diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2010-05-08 12:34:06 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2010-05-08 12:34:06 +0200 |
| commit | 9ebb27f28e7d2acbc040defabb4613c935805da3 (patch) | |
| tree | e7736423d5aec3185027ed4e027872504efc9ff3 /nslcd | |
| parent | a034ed2f01a14c4d20904442b2820b1f02e4e67a (diff) | |
rename authz_search option to pam_authz_search
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1089 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd')
| -rw-r--r-- | nslcd/cfg.c | 6 | ||||
| -rw-r--r-- | nslcd/cfg.h | 2 | ||||
| -rw-r--r-- | nslcd/pam.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/nslcd/cfg.c b/nslcd/cfg.c index 7715a3f..3302682 100644 --- a/nslcd/cfg.c +++ b/nslcd/cfg.c @@ -119,7 +119,7 @@ static void cfg_defaults(struct ldap_config *cfg) 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 @@ static void cfg_read(const char *filename,struct ldap_config *cfg) { 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 */ diff --git a/nslcd/cfg.h b/nslcd/cfg.h index 8ff9924..50751a1 100644 --- a/nslcd/cfg.h +++ b/nslcd/cfg.h @@ -137,7 +137,7 @@ struct ldap_config 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 diff --git a/nslcd/pam.c b/nslcd/pam.c index eedb9aa..edc9012 100644 --- a/nslcd/pam.c +++ b/nslcd/pam.c @@ -294,7 +294,7 @@ int nslcd_pam_authz(TFILE *fp,MYLDAP_SESSION *session) 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 @@ int nslcd_pam_authz(TFILE *fp,MYLDAP_SESSION *session) /* 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); |