diff options
Diffstat (limited to 'main/apache-mod-auth-kerb/mod_auth_kerb-5.4-httpd24.patch')
| -rw-r--r-- | main/apache-mod-auth-kerb/mod_auth_kerb-5.4-httpd24.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/main/apache-mod-auth-kerb/mod_auth_kerb-5.4-httpd24.patch b/main/apache-mod-auth-kerb/mod_auth_kerb-5.4-httpd24.patch index 4f2c088722..673eaa8cea 100644 --- a/main/apache-mod-auth-kerb/mod_auth_kerb-5.4-httpd24.patch +++ b/main/apache-mod-auth-kerb/mod_auth_kerb-5.4-httpd24.patch @@ -1,6 +1,6 @@ ---- mod_auth_kerb-5.4/src/mod_auth_kerb.c.httpd24 -+++ mod_auth_kerb-5.4/src/mod_auth_kerb.c -@@ -179,6 +179,16 @@ static apr_global_mutex_t *s4u2proxy_loc +--- a/src/mod_auth_kerb.c ++++ b/src/mod_auth_kerb.c +@@ -147,6 +147,16 @@ #define PROXYREQ_PROXY STD_PROXY #endif @@ -17,7 +17,7 @@ /*************************************************************************** Auth Configuration Structure ***************************************************************************/ -@@ -383,7 +393,11 @@ cmd_delegationlock(cmd_parms *cmd, void +@@ -348,7 +358,11 @@ } static void @@ -30,7 +30,7 @@ const request_rec *r, const char *fmt, ...) { char errstr[1024]; -@@ -394,7 +408,9 @@ log_rerror(const char *file, int line, i +@@ -359,7 +373,9 @@ va_end(ap); @@ -41,7 +41,7 @@ ap_log_rerror(file, line, level | APLOG_NOERRNO, status, r, "%s", errstr); #else ap_log_rerror(file, line, level | APLOG_NOERRNO, r, "%s", errstr); -@@ -1860,8 +1876,8 @@ already_succeeded(request_rec *r, char * +@@ -1555,8 +1571,8 @@ char keyname[1024]; snprintf(keyname, sizeof(keyname) - 1, @@ -52,7 +52,7 @@ if (apr_pool_userdata_get((void**)&conn_data, keyname, r->connection->pool) != 0) return NULL; -@@ -2014,7 +2030,7 @@ kerb_authenticate_user(request_rec *r) +@@ -1709,7 +1725,7 @@ prevauth->last_return = ret; snprintf(keyname, sizeof(keyname) - 1, "mod_auth_kerb::connection::%s::%ld", @@ -60,3 +60,4 @@ + client_ip(r), r->connection->id); apr_pool_userdata_set(prevauth, keyname, NULL, r->connection->pool); } + |