lib-imap-urlauth: Rename error_r sent to clients as client_error_r

diff --git a/src/lib-imap-urlauth/imap-urlauth-backend.c b/src/lib-imap-urlauth/imap-urlauth-backend.c
index a73eaf39275da715c3892f0abe984bca4bd55eaa..84af3c220b0e8a817728530ccfd04ecb7d97b687 100644 (file)
--- a/src/lib-imap-urlauth/imap-urlauth-backend.c
+++ b/src/lib-imap-urlauth/imap-urlauth-backend.c
@@ -15,7 +15,7 @@
 static int
 imap_urlauth_backend_trans_set_mailbox_key(struct mailbox *box,
                                           unsigned char mailbox_key_r[IMAP_URLAUTH_KEY_LEN],
-                                          const char **error_r,
+                                          const char **client_error_r,
                                           enum mail_error *error_code_r)
 {
        struct mail_attribute_value urlauth_key;
@@ -23,7 +23,7 @@ imap_urlauth_backend_trans_set_mailbox_key(struct mailbox *box,
        int ret;
 
        if (mailbox_open(box) < 0) {
-               *error_r = mailbox_get_last_error(box, error_code_r);
+               *client_error_r = mailbox_get_last_error(box, error_code_r);
                return -1;
        }
 
@@ -42,7 +42,7 @@ imap_urlauth_backend_trans_set_mailbox_key(struct mailbox *box,
                                    IMAP_URLAUTH_KEY, &urlauth_key);
 
        if (mailbox_transaction_commit(&t) < 0) {
-               *error_r = mailbox_get_last_error(box, error_code_r);
+               *client_error_r = mailbox_get_last_error(box, error_code_r);
                ret = -1;
        }
 
@@ -53,7 +53,7 @@ static int
 imap_urlauth_backend_trans_get_mailbox_key(struct mailbox *box,
                                           bool create,
                                           unsigned char mailbox_key_r[IMAP_URLAUTH_KEY_LEN],
-                                          const char **error_r,
+                                          const char **client_error_r,
                                           enum mail_error *error_code_r)
 {
        struct mail_user *user = mail_storage_get_user(mailbox_get_storage(box));
@@ -62,7 +62,7 @@ imap_urlauth_backend_trans_get_mailbox_key(struct mailbox *box,
        buffer_t key_buf;
        int ret;
 
-       *error_r = "Internal server error";
+       *client_error_r = "Internal server error";
        *error_code_r = MAIL_ERROR_TEMP;
 
        ret = mailbox_attribute_get(box, MAIL_ATTRIBUTE_TYPE_PRIVATE,
@@ -79,7 +79,7 @@ imap_urlauth_backend_trans_get_mailbox_key(struct mailbox *box,
 
                ret = imap_urlauth_backend_trans_set_mailbox_key(box,
                                                                 mailbox_key_r,
-                                                                error_r,
+                                                                client_error_r,
                                                                 error_code_r);
 
                if (ret < 0)
@@ -104,12 +104,15 @@ imap_urlauth_backend_trans_get_mailbox_key(struct mailbox *box,
 
 int imap_urlauth_backend_get_mailbox_key(struct mailbox *box, bool create,
                                         unsigned char mailbox_key_r[IMAP_URLAUTH_KEY_LEN],
-                                        const char **error_r,
+                                        const char **client_error_r,
                                         enum mail_error *error_code_r)
 {
        int ret;
 
-       ret = imap_urlauth_backend_trans_get_mailbox_key(box, create, mailbox_key_r, error_r, error_code_r);
+       ret = imap_urlauth_backend_trans_get_mailbox_key(box, create,
+                                                        mailbox_key_r,
+                                                        client_error_r,
+                                                        error_code_r);
        return ret;
 }
 

diff --git a/src/lib-imap-urlauth/imap-urlauth-backend.h b/src/lib-imap-urlauth/imap-urlauth-backend.h
index e04898810837acf89fe0f0cda95b70cef3ca4a34..b76ecc5ef3b985751b87bec84b3d52ddd42e25c5 100644 (file)
--- a/src/lib-imap-urlauth/imap-urlauth-backend.h
+++ b/src/lib-imap-urlauth/imap-urlauth-backend.h
@@ -7,7 +7,7 @@ struct imap_urlauth_backend;
 
 int imap_urlauth_backend_get_mailbox_key(struct mailbox *box, bool create,
                                         unsigned char mailbox_key_r[IMAP_URLAUTH_KEY_LEN],
-                                        const char **error_r,
+                                        const char **client_error_r,
                                         enum mail_error *error_code_r);
 int imap_urlauth_backend_reset_mailbox_key(struct mailbox *box);
 int imap_urlauth_backend_reset_all_keys(struct mail_user *user);

diff --git a/src/lib-imap-urlauth/imap-urlauth.c b/src/lib-imap-urlauth/imap-urlauth.c
index 39b58d3d72edcf2aaf3ee5671a4fc88f9495dd4d..58e2810650325ae6868fb68d6d8d177b09a2407f 100644 (file)
--- a/src/lib-imap-urlauth/imap-urlauth.c
+++ b/src/lib-imap-urlauth/imap-urlauth.c
@@ -219,20 +219,20 @@ imap_urlauth_check_access(struct imap_urlauth_context *uctx,
 
 static bool
 imap_urlauth_check_hostport(struct imap_urlauth_context *uctx,
-                           struct imap_url *url, const char **error_r)
+                           struct imap_url *url, const char **client_error_r)
 {
        /* validate host */
        /* FIXME: allow host ip/ip6 as well? */
        if (strcmp(uctx->url_host, URL_HOST_ALLOW_ANY) != 0 &&
            strcmp(url->host.name, uctx->url_host) != 0) {
-               *error_r = "Invalid URL: Inappropriate host name";
+               *client_error_r = "Invalid URL: Inappropriate host name";
                return FALSE;
        }
 
        /* validate port */
        if ((url->port == 0 && uctx->url_port != 143) ||
            (url->port != 0 && uctx->url_port != url->port)) {
-               *error_r = "Invalid URL: Inappropriate server port";
+               *client_error_r = "Invalid URL: Inappropriate server port";
                return FALSE;
        }
        return TRUE;
@@ -240,7 +240,7 @@ imap_urlauth_check_hostport(struct imap_urlauth_context *uctx,
 
 int imap_urlauth_generate(struct imap_urlauth_context *uctx,
                          const char *mechanism, const char *rumpurl,
-                         const char **urlauth_r, const char **error_r)
+                         const char **urlauth_r, const char **client_error_r)
 {
        struct mail_user *user = uctx->user;
        enum imap_url_parse_flags url_flags =
@@ -257,19 +257,19 @@ int imap_urlauth_generate(struct imap_urlauth_context *uctx,
 
        /* validate mechanism */
        if (strcasecmp(mechanism, "INTERNAL") != 0) {
-               *error_r = t_strdup_printf("Unsupported URLAUTH mechanism: %s", mechanism);
+               *client_error_r = t_strdup_printf("Unsupported URLAUTH mechanism: %s", mechanism);
                return 0;
        }
 
        /* validate URL */
        if (imap_url_parse(rumpurl, NULL, url_flags, &url, &error) < 0) {
-               *error_r = t_strdup_printf("Invalid URL: %s", error);
+               *client_error_r = t_strdup_printf("Invalid URL: %s", error);
                return 0;
        }
 
        if (url->mailbox == NULL || url->uid == 0 || url->search_program != NULL ||
                url->uauth_rumpurl == NULL || url->uauth_mechanism != NULL) {
-               *error_r = "Invalid URL: Must be an URLAUTH rump URL";
+               *client_error_r = "Invalid URL: Must be an URLAUTH rump URL";
                return 0;
        }
 
@@ -278,31 +278,31 @@ int imap_urlauth_generate(struct imap_urlauth_context *uctx,
                time_t now = time(NULL);
 
                if (now > url->uauth_expire) {
-                       *error_r = t_strdup_printf("URLAUTH has already expired");
+                       *client_error_r = t_strdup_printf("URLAUTH has already expired");
                        return 0;
                }
        }
 
        /* validate user */
        if (url->userid == NULL) {
-               *error_r = "Invalid URL: Missing user name";
+               *client_error_r = "Invalid URL: Missing user name";
                return 0;
        }
        if (user->anonymous || strcmp(url->userid, user->username) != 0) {
-               *error_r = t_strdup_printf(
+               *client_error_r = t_strdup_printf(
                        "Not permitted to generate URLAUTH for user %s",
                        url->userid);
                return 0;
        }
 
        /* validate host:port */
-       if (!imap_urlauth_check_hostport(uctx, url, error_r))
+       if (!imap_urlauth_check_hostport(uctx, url, client_error_r))
                return 0;
 
        /* validate mailbox */
        if ((ret = imap_msgpart_url_create(user, url, &mpurl, &error)) < 0 ||
            imap_msgpart_url_verify(mpurl, &error) <= 0) {
-               *error_r = t_strdup_printf("Invalid URL: %s", error);
+               *client_error_r = t_strdup_printf("Invalid URL: %s", error);
                if (mpurl != NULL)
                        imap_msgpart_url_free(&mpurl);
                return ret;
@@ -311,7 +311,7 @@ int imap_urlauth_generate(struct imap_urlauth_context *uctx,
 
        /* obtain mailbox key */
        ret = imap_urlauth_backend_get_mailbox_key(box, TRUE, mailbox_key,
-                                                  error_r, &error_code);
+                                                  client_error_r, &error_code);
        if (ret < 0) {
                imap_msgpart_url_free(&mpurl);
                return ret;

diff --git a/src/lib-imap-urlauth/imap-urlauth.h b/src/lib-imap-urlauth/imap-urlauth.h
index b93271b5af10b3a9861aa0d1415b2df07a638c27..9c7c30f80ac644f7016e4fc22b315bbf7effee8a 100644 (file)
--- a/src/lib-imap-urlauth/imap-urlauth.h
+++ b/src/lib-imap-urlauth/imap-urlauth.h
@@ -33,7 +33,7 @@ void imap_urlauth_deinit(struct imap_urlauth_context **_uctx);
 
 int imap_urlauth_generate(struct imap_urlauth_context *uctx,
                          const char *mechanism, const char *rumpurl,
-                         const char **urlauth_r, const char **error_r);
+                         const char **urlauth_r, const char **client_error_r);
 
 bool imap_urlauth_check(struct imap_urlauth_context *uctx,
                        struct imap_url *url, bool ignore_unknown_access,