security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-08 17:43:04 +01:00
Code Activity

* g10.c (check_permissions): Rearrange strings to make translating easier

Browse Source 
(don't incorporate string parts).

* keyedit.c (sign_uids): Make strings translatable.

* sig-check.c (check_key_signature2): Make string translatable.
This commit is contained in:
David Shaw 2002-09-15 03:15:56 +00:00
parent 0e7778cb51
commit d29d483e5f
4 changed files with 63 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/ChangeLog
View File

@ -1,3 +1,12 @@
2002-09-14 David Shaw <dshaw@jabberwocky.com>
* g10.c (check_permissions): Rearrange strings to make translating
easier (don't incorporate string parts).
* keyedit.c (sign_uids): Make strings translatable.
* sig-check.c (check_key_signature2): Make string translatable.
2002-09-13 David Shaw <dshaw@jabberwocky.com> 2002-09-13 David Shaw <dshaw@jabberwocky.com>
* getkey.c (check_revocation_keys): Move.... * getkey.c (check_revocation_keys): Move....

66
g10/g10.c
View File

@ -25,6 +25,7 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <unistd.h> #include <unistd.h>
#include <assert.h>
#ifdef HAVE_DOSISH_SYSTEM #ifdef HAVE_DOSISH_SYSTEM
#include <fcntl.h> /* for setmode() */ #include <fcntl.h> /* for setmode() */
#endif #endif
@ -850,7 +851,7 @@ check_permissions(const char *path,int item)
{ {
#if defined(HAVE_STAT) && !defined(HAVE_DOSISH_SYSTEM) #if defined(HAVE_STAT) && !defined(HAVE_DOSISH_SYSTEM)
static int homedir_cache=-1; static int homedir_cache=-1;
char *tmppath,*isa,*dir; char *tmppath,*dir;
struct stat statbuf,dirbuf; struct stat statbuf,dirbuf;
int homedir=0,ret=0,checkonly=0; int homedir=0,ret=0,checkonly=0;
int perm=0,own=0,enc_dir_perm=0,enc_dir_own=0; int perm=0,own=0,enc_dir_perm=0,enc_dir_own=0;
@ -858,6 +859,8 @@ check_permissions(const char *path,int item)
if(opt.no_perm_warn) if(opt.no_perm_warn)
return 0; return 0;
assert(item==0 || item==1 || item==2);
/* extensions may attach a path */ /* extensions may attach a path */
if(item==2 && path[0]!=DIRSEP_C) if(item==2 && path[0]!=DIRSEP_C)
{ {
@ -907,8 +910,6 @@ check_permissions(const char *path,int item)
if(item==0) if(item==0)
{ {
isa="homedir";
/* The homedir must be x00, a directory, and owned by the user. */ /* The homedir must be x00, a directory, and owned by the user. */
if(S_ISDIR(statbuf.st_mode)) if(S_ISDIR(statbuf.st_mode))
@ -928,11 +929,6 @@ check_permissions(const char *path,int item)
} }
else if(item==1 || item==2) else if(item==1 || item==2)
{ {
if(item==1)
isa="configuration file";
else
isa="extension";
/* The options or extension file. Okay unless it or its /* The options or extension file. Okay unless it or its
containing directory is group or other writable or not owned containing directory is group or other writable or not owned
by us or root. */ by us or root. */
@ -980,19 +976,53 @@ check_permissions(const char *path,int item)
if(!checkonly) if(!checkonly)
{ {
if(own) if(own)
log_info(_("WARNING: unsafe ownership on %s \"%s\"\n"), {
isa,tmppath); if(item==0)
log_info(_("WARNING: unsafe ownership on "
"homedir \"%s\"\n"),tmppath);
else if(item==1)
log_info(_("WARNING: unsafe ownership on "
"configuration file \"%s\"\n"),tmppath);
else
log_info(_("WARNING: unsafe ownership on "
"extension \"%s\"\n"),tmppath);
}
if(perm) if(perm)
log_info(_("WARNING: unsafe permissions on %s \"%s\"\n"), {
isa,tmppath); if(item==0)
log_info(_("WARNING: unsafe permissions on "
"homedir \"%s\"\n"),tmppath);
else if(item==1)
log_info(_("WARNING: unsafe permissions on "
"configuration file \"%s\"\n"),tmppath);
else
log_info(_("WARNING: unsafe permissions on "
"extension \"%s\"\n"),tmppath);
}
if(enc_dir_own) if(enc_dir_own)
log_info(_("WARNING: unsafe enclosing directory " {
"ownership on %s \"%s\"\n"), if(item==0)
isa,tmppath); log_info(_("WARNING: unsafe enclosing directory ownership on "
"homedir \"%s\"\n"),tmppath);
else if(item==1)
log_info(_("WARNING: unsafe enclosing directory ownership on "
"configuration file \"%s\"\n"),tmppath);
else
log_info(_("WARNING: unsafe enclosing directory ownership on "
"extension \"%s\"\n"),tmppath);
}
if(enc_dir_perm) if(enc_dir_perm)
log_info(_("WARNING: unsafe enclosing directory " {
"permissions on %s \"%s\"\n"), if(item==0)
isa,tmppath); log_info(_("WARNING: unsafe enclosing directory permissions on "
"homedir \"%s\"\n"),tmppath);
else if(item==1)
log_info(_("WARNING: unsafe enclosing directory permissions on "
"configuration file \"%s\"\n"),tmppath);
else
log_info(_("WARNING: unsafe enclosing directory permissions on "
"extension \"%s\"\n"),tmppath);
}
} }
end: end:

8
g10/keyedit.c
View File

@ -562,13 +562,13 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
"above? If you don't know what to answer, enter \"0\".\n")); "above? If you don't know what to answer, enter \"0\".\n"));
tty_printf("\n"); tty_printf("\n");
tty_printf(_(" (0) I will not answer.%s\n"), tty_printf(_(" (0) I will not answer.%s\n"),
opt.def_cert_check_level==0?" (default)":""); opt.def_cert_check_level==0?_(" (default)"):"");
tty_printf(_(" (1) I have not checked at all.%s\n"), tty_printf(_(" (1) I have not checked at all.%s\n"),
opt.def_cert_check_level==1?" (default)":""); opt.def_cert_check_level==1?_(" (default)"):"");
tty_printf(_(" (2) I have done casual checking.%s\n"), tty_printf(_(" (2) I have done casual checking.%s\n"),
opt.def_cert_check_level==2?" (default)":""); opt.def_cert_check_level==2?_(" (default)"):"");
tty_printf(_(" (3) I have done very careful checking.%s\n"), tty_printf(_(" (3) I have done very careful checking.%s\n"),
opt.def_cert_check_level==3?" (default)":""); opt.def_cert_check_level==3?_(" (default)"):"");
tty_printf("\n"); tty_printf("\n");
while(class==0) while(class==0)

3
g10/sig-check.c
View File

@ -546,7 +546,8 @@ check_key_signature2( KBNODE root, KBNODE node, int *is_selfsig,
} }
else { else {
if (!opt.quiet) if (!opt.quiet)
log_info ("key %08lX: no subkey for subkey revocation packet\n", log_info (_("key %08lX: no subkey for subkey "
"revocation packet\n"),
(ulong)keyid_from_pk (pk, NULL)); (ulong)keyid_from_pk (pk, NULL));
rc = G10ERR_SIG_CLASS; rc = G10ERR_SIG_CLASS;
} }