mirror of
https://github.com/Ponce/slackbuilds
synced 2024-12-10 20:49:31 +01:00
71 lines
2.3 KiB
Diff
71 lines
2.3 KiB
Diff
--- src/mod_auth_kerb.c.orig 2012-06-24 19:10:03.578437625 +0200
|
|
+++ src/mod_auth_kerb.c 2012-06-24 19:12:42.043441805 +0200
|
|
@@ -89,6 +89,7 @@
|
|
#include <krb5.h>
|
|
#ifdef HEIMDAL
|
|
# include <gssapi.h>
|
|
+# include <gssapi/gssapi_krb5.h>
|
|
#else
|
|
# include <gssapi/gssapi.h>
|
|
# include <gssapi/gssapi_generic.h>
|
|
@@ -179,6 +179,16 @@ static apr_global_mutex_t *s4u2proxy_loc
|
|
#define PROXYREQ_PROXY STD_PROXY
|
|
#endif
|
|
|
|
+#if MODULE_MAGIC_NUMBER_MAJOR >= 20100606
|
|
+/* 2.4.x or later */
|
|
+#define WITH_HTTPD24 1
|
|
+#define client_ip(r) ((r)->useragent_ip)
|
|
+APLOG_USE_MODULE(auth_kerb);
|
|
+#else
|
|
+#define client_ip(r) ((r)->connection->remote_ip)
|
|
+#endif
|
|
+
|
|
+
|
|
/***************************************************************************
|
|
Auth Configuration Structure
|
|
***************************************************************************/
|
|
@@ -383,7 +393,11 @@ cmd_delegationlock(cmd_parms *cmd, void
|
|
}
|
|
|
|
static void
|
|
-log_rerror(const char *file, int line, int level, int status,
|
|
+log_rerror(const char *file, int line,
|
|
+#ifdef WITH_HTTPD24
|
|
+ int module_index,
|
|
+#endif
|
|
+ int level, int status,
|
|
const request_rec *r, const char *fmt, ...)
|
|
{
|
|
char errstr[1024];
|
|
@@ -394,7 +408,9 @@ log_rerror(const char *file, int line, i
|
|
va_end(ap);
|
|
|
|
|
|
-#ifdef STANDARD20_MODULE_STUFF
|
|
+#if defined(WITH_HTTPD24)
|
|
+ ap_log_rerror(file, line, module_index, level, status, r, "%s", errstr);
|
|
+#elif defined(STANDARD20_MODULE_STUFF)
|
|
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 *
|
|
char keyname[1024];
|
|
|
|
snprintf(keyname, sizeof(keyname) - 1,
|
|
- "mod_auth_kerb::connection::%s::%ld", r->connection->remote_ip,
|
|
- r->connection->id);
|
|
+ "mod_auth_kerb::connection::%s::%ld", client_ip(r),
|
|
+ r->connection->id);
|
|
|
|
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)
|
|
prevauth->last_return = ret;
|
|
snprintf(keyname, sizeof(keyname) - 1,
|
|
"mod_auth_kerb::connection::%s::%ld",
|
|
- r->connection->remote_ip, r->connection->id);
|
|
+ client_ip(r), r->connection->id);
|
|
apr_pool_userdata_set(prevauth, keyname, NULL, r->connection->pool);
|
|
}
|
|
|