lib-smtp: syntax: Remame smtp_ehlo_params_are_valid() to smtp_ehlo_params_str_is_valid().

Moves it out of the way for a function that is better suited for this name;
i.e., it operates on an array of parameters.

diff --git a/src/lib-smtp/smtp-syntax.c b/src/lib-smtp/smtp-syntax.c
index d1c63289f58afb578f3a16810f0e12b61e950146..3ab5e9847ed5a6e480e73b38f5c4261f1b1f9c81 100644 (file)
--- a/src/lib-smtp/smtp-syntax.c
+++ b/src/lib-smtp/smtp-syntax.c
@@ -187,7 +187,7 @@ bool smtp_ehlo_param_is_valid(const char *param)
        return TRUE;
 }
 
-bool smtp_ehlo_params_are_valid(const char *params)
+bool smtp_ehlo_params_str_is_valid(const char *params)
 {
        const char *p;
        bool space = FALSE;

diff --git a/src/lib-smtp/smtp-syntax.h b/src/lib-smtp/smtp-syntax.h
index 352108ec643edeacf43c3cd71909523ad83f72a5..ad4e1f84959fc8bedc101bc94581b7401ead4936 100644 (file)
--- a/src/lib-smtp/smtp-syntax.h
+++ b/src/lib-smtp/smtp-syntax.h
@@ -40,7 +40,7 @@ int smtp_helo_domain_parse(const char *helo,
 
 bool smtp_ehlo_keyword_is_valid(const char *keyword);
 bool smtp_ehlo_param_is_valid(const char *param);
-bool smtp_ehlo_params_are_valid(const char *params);
+bool smtp_ehlo_params_str_is_valid(const char *params);
 
 int smtp_ehlo_line_parse(const char *ehlo_line,
        const char **key_r, const char *const **params_r,

diff --git a/src/submission/submission-client.c b/src/submission/submission-client.c
index fb5503389933d1a841d6551c2815a77d80402dc8..a4fee16a3963d0a72c77678e7afd3a5535ebfaaf 100644 (file)
--- a/src/submission/submission-client.c
+++ b/src/submission/submission-client.c
@@ -518,7 +518,7 @@ void client_add_extra_capability(struct client *client, const char *capability,
 
        /* Avoid committing protocol errors */
        i_assert(smtp_ehlo_keyword_is_valid(capability));
-       i_assert(params == NULL || smtp_ehlo_params_are_valid(params));
+       i_assert(params == NULL || smtp_ehlo_params_str_is_valid(params));
 
        i_zero(&cap);
        cap.capability = p_strdup(client->pool, capability);