From 183c379fe58ca60f5ef2d1f2033d035d4117ac8f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 29 Dec 2008 20:24:57 +0100 Subject: s4:lib/tevent: rename structs list="" list="$list event_context:tevent_context" list="$list fd_event:tevent_fd" list="$list timed_event:tevent_timer" for s in $list; do o=`echo $s | cut -d ':' -f1` n=`echo $s | cut -d ':' -f2` r=`git grep "struct $o" |cut -d ':' -f1 |sort -u` files=`echo "$r" | grep -v source3 | grep -v nsswitch | grep -v packaging4` for f in $files; do cat $f | sed -e "s/struct $o/struct $n/g" > $f.tmp mv $f.tmp $f done done metze --- source4/kdc/hdb-samba4.c | 2 +- source4/kdc/kdc.c | 6 +++--- source4/kdc/kdc.h | 2 +- source4/kdc/kpasswdd.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source4/kdc') diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c index ff267261ed..937839d67d 100644 --- a/source4/kdc/hdb-samba4.c +++ b/source4/kdc/hdb-samba4.c @@ -1485,7 +1485,7 @@ static krb5_error_code LDB_destroy(krb5_context context, HDB *db) * code */ NTSTATUS kdc_hdb_samba4_create(TALLOC_CTX *mem_ctx, - struct event_context *ev_ctx, + struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, krb5_context context, struct HDB **db, const char *arg) { diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c index 81ac94c482..c11c4a6eee 100644 --- a/source4/kdc/kdc.c +++ b/source4/kdc/kdc.c @@ -44,7 +44,7 @@ /* Disgusting hack to get a mem_ctx and lp_ctx into the hdb plugin, when * used as a keytab */ TALLOC_CTX *kdc_mem_ctx; -struct event_context *kdc_ev_ctx; +struct tevent_context *kdc_ev_ctx; struct loadparm_context *kdc_lp_ctx; /* hold all the info needed to send a reply */ @@ -66,7 +66,7 @@ typedef bool (*kdc_process_fn_t)(struct kdc_server *kdc, struct kdc_socket { struct socket_context *sock; struct kdc_server *kdc; - struct fd_event *fde; + struct tevent_fd *fde; /* a queue of outgoing replies that have been deferred */ struct kdc_reply *send_queue; @@ -199,7 +199,7 @@ static void kdc_recv_handler(struct kdc_socket *kdc_socket) /* handle fd events on a KDC socket */ -static void kdc_socket_handler(struct event_context *ev, struct fd_event *fde, +static void kdc_socket_handler(struct tevent_context *ev, struct tevent_fd *fde, uint16_t flags, void *private) { struct kdc_socket *kdc_socket = talloc_get_type(private, struct kdc_socket); diff --git a/source4/kdc/kdc.h b/source4/kdc/kdc.h index 2ea75099d9..417f327a57 100644 --- a/source4/kdc/kdc.h +++ b/source4/kdc/kdc.h @@ -31,7 +31,7 @@ struct kdc_server; struct socket_address; extern TALLOC_CTX *kdc_mem_ctx; -extern struct event_context *kdc_ev_ctx; +extern struct tevent_context *kdc_ev_ctx; extern struct loadparm_context *kdc_lp_ctx; bool kpasswdd_process(struct kdc_server *kdc, diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c index 2fa07d0531..27968620e0 100644 --- a/source4/kdc/kpasswdd.c +++ b/source4/kdc/kpasswdd.c @@ -47,7 +47,7 @@ struct kpasswd_socket { struct socket_context *sock; struct kdc_server *kdc; - struct fd_event *fde; + struct tevent_fd *fde; /* a queue of outgoing replies that have been deferred */ struct kdc_reply *send_queue; -- cgit