svn rev #25475: trunk/src/ include/ include/krb5/ kadmin/server/ kdc/ lib/apputils/
ghudson@MIT.EDU
ghudson at MIT.EDU
Mon Nov 14 21:42:58 EST 2011
http://src.mit.edu/fisheye/changelog/krb5/?cs=25475
Commit By: ghudson
Log Message:
ticket: 7019
subject: Make verto context available to kdcpreauth modules
target_version: 1.10
tags: pullup
Add an event_context callback to kdcpreauth. Adjust the internal KDC
and main loop interfaces to pass around the event context, and expose
it to kdcpreauth modules via the rock.
Changed Files:
U trunk/src/include/krb5/preauth_plugin.h
U trunk/src/include/net-server.h
U trunk/src/kadmin/server/schpw.c
U trunk/src/kdc/dispatch.c
U trunk/src/kdc/do_as_req.c
U trunk/src/kdc/kdc_preauth.c
U trunk/src/kdc/kdc_util.h
U trunk/src/lib/apputils/net-server.c
Modified: trunk/src/include/krb5/preauth_plugin.h
===================================================================
--- trunk/src/include/krb5/preauth_plugin.h 2011-11-15 01:59:01 UTC (rev 25474)
+++ trunk/src/include/krb5/preauth_plugin.h 2011-11-15 02:42:58 UTC (rev 25475)
@@ -377,6 +377,11 @@
* avoid a dependency on a libkdb5 type). */
void *(*client_entry)(krb5_context context, krb5_kdcpreauth_rock rock);
+ /* Get a pointer to the verto context an asynchronous plugin should
+ * use to create events in the edata or verify method. */
+ struct verto_ctx *(*event_context)(krb5_context context,
+ krb5_kdcpreauth_rock rock);
+
/* End of version 1 kdcpreauth callbacks. */
} *krb5_kdcpreauth_callbacks;
Modified: trunk/src/include/net-server.h
===================================================================
--- trunk/src/include/net-server.h 2011-11-15 01:59:01 UTC (rev 25474)
+++ trunk/src/include/net-server.h 2011-11-15 02:42:58 UTC (rev 25475)
@@ -68,7 +68,7 @@
krb5_data *response);
void dispatch(void *handle, struct sockaddr *local_addr,
const krb5_fulladdr *remote_addr, krb5_data *request,
- int is_tcp, loop_respond_fn respond, void *arg);
+ int is_tcp, verto_ctx *vctx, loop_respond_fn respond, void *arg);
krb5_error_code make_toolong_error (void *handle, krb5_data **);
/*
Modified: trunk/src/kadmin/server/schpw.c
===================================================================
--- trunk/src/kadmin/server/schpw.c 2011-11-15 01:59:01 UTC (rev 25474)
+++ trunk/src/kadmin/server/schpw.c 2011-11-15 02:42:58 UTC (rev 25475)
@@ -442,7 +442,7 @@
void
dispatch(void *handle, struct sockaddr *local_saddr,
const krb5_fulladdr *remote_faddr, krb5_data *request, int is_tcp,
- loop_respond_fn respond, void *arg)
+ verto_ctx *vctx, loop_respond_fn respond, void *arg)
{
krb5_error_code ret;
krb5_keytab kt = NULL;
Modified: trunk/src/kdc/dispatch.c
===================================================================
--- trunk/src/kdc/dispatch.c 2011-11-15 01:59:01 UTC (rev 25474)
+++ trunk/src/kdc/dispatch.c 2011-11-15 02:42:58 UTC (rev 25475)
@@ -81,8 +81,9 @@
}
void
-dispatch(void *cb, struct sockaddr *local_saddr, const krb5_fulladdr *from,
- krb5_data *pkt, int is_tcp, loop_respond_fn respond, void *arg)
+dispatch(void *cb, struct sockaddr *local_saddr,
+ const krb5_fulladdr *from, krb5_data *pkt, int is_tcp,
+ verto_ctx *vctx, loop_respond_fn respond, void *arg)
{
krb5_error_code retval;
krb5_kdc_req *as_req;
@@ -166,7 +167,8 @@
* process_as_req frees the request if it is called
*/
if (!(retval = setup_server_realm(as_req->server))) {
- process_as_req(as_req, pkt, from, finish_dispatch, state);
+ process_as_req(as_req, pkt, from, vctx, finish_dispatch,
+ state);
return;
}
else
Modified: trunk/src/kdc/do_as_req.c
===================================================================
--- trunk/src/kdc/do_as_req.c 2011-11-15 01:59:01 UTC (rev 25474)
+++ trunk/src/kdc/do_as_req.c 2011-11-15 02:42:58 UTC (rev 25475)
@@ -452,7 +452,8 @@
/*ARGSUSED*/
void
process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
- const krb5_fulladdr *from, loop_respond_fn respond, void *arg)
+ const krb5_fulladdr *from, verto_ctx *vctx,
+ loop_respond_fn respond, void *arg)
{
krb5_error_code errcode;
krb5_timestamp rtime;
@@ -512,6 +513,7 @@
state->rock.request = state->request;
state->rock.inner_body = state->inner_body;
state->rock.rstate = state->rstate;
+ state->rock.vctx = vctx;
if (!state->request->client) {
state->status = "NULL_CLIENT";
errcode = KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN;
Modified: trunk/src/kdc/kdc_preauth.c
===================================================================
--- trunk/src/kdc/kdc_preauth.c 2011-11-15 01:59:01 UTC (rev 25474)
+++ trunk/src/kdc/kdc_preauth.c 2011-11-15 02:42:58 UTC (rev 25475)
@@ -574,6 +574,12 @@
return rock->client;
}
+static verto_ctx *
+event_context(krb5_context context, krb5_kdcpreauth_rock rock)
+{
+ return rock->vctx;
+}
+
static struct krb5_kdcpreauth_callbacks_st callbacks = {
1,
max_time_skew,
@@ -583,7 +589,8 @@
fast_armor,
get_string,
free_string,
- client_entry
+ client_entry,
+ event_context
};
static krb5_error_code
Modified: trunk/src/kdc/kdc_util.h
===================================================================
--- trunk/src/kdc/kdc_util.h 2011-11-15 01:59:01 UTC (rev 25474)
+++ trunk/src/kdc/kdc_util.h 2011-11-15 02:42:58 UTC (rev 25475)
@@ -117,7 +117,7 @@
void
process_as_req (krb5_kdc_req *, krb5_data *,
const krb5_fulladdr *,
- loop_respond_fn, void *);
+ verto_ctx *, loop_respond_fn, void *);
/* do_tgs_req.c */
krb5_error_code
@@ -131,6 +131,7 @@
const krb5_fulladdr *,
krb5_data *,
int,
+ verto_ctx *,
loop_respond_fn,
void *);
@@ -164,9 +165,9 @@
krb5_enc_tkt_part *enc_tkt_reply);
typedef void (*kdc_hint_respond_fn)(void *arg);
void
-get_preauth_hint_list(krb5_kdc_req *request, krb5_kdcpreauth_rock rock,
- krb5_pa_data ***e_data_out, kdc_hint_respond_fn respond,
- void *arg);
+get_preauth_hint_list(krb5_kdc_req *request,
+ krb5_kdcpreauth_rock rock, krb5_pa_data ***e_data_out,
+ kdc_hint_respond_fn respond, void *arg);
void
load_preauth_plugins(krb5_context context);
void
@@ -396,6 +397,7 @@
krb5_db_entry *client;
krb5_key_data *client_key;
struct kdc_request_state *rstate;
+ verto_ctx *vctx;
};
#define isflagset(flagfield, flag) (flagfield & (flag))
Modified: trunk/src/lib/apputils/net-server.c
===================================================================
--- trunk/src/lib/apputils/net-server.c 2011-11-15 01:59:01 UTC (rev 25474)
+++ trunk/src/lib/apputils/net-server.c 2011-11-15 02:42:58 UTC (rev 25475)
@@ -1665,7 +1665,7 @@
init_addr(&state->faddr, ss2sa(&state->saddr));
/* This address is in net order. */
dispatch(state->handle, ss2sa(&state->daddr), &state->faddr,
- &state->request, 0, process_packet_response, state);
+ &state->request, 0, ctx, process_packet_response, state);
}
static int
@@ -1936,7 +1936,7 @@
local_saddrp = ss2sa(&state->local_saddr);
dispatch(state->conn->handle, local_saddrp, &conn->faddr,
- &state->request, 1, process_tcp_response, state);
+ &state->request, 1, ctx, process_tcp_response, state);
}
return;
More information about the cvs-krb5
mailing list