git-svn-id: https://modwaklog.svn.sourceforge.net/svnroot/modwaklog/trunk/modwaklog@44
0d961d1b-a432-0410-8fea-
cc29f225fe07
#define ap_user_name unixd_config.user_name
#define command(name, func, var, type, usage) \
AP_INIT_ ## type (name, (void*) func, \
#define ap_user_name unixd_config.user_name
#define command(name, func, var, type, usage) \
AP_INIT_ ## type (name, (void*) func, \
- (void*)APR_OFFSETOF(waklog_config, var), \
+ (void*)APR_OFFSETOF(waklog_commands, var), \
OR_AUTHCFG | RSRC_CONF, usage)
typedef struct {
int dummy;
OR_AUTHCFG | RSRC_CONF, usage)
typedef struct {
int dummy;
#define MK_TABLE_GET ap_table_get
#define command(name, func, var, type, usage) \
{ name, func, \
#define MK_TABLE_GET ap_table_get
#define command(name, func, var, type, usage) \
{ name, func, \
- (void*)XtOffsetOf(waklog_config, var), \
+ (void*)XtOffsetOf(waklog_commands, var), \
OR_AUTHCFG | RSRC_CONF, type, usage }
#endif /* STANDARD20_MODULE_STUFF */
OR_AUTHCFG | RSRC_CONF, type, usage }
#endif /* STANDARD20_MODULE_STUFF */
-#define getModConfig(P, X) P = (waklog_host_config *) ap_get_module_config( (X)->module_config, &waklog_module );
+#define getModConfig(P, X) P = (waklog_config *) ap_get_module_config( (X)->module_config, &waklog_module );
char *afs_cell;
MK_POOL *p;
}
char *afs_cell;
MK_POOL *p;
}
typedef struct {
struct ktc_token token;
typedef struct {
struct ktc_token token;
static void *
waklog_create_server_config( MK_POOL *p, server_rec *s )
{
static void *
waklog_create_server_config( MK_POOL *p, server_rec *s )
{
- waklog_host_config *cfg;
- cfg = (waklog_host_config *)ap_pcalloc( p, sizeof( waklog_host_config ));
+ cfg = (waklog_config *)ap_pcalloc( p, sizeof( waklog_config ));
cfg->p = p;
cfg->forked = 0;
cfg->configured = 0;
cfg->p = p;
cfg->forked = 0;
cfg->configured = 0;
static const char *
set_waklog_protect( cmd_parms *params, void *mconfig, int flag )
{
static const char *
set_waklog_protect( cmd_parms *params, void *mconfig, int flag )
{
- waklog_host_config *cfg;
getModConfig(cfg, params->server );
getModConfig(cfg, params->server );
static const char *
set_waklog_keytab( cmd_parms *params, void *mconfig, char *file )
{
static const char *
set_waklog_keytab( cmd_parms *params, void *mconfig, char *file )
{
- waklog_host_config *cfg;
getModConfig(cfg, params->server );
getModConfig(cfg, params->server );
static const char *
set_waklog_use_principal( cmd_parms *params, void *mconfig, char *file )
{
static const char *
set_waklog_use_principal( cmd_parms *params, void *mconfig, char *file )
{
- waklog_host_config *cfg;
getModConfig(cfg, params->server );
getModConfig(cfg, params->server );
static const char *
set_waklog_use_afs_cell( cmd_parms *params, void *mconfig, char *file )
{
static const char *
set_waklog_use_afs_cell( cmd_parms *params, void *mconfig, char *file )
{
- waklog_host_config *cfg;
getModConfig(cfg, params->server );
getModConfig(cfg, params->server );
char *wak_keytab;
char *wak_ktprinc;
char *wak_afscell;
char *wak_keytab;
char *wak_ktprinc;
char *wak_afscell;
command_rec waklog_cmds[ ] =
{
command_rec waklog_cmds[ ] =
{
krb5_keytab keytab = NULL;
char ktbuf[ MAX_KEYTAB_NAME_LEN + 1 ];
int i;
krb5_keytab keytab = NULL;
char ktbuf[ MAX_KEYTAB_NAME_LEN + 1 ];
int i;
- waklog_host_config *cfg;
log_error( APLOG_MARK, APLOG_DEBUG, 0, s,
"mod_waklog: waklog_kinit called: pid: %d", getpid() );
log_error( APLOG_MARK, APLOG_DEBUG, 0, s,
"mod_waklog: waklog_kinit called: pid: %d", getpid() );
struct ktc_principal server = { "afs", "", "" };
struct ktc_principal client;
struct ktc_token token;
struct ktc_principal server = { "afs", "", "" };
struct ktc_principal client;
struct ktc_token token;
- waklog_host_config *cfg;
int buflen;
k5path = MK_TABLE_GET( r->subprocess_env, "KRB5CCNAME" );
int buflen;
k5path = MK_TABLE_GET( r->subprocess_env, "KRB5CCNAME" );
int rv;
extern char *version;
apr_proc_t *proc;
int rv;
extern char *version;
apr_proc_t *proc;
- waklog_host_config *cfg;
void *data;
getModConfig(cfg, s);
void *data;
getModConfig(cfg, s);
static int
waklog_phase0( request_rec *r )
{
static int
waklog_phase0( request_rec *r )
{
- waklog_host_config *cfg;
log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server,
"mod_waklog: phase0 called" );
log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server,
"mod_waklog: phase0 called" );
static int
waklog_phase7( request_rec *r )
{
static int
waklog_phase7( request_rec *r )
{
- waklog_host_config *cfg;
log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server,
"mod_waklog: phase7 called" );
log_error( APLOG_MARK, APLOG_DEBUG, 0, r->server,
"mod_waklog: phase7 called" );
log_error (APLOG_MARK, APLOG_DEBUG, 0, c->base_server,
"mod_waklog: new_connection called: pid: %d", getpid ());
log_error (APLOG_MARK, APLOG_DEBUG, 0, c->base_server,
"mod_waklog: new_connection called: pid: %d", getpid ());