[PATCH HEAD] a typo in a message

Ineiev ineiev at gnu.org
Fri Oct 7 08:25:53 CEST 2016


On Fri, Oct 07, 2016 at 02:06:42AM -0400, Ineiev wrote:
> 
> Like this?
> 
> diff --git a/g10/tofu.c b/g10/tofu.c
> index c100c43..858cde6 100644
> --- a/g10/tofu.c
> +++ b/g10/tofu.c
> @@ -3052,9 +3052,13 @@ tofu_register_encryption (ctrl_t ctrl,
>        free_user_id_list = 1;
> 
>        if (! user_id_list)
> -        log_info (_("WARNING: Encrypting to %s, which has no"
> -                    "non-revoked user ids.\n"),
> -                  keystr (pk->keyid));
> +        {
> +          log_error (_("error encrypting to %s: the key has no "
> +                       "usable user IDs.\n"),
> +                        keystr (pk->keyid));
> +          rc = gpg_error (GPG_ERR_UNUSABLE_PUBKEY);
> +          goto die;
> +        }
>      }
> 
>    fingerprint = hexfingerprint (pk, NULL, 0);

Sorry,

diff --git a/g10/tofu.c b/g10/tofu.c
index c100c43..9a55ed8 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -3052,9 +3052,13 @@ tofu_register_encryption (ctrl_t ctrl,
       free_user_id_list = 1;

       if (! user_id_list)
-        log_info (_("WARNING: Encrypting to %s, which has no"
-                    "non-revoked user ids.\n"),
-                  keystr (pk->keyid));
+        {
+          log_error (_("error encrypting to %s: the key has no "
+                       "usable user IDs\n"),
+                        keystr (pk->keyid));
+          rc = gpg_error (GPG_ERR_UNUSABLE_PUBKEY);
+          goto die;
+        }
     }

   fingerprint = hexfingerprint (pk, NULL, 0);



More information about the Gnupg-devel mailing list