X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/d5b80e59458182b2d557a929a18cb8c70cd56b68..13a4b4c1810a1a9f3c956f1e92807a0d86c6f5bf:/src/src/auths/dovecot.c diff --git a/src/src/auths/dovecot.c b/src/src/auths/dovecot.c index 2dcaa0e42..c337510b5 100644 --- a/src/src/auths/dovecot.c +++ b/src/src/auths/dovecot.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2004 Andrey Panin - * Copyright (c) 2006-2016 The Exim Maintainers + * Copyright (c) 2006-2017 The Exim Maintainers * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published @@ -51,18 +51,15 @@ The cost is the length of an array of pointers on the stack. /* Options specific to the authentication mechanism. */ optionlist auth_dovecot_options[] = { - { - "server_socket", - opt_stringptr, - (void *)(offsetof(auth_dovecot_options_block, server_socket)) + { "server_socket", opt_stringptr, + OPT_OFF(auth_dovecot_options_block, server_socket) }, }; /* Size of the options list. An extern variable has to be used so that its address can appear in the tables drtables.c. */ -int auth_dovecot_options_count = - sizeof(auth_dovecot_options) / sizeof(optionlist); +int auth_dovecot_options_count = nelem(auth_dovecot_options); /* Default private options block for the authentication method. */ @@ -78,8 +75,8 @@ auth_dovecot_options_block auth_dovecot_option_defaults = { /* Dummy values */ void auth_dovecot_init(auth_instance *ablock) {} int auth_dovecot_server(auth_instance *ablock, uschar *data) {return 0;} -int auth_dovecot_client(auth_instance *ablock, smtp_inblock *inblock, - smtp_outblock *outblock, int timeout, uschar *buffer, int buffsize) {return 0;} +int auth_dovecot_client(auth_instance *ablock, void * sx, + int timeout, uschar *buffer, int buffsize) {return 0;} #else /*!MACRO_PREDEF*/ @@ -101,14 +98,12 @@ to be set up. */ void auth_dovecot_init(auth_instance *ablock) { - auth_dovecot_options_block *ob = - (auth_dovecot_options_block *)(ablock->options_block); - - if (ablock->public_name == NULL) - ablock->public_name = ablock->name; - if (ob->server_socket != NULL) - ablock->server = TRUE; - ablock->client = FALSE; +auth_dovecot_options_block *ob = + (auth_dovecot_options_block *)(ablock->options_block); + +if (!ablock->public_name) ablock->public_name = ablock->name; +if (ob->server_socket) ablock->server = TRUE; +ablock->client = FALSE; } /************************************************* @@ -131,52 +126,51 @@ actual fields (so last valid offset into ptrs is one less). static int strcut(uschar *str, uschar **ptrs, int nptrs) { - uschar *last_sub_start = str; - int n; - - for (n = 0; n < nptrs; n++) - ptrs[n] = NULL; - n = 1; - - while (*str) { - if (*str == '\t') { - if (n <= nptrs) { - *ptrs++ = last_sub_start; - last_sub_start = str + 1; - *str = '\0'; - } - n++; - } - str++; - } - - /* It's acceptable for the string to end with a tab character. We see - this in AUTH PLAIN without an initial response from the client, which - causing us to send "334 " and get the data from the client. */ - if (n <= nptrs) { - *ptrs = last_sub_start; - } else { - HDEBUG(D_auth) debug_printf("dovecot: warning: too many results from tab-splitting; saw %d fields, room for %d\n", n, nptrs); - n = nptrs; - } - - return n <= nptrs ? n : nptrs; +uschar *last_sub_start = str; +int n; + +for (n = 0; n < nptrs; n++) + ptrs[n] = NULL; +n = 1; + +while (*str) + if (*str++ == '\t') + if (n++ <= nptrs) + { + *ptrs++ = last_sub_start; + last_sub_start = str; + str[-1] = '\0'; + } + +/* It's acceptable for the string to end with a tab character. We see +this in AUTH PLAIN without an initial response from the client, which +causing us to send "334 " and get the data from the client. */ +if (n <= nptrs) + *ptrs = last_sub_start; +else + { + HDEBUG(D_auth) + debug_printf("dovecot: warning: too many results from tab-splitting;" + " saw %d fields, room for %d\n", n, nptrs); + n = nptrs; + } + +return n <= nptrs ? n : nptrs; } static void debug_strcut(uschar **ptrs, int nlen, int alen) ARG_UNUSED; static void debug_strcut(uschar **ptrs, int nlen, int alen) { - int i; - debug_printf("%d read but unreturned bytes; strcut() gave %d results: ", - socket_buffer_left, nlen); - for (i = 0; i < nlen; i++) { - debug_printf(" {%s}", ptrs[i]); - } - if (nlen < alen) - debug_printf(" last is %s\n", ptrs[i] ? ptrs[i] : US""); - else - debug_printf(" (max for capacity)\n"); +int i; +debug_printf("%d read but unreturned bytes; strcut() gave %d results: ", + socket_buffer_left, nlen); +for (i = 0; i < nlen; i++) + debug_printf(" {%s}", ptrs[i]); +if (nlen < alen) + debug_printf(" last is %s\n", ptrs[i] ? ptrs[i] : US""); +else + debug_printf(" (max for capacity)\n"); } #define CHECK_COMMAND(str, arg_min, arg_max) do { \ @@ -212,8 +206,8 @@ for (;;) { if (socket_buffer_left == 0) { - socket_buffer_left = read(fd, sbuffer, sizeof(sbuffer)); - if (socket_buffer_left == 0) { if (count == 0) return NULL; else break; } + if ((socket_buffer_left = read(fd, sbuffer, sizeof(sbuffer))) <= 0) + if (count == 0) return NULL; else break; p = 0; } @@ -296,7 +290,7 @@ auth_defer_msg = US"authentication socket protocol error"; socket_buffer_left = 0; /* Global, used to read more than a line but return by line */ while (cont) { - if (dc_gets(buffer, sizeof(buffer), fd) == NULL) + if (!dc_gets(buffer, sizeof(buffer), fd)) OUT("authentication socket read error or premature eof"); p = buffer + Ustrlen(buffer) - 1; if (*p != '\n') @@ -305,9 +299,9 @@ while (cont) *p = '\0'; HDEBUG(D_auth) debug_printf("received: %s\n", buffer); - nargs = strcut(buffer, args, sizeof(args) / sizeof(args[0])); + nargs = strcut(buffer, args, nelem(args)); - /* HDEBUG(D_auth) debug_strcut(args, nargs, sizeof(args) / sizeof(args[0])); */ + /* HDEBUG(D_auth) debug_strcut(args, nargs, nelem(args)); */ /* Code below rewritten by Kirill Miazine (km@krot.org). Only check commands that Exim will need. Original code also failed if Dovecot server sent unknown @@ -373,12 +367,12 @@ if (Ustrchr(data, '\t') != NULL) /* Added by PH: extra fields when TLS is in use or if the TCP/IP connection is local. */ -if (tls_in.cipher != NULL) +if (tls_in.cipher) auth_extra_data = string_sprintf("secured\t%s%s", - tls_in.certificate_verified? "valid-client-cert" : "", - tls_in.certificate_verified? "\t" : ""); + tls_in.certificate_verified ? "valid-client-cert" : "", + tls_in.certificate_verified ? "\t" : ""); -else if ( interface_address != NULL +else if ( interface_address && Ustrcmp(sender_host_address, interface_address) == 0) auth_extra_data = US"secured\t"; @@ -415,9 +409,8 @@ while (1) { uschar *temp; uschar *auth_id_pre = NULL; - int i; - if (dc_gets(buffer, sizeof(buffer), fd) == NULL) + if (!dc_gets(buffer, sizeof(buffer), fd)) { auth_defer_msg = US"authentication socket read error or premature eof"; goto out; @@ -425,7 +418,7 @@ while (1) buffer[Ustrlen(buffer) - 1] = 0; HDEBUG(D_auth) debug_printf("received: %s\n", buffer); - nargs = strcut(buffer, args, sizeof(args) / sizeof(args[0])); + nargs = strcut(buffer, args, nelem(args)); if (Uatoi(args[1]) != crequid) OUT("authentication socket connection id mismatch"); @@ -458,17 +451,14 @@ while (1) case 'F': CHECK_COMMAND("FAIL", 1, -1); - for (i=2; (i