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

4 files changed, 4 insertions, 4 deletions

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 4d1b202ccb..ba5296fd97 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -144,7 +144,7 @@ static int binary_net(int argc, const char **argv)
 	int rc;
 	int argc_new;
 	const char **argv_new;
-	struct event_context *ev;
+	struct tevent_context *ev;
 	struct net_context *ctx = NULL;
 	poptContext pc;
 	struct poptOption long_options[] = {
diff --git a/source4/utils/net/net.h b/source4/utils/net/net.h
index 309bee277c..16223a15bb 100644
--- a/source4/utils/net/net.h
+++ b/source4/utils/net/net.h
@@ -24,7 +24,7 @@
 struct net_context {
 	struct cli_credentials *credentials;
 	struct loadparm_context *lp_ctx;
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 };
 
 struct net_functable {
diff --git a/source4/utils/net/net_machinepw.c b/source4/utils/net/net_machinepw.c
index 710d889c19..4e3165dbfd 100644
--- a/source4/utils/net/net_machinepw.c
+++ b/source4/utils/net/net_machinepw.c
@@ -37,7 +37,7 @@ int net_machinepw(struct net_context *ctx, int argc, const char **argv)
 {
 	struct ldb_context *secrets;
 	TALLOC_CTX *mem_ctx;
-	struct event_context *ev;
+	struct tevent_context *ev;
 	struct ldb_message **msgs;
 	int num_records;
 	const char *attrs[] = { "secret", NULL };
diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c
index 4964694790..074ab698cf 100644
--- a/source4/utils/ntlm_auth.c
+++ b/source4/utils/ntlm_auth.c
@@ -392,7 +392,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
 		const char *set_password;
 	};
 	struct gensec_ntlm_state *state;
-	struct event_context *ev;
+	struct tevent_context *ev;
 	struct messaging_context *msg;
 
 	NTSTATUS nt_status;