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/lib/tls/tls.c | 10 +++++----- source4/lib/tls/tls.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'source4/lib/tls') diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c index d16df25548..99a15059ad 100644 --- a/source4/lib/tls/tls.c +++ b/source4/lib/tls/tls.c @@ -47,7 +47,7 @@ struct tls_params { /* hold per connection tls data */ struct tls_context { struct socket_context *socket; - struct fd_event *fde; + struct tevent_fd *fde; bool tls_enabled; #if ENABLE_GNUTLS gnutls_session session; @@ -455,7 +455,7 @@ init_failed: */ struct socket_context *tls_init_server(struct tls_params *params, struct socket_context *socket_ctx, - struct fd_event *fde, + struct tevent_fd *fde, const char *plain_chars) { struct tls_context *tls; @@ -535,7 +535,7 @@ failed: setup for a new client connection */ struct socket_context *tls_init_client(struct socket_context *socket_ctx, - struct fd_event *fde, + struct tevent_fd *fde, const char *ca_path) { struct tls_context *tls; @@ -663,7 +663,7 @@ struct tls_params *tls_initialise(TALLOC_CTX *mem_ctx, struct loadparm_context * */ struct socket_context *tls_init_server(struct tls_params *params, struct socket_context *socket, - struct fd_event *fde, + struct tevent_fd *fde, const char *plain_chars) { return NULL; @@ -674,7 +674,7 @@ struct socket_context *tls_init_server(struct tls_params *params, setup for a new client connection */ struct socket_context *tls_init_client(struct socket_context *socket, - struct fd_event *fde, + struct tevent_fd *fde, const char *ca_path) { return NULL; diff --git a/source4/lib/tls/tls.h b/source4/lib/tls/tls.h index e6aa8f0e1a..c5bd5c87cc 100644 --- a/source4/lib/tls/tls.h +++ b/source4/lib/tls/tls.h @@ -42,14 +42,14 @@ struct tls_params *tls_initialise(TALLOC_CTX *mem_ctx, struct loadparm_context * */ struct socket_context *tls_init_server(struct tls_params *parms, struct socket_context *sock, - struct fd_event *fde, + struct tevent_fd *fde, const char *plain_chars); /* call tls_init_client() on each new client connection */ struct socket_context *tls_init_client(struct socket_context *sock, - struct fd_event *fde, + struct tevent_fd *fde, const char *cafile); /* -- cgit