]>
Commit | Line | Data |
---|---|---|
893d52a7 JB |
1 | --- mod_authn_pam.orig/src/mod_authn_pam.c 2003-11-11 10:16:17.000000000 +0100 |
2 | +++ mod_authn_pam/src/mod_authn_pam.c 2006-04-26 19:05:21.000000000 +0200 | |
3 | @@ -92,6 +92,7 @@ | |
4 | ||
5 | typedef struct { | |
6 | int fail_delay; /* fail delay in ms -- needs library support */ | |
7 | + const char *service; /* service name to use for PAM authentication */ | |
8 | } authn_pam_dir_config; | |
9 | ||
10 | static | |
11 | @@ -114,6 +115,7 @@ | |
12 | (authn_pam_dir_config *) apr_palloc(p, sizeof(authn_pam_dir_config)); | |
13 | ||
14 | new->fail_delay = 0; /* 0 ms */ | |
15 | + new->service = pam_servicename; /* httpd */ | |
16 | return new; | |
17 | } | |
18 | ||
19 | @@ -125,6 +127,11 @@ | |
20 | "number of micro seconds to wait after failed authentication " | |
21 | "attempt. (default is 0.)"), | |
22 | ||
23 | + AP_INIT_TAKE1("AuthnPAMService", | |
24 | + ap_set_string_slot, (void *) APR_OFFSETOF(authn_pam_dir_config, service), | |
25 | + OR_AUTHCFG, | |
26 | + "PAM service name to use for authentication. (default is httpd.)"), | |
27 | + | |
28 | {NULL} | |
29 | }; | |
30 | ||
31 | @@ -216,7 +223,7 @@ | |
32 | userinfo.name = (char*)user; | |
33 | userinfo.pw = (char*)password; | |
34 | ||
35 | - if ((res = pam_start(pam_servicename, | |
36 | + if ((res = pam_start(conf->service, | |
37 | userinfo.name, | |
38 | &conv_info, | |
39 | &pamh)) != PAM_SUCCESS) { |