Changeset 571 for trunk

Timestamp:

Mar 7, 2022, 6:46:07 PM (3 years ago)

Author:

katerina

Message:

Fix for ticket #459 (new gpg pubring name).

File:

• trunk/src/sh_sig.c (modified) (2 diffs)

trunk/src/sh_sig.c

@@ -1069 +1069 @@
             {
               dlog(1, FIL__, __LINE__, 
-                   _("Gnupg directory %s for user %s\ndoes not exist or is not accessible.\nPlease add the directory and put the keyring (pubring.gpg) there\nto verify the configuration file.\n"),
+                   _("Gnupg directory %s for user %s\ndoes not exist or is not accessible.\nPlease add the directory and put the keyring (pubring.gpg or pubring.kbx) there\nto verify the configuration file.\n"),
                    cc4, DEFAULT_IDENT);
               status_stat = -3;
@@ -1083 +1083 @@
       if (status_stat == 0)
         {
-          sl_strlcat (cc4,   _("/pubring.gpg"),      SH_PATHBUF+32); 
-          status_stat =  retry_lstat(FIL__, __LINE__, cc4, &lbuf);
+          char   cc4_test[SH_PATHBUF+32];
+
+          sl_strlcpy(cc4_test, cc4, SH_PATHBUF+32);
+          sl_strlcat (cc4_test,   _("/pubring.gpg"),      SH_PATHBUF+32); 
+
+          status_stat =  retry_lstat(FIL__, __LINE__, cc4_test, &lbuf);
           if (status_stat == -1)
             {
-              dlog(1, FIL__, __LINE__, 
-                   _("Gnupg public keyring %s for user %s\ndoes not exist or is not accessible.\nPlease add the directory and put the keyring (pubring.gpg) there\nto verify the configuration file.\n"),
-                   cc4, DEFAULT_IDENT);
-              status_stat = -5;
+              sl_strlcpy(cc4_test, cc4, SH_PATHBUF+32);
+              sl_strlcat (cc4_test,   _("/pubring.kbx"),      SH_PATHBUF+32);
+
+              status_stat =  retry_lstat(FIL__, __LINE__, cc4_test, &lbuf);
+              if (status_stat == -1)
+                {
+                  sl_strlcpy(cc4_test, cc4, SH_PATHBUF+32);
+                  sl_strlcat (cc4_test,   _("/pubring.(gpg|kbx)"),      SH_PATHBUF+32);
+                  
+                  dlog(1, FIL__, __LINE__, 
+                       _("Gnupg public keyring %s for user %s\ndoes not exist or is not accessible.\nPlease add the directory and put the keyring (pubring.gpg or pubring.kbx) there\nto verify the configuration file.\n"),
+                       cc4_test, DEFAULT_IDENT);
+                  status_stat = -5;
+                }
             }
         }