Line
Link Here
|
|
Fix for API changes in apache 2.4. |
|
Fix for API changes in apache 2.4. |
1 |
-- libapache2-mod-auth-tkt-2.1.0.orig/src/mod_auth_tkt.c |
1 |
++ libapache2-mod-auth-tkt-2.1.0/src/mod_auth_tkt.c |
Lines 6-11
Link Here
|
6 |
#include "http_config.h" |
6 |
#include "http_config.h" |
7 |
#include "http_log.h" |
7 |
#include "http_log.h" |
8 |
#include "http_core.h" |
8 |
#include "http_core.h" |
|
|
9 |
#include "http_request.h" |
9 |
#include "http_protocol.h" |
10 |
#include "http_protocol.h" |
10 |
#include "util_md5.h" |
11 |
#include "util_md5.h" |
11 |
#include "sha2.h" |
12 |
#include "sha2.h" |
Lines 798-804
ticket_digest(request_rec *r, auth_tkt *
Link Here
|
798 |
unsigned char *buf2 = apr_palloc(r->pool, sconf->digest_sz + strlen(secret)); |
799 |
unsigned char *buf2 = apr_palloc(r->pool, sconf->digest_sz + strlen(secret)); |
799 |
int len = 0; |
800 |
int len = 0; |
800 |
char *digest = NULL; |
801 |
char *digest = NULL; |
|
|
802 |
#if AP_MODULE_MAGIC_AT_LEAST(20111130,0) |
803 |
char *remote_ip = conf->ignore_ip > 0 ? "0.0.0.0" : r->connection->client_ip; |
804 |
#else |
801 |
char *remote_ip = conf->ignore_ip > 0 ? "0.0.0.0" : r->connection->remote_ip; |
805 |
char *remote_ip = conf->ignore_ip > 0 ? "0.0.0.0" : r->connection->remote_ip; |
|
|
806 |
#endif |
802 |
unsigned long ip; |
807 |
unsigned long ip; |
803 |
struct in_addr ia; |
808 |
struct in_addr ia; |
804 |
char *d; |
809 |
char *d; |
Lines 1575-1581
static void
Link Here
|
1575 |
auth_tkt_register_hooks (apr_pool_t *p) |
1580 |
auth_tkt_register_hooks (apr_pool_t *p) |
1576 |
{ |
1581 |
{ |
1577 |
ap_hook_post_config(auth_tkt_version, NULL, NULL, APR_HOOK_MIDDLE); |
1582 |
ap_hook_post_config(auth_tkt_version, NULL, NULL, APR_HOOK_MIDDLE); |
|
|
1583 |
#if AP_MODULE_MAGIC_AT_LEAST(20080403,1) |
1584 |
ap_hook_check_authn(auth_tkt_check, NULL, NULL, APR_HOOK_FIRST, AP_AUTH_INTERNAL_PER_CONF); |
1585 |
#else |
1578 |
ap_hook_check_user_id(auth_tkt_check, NULL, NULL, APR_HOOK_FIRST); |
1586 |
ap_hook_check_user_id(auth_tkt_check, NULL, NULL, APR_HOOK_FIRST); |
|
|
1587 |
#endif |
1579 |
} |
1588 |
} |
1580 |
|
1589 |
|
1581 |
/* Declare and populate the main module data structure */ |
1590 |
/* Declare and populate the main module data structure */ |