#define MK_POOL apr_pool_t
#define MK_TABLE_GET apr_table_get
#define MK_TABLE_SET apr_table_set
-#include "unixd.h"
-extern unixd_config_rec unixd_config;
-#define ap_user_id unixd_config.user_id
-#define ap_group_id unixd_config.group_id
-#define ap_user_name unixd_config.user_name
#define command(name, func, var, type, usage) \
AP_INIT_ ## type (name, (void*) func, \
NULL, \
typedef struct { int dummy; } child_info;
const char *userdata_key = "waklog_init";
+/* Apache 2.4 */
+#ifdef APLOG_USE_MODULE
+APLOG_USE_MODULE(waklog);
+#endif
+
#endif /* APACHE2 */
/**************************************************************************************************/
#include <afs/auth.h>
#include <afs/dirpath.h>
#include <afs/ptuser.h>
+#include <afs/com_err.h>
#include <rx/rxkad.h>
#define TKT_LIFE ( 12 * 60 * 60 )
#define getModConfig(P, X) P = (waklog_config *) ap_get_module_config( (X)->module_config, &waklog_module );
+#ifdef APLOG_USE_MODULE
+static void
+log_error (const char *file, int line, int module_index, int level, int status,
+ const server_rec * s, const char *fmt, ...)
+#else
static void
log_error (const char *file, int line, int level, int status,
const server_rec * s, const char *fmt, ...)
+#endif
{
char errstr[4096];
va_list ap;
va_end (ap);
#ifdef APACHE2
+ #ifdef APLOG_USE_MODULE
+ /* Apache 2.4 */
+ ap_log_error (file, line, module_index, level | APLOG_NOERRNO, status, s, "%s", errstr);
+ #else
ap_log_error (file, line, level | APLOG_NOERRNO, status, s, "(%d) %s", getpid(), errstr);
+ #endif
#else
ap_log_error (file, line, level | APLOG_NOERRNO, s, "(%d) %s", getpid(), errstr);
#endif
log_error(APLOG_MARK, APLOG_ERR, 0, s, "mod_waklog: krb5_get_init_creds_password %s",
afs_error_message(kerror) );
/* nuke the password so it doesn't end up in core files */
- memset(k5secret, 0, sizeof(k5secret));
+ memset(k5secret, 0, strlen(k5secret));
goto cleanup;
}
- memset(k5secret, 0, sizeof(k5secret));
+ memset(k5secret, 0, strlen(k5secret));
}
/* initialize the credentials cache and store the stuff we just got */