From 2c719bcb92302f45df4badb71d1d97f57235d0cc Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 24 Apr 2017 18:13:13 +0300 Subject: [PATCH] imap-plugins: Use client_add_capability() for adding dynamic capabilities --- src/plugins/imap-acl/imap-acl-plugin.c | 6 ++++-- src/plugins/imap-quota/imap-quota-plugin.c | 2 +- src/plugins/imap-zlib/imap-zlib-plugin.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/imap-acl/imap-acl-plugin.c b/src/plugins/imap-acl/imap-acl-plugin.c index eef069a768..52b06cb273 100644 --- a/src/plugins/imap-acl/imap-acl-plugin.c +++ b/src/plugins/imap-acl/imap-acl-plugin.c @@ -683,8 +683,10 @@ static bool cmd_deleteacl(struct client_command_context *cmd) static void imap_acl_client_created(struct client **client) { - if (mail_user_is_plugin_loaded((*client)->user, imap_acl_module)) - str_append((*client)->capability_string, " ACL RIGHTS=texk"); + if (mail_user_is_plugin_loaded((*client)->user, imap_acl_module)) { + client_add_capability(*client, "ACL"); + client_add_capability(*client, "RIGHTS=texk"); + } if (next_hook_client_created != NULL) next_hook_client_created(client); diff --git a/src/plugins/imap-quota/imap-quota-plugin.c b/src/plugins/imap-quota/imap-quota-plugin.c index 931d3971cd..dab7c2877f 100644 --- a/src/plugins/imap-quota/imap-quota-plugin.c +++ b/src/plugins/imap-quota/imap-quota-plugin.c @@ -222,7 +222,7 @@ static bool cmd_setquota(struct client_command_context *cmd) static void imap_quota_client_created(struct client **client) { if (mail_user_is_plugin_loaded((*client)->user, imap_quota_module)) - str_append((*client)->capability_string, " QUOTA"); + client_add_capability(*client, "QUOTA"); if (next_hook_client_created != NULL) next_hook_client_created(client); diff --git a/src/plugins/imap-zlib/imap-zlib-plugin.c b/src/plugins/imap-zlib/imap-zlib-plugin.c index e9f9f0d04c..40fdcee346 100644 --- a/src/plugins/imap-zlib/imap-zlib-plugin.c +++ b/src/plugins/imap-zlib/imap-zlib-plugin.c @@ -145,7 +145,7 @@ static void imap_zlib_client_created(struct client **clientp) zclient->next_state_export = (*clientp)->v.state_export; (*clientp)->v.state_export = imap_zlib_state_export; - str_append(client->capability_string, " COMPRESS=DEFLATE"); + client_add_capability(*clientp, "COMPRESS=DEFLATE"); } if (next_hook_client_created != NULL) -- 2.47.3