From a42dd1e6a694f9c7f4f81424c3d82e1872014f5c Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Mon, 2 Oct 2017 17:05:21 +0200 Subject: [PATCH] lib-auth-client: auth-master - Move call to auth_request_lookup_abort() to central place This is a preparation for a later changes that add more abort invokations. --- src/lib-auth-client/auth-master.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/lib-auth-client/auth-master.c b/src/lib-auth-client/auth-master.c index 7864cda43e..dce51ba46c 100644 --- a/src/lib-auth-client/auth-master.c +++ b/src/lib-auth-client/auth-master.c @@ -177,10 +177,9 @@ auth_master_handshake_line(struct connection *_conn, const char *line) } static int -auth_master_input_args(struct connection *_conn, const char *const *args) +auth_master_handle_input(struct auth_master_connection *conn, + const char *const *args) { - struct auth_master_connection *conn = - container_of(_conn, struct auth_master_connection, conn); const char *const *in_args = args; const char *cmd, *id, *wanted_id; @@ -208,10 +207,22 @@ auth_master_input_args(struct connection *_conn, const char *const *args) e_error(conn->event, "BUG: Unexpected input: %s", t_strarray_join(in_args, "\t")); } - auth_request_lookup_abort(conn); return -1; } +static int +auth_master_input_args(struct connection *_conn, const char *const *args) +{ + struct auth_master_connection *conn = + container_of(_conn, struct auth_master_connection, conn); + int ret; + + ret = auth_master_handle_input(conn, args); + if (ret < 0) + auth_request_lookup_abort(conn); + return ret; +} + static int auth_master_input_line(struct connection *_conn, const char *line) { struct auth_master_connection *conn = -- 2.47.3