← Back to branch summary

~ubuntu-branches/ubuntu/hardy/lighttpd/hardy

« back to all changes in this revision

Viewing changes to src/mod_auth.c

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2007-05-01 13:15:59 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070501131559-y8jos9wp79uf3pp4
Tags: 1.4.15-1ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
  - Add fam/gamin stat cache engine support
  - Clean environment in init.d script
  - Replace Depends: on perl with Depends: on libterm-readline-perl-perl
  - Make sure that upgrades succeed, even if we can't restart lighttpd
  - DebianMaintainerField update

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mod_auth.c
113
113
        PATCH(auth_ldap_filter);
114
114
        PATCH(auth_ldap_cafile);
115
115
        PATCH(auth_ldap_starttls);
 
116
        PATCH(auth_ldap_allow_empty_pw);
116
117
#ifdef USE_LDAP
117
118
        PATCH(ldap);
118
119
        PATCH(ldap_filter_pre);
160
161
                                PATCH(auth_ldap_cafile);
161
162
                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.starttls"))) {
162
163
                                PATCH(auth_ldap_starttls);
 
164
                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.allow-empty-pw"))) {
 
165
                                PATCH(auth_ldap_allow_empty_pw);
163
166
                        }
164
167
                }
165
168
        }
312
315
                { "auth.backend.ldap.starttls",     NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },
313
316
                { "auth.backend.ldap.bind-dn",      NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
314
317
                { "auth.backend.ldap.bind-pw",      NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 10 */
 
318
                { "auth.backend.ldap.allow-empty-pw",     NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },
315
319
                { "auth.backend.htdigest.userfile", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
316
320
                { "auth.backend.htpasswd.userfile", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
317
321
                { "auth.debug",                     NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },  /* 13 */
359
363
                cv[6].destination = s->auth_ldap_filter;
360
364
                cv[7].destination = s->auth_ldap_cafile;
361
365
                cv[8].destination = &(s->auth_ldap_starttls);
362
 
                cv[9].destination = s->auth_ldap_binddn;
363
 
                cv[10].destination = s->auth_ldap_bindpw;
364
 
                cv[11].destination = s->auth_htdigest_userfile;
365
 
                cv[12].destination = s->auth_htpasswd_userfile;
366
 
                cv[13].destination = &(s->auth_debug);
 
366
                cv[9].destination = s->auth_ldap_binddn;
 
367
                cv[10].destination = s->auth_ldap_bindpw;
 
368
                cv[11].destination = &(s->auth_ldap_allow_empty_pw);
 
369
                cv[12].destination = s->auth_htdigest_userfile;
 
370
                cv[13].destination = s->auth_htpasswd_userfile;
 
371
                cv[14].destination = &(s->auth_debug);
367
372
 
368
373
                p->config_storage[i] = s;
369
374
                ca = ((data_config *)srv->config_context->data[i])->value;