Changeset 571 for trunk/src


Ignore:
Timestamp:
Mar 7, 2022, 6:46:07 PM (3 years ago)
Author:
katerina
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/sh_sig.c

    r561 r571  
    10691069            {
    10701070              dlog(1, FIL__, __LINE__,
    1071                    _("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"),
     1071                   _("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"),
    10721072                   cc4, DEFAULT_IDENT);
    10731073              status_stat = -3;
     
    10831083      if (status_stat == 0)
    10841084        {
    1085           sl_strlcat (cc4,   _("/pubring.gpg"),      SH_PATHBUF+32);
    1086           status_stat =  retry_lstat(FIL__, __LINE__, cc4, &lbuf);
     1085          char   cc4_test[SH_PATHBUF+32];
     1086
     1087          sl_strlcpy(cc4_test, cc4, SH_PATHBUF+32);
     1088          sl_strlcat (cc4_test,   _("/pubring.gpg"),      SH_PATHBUF+32);
     1089
     1090          status_stat =  retry_lstat(FIL__, __LINE__, cc4_test, &lbuf);
    10871091          if (status_stat == -1)
    10881092            {
    1089               dlog(1, FIL__, __LINE__,
    1090                    _("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"),
    1091                    cc4, DEFAULT_IDENT);
    1092               status_stat = -5;
     1093              sl_strlcpy(cc4_test, cc4, SH_PATHBUF+32);
     1094              sl_strlcat (cc4_test,   _("/pubring.kbx"),      SH_PATHBUF+32);
     1095
     1096              status_stat =  retry_lstat(FIL__, __LINE__, cc4_test, &lbuf);
     1097              if (status_stat == -1)
     1098                {
     1099                  sl_strlcpy(cc4_test, cc4, SH_PATHBUF+32);
     1100                  sl_strlcat (cc4_test,   _("/pubring.(gpg|kbx)"),      SH_PATHBUF+32);
     1101                 
     1102                  dlog(1, FIL__, __LINE__,
     1103                       _("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"),
     1104                       cc4_test, DEFAULT_IDENT);
     1105                  status_stat = -5;
     1106                }
    10931107            }
    10941108        }
Note: See TracChangeset for help on using the changeset viewer.