security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-08 23:37:47 +02:00
Code Activity

* exec.c, export.c, import.c, keyedit.c, keyserver.c, misc.c: "Warning" ->

Browse Source 
"WARNING"
This commit is contained in:
David Shaw 2002-07-25 18:08:09 +00:00
parent 36d5779e82
commit 9ac6821b46
7 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2002-07-25 David Shaw <dshaw@jabberwocky.com>
* exec.c, export.c, import.c, keyedit.c, keyserver.c, misc.c:
"Warning" -> "WARNING"
2002-07-24 David Shaw <dshaw@jabberwocky.com> 2002-07-24 David Shaw <dshaw@jabberwocky.com>
* main.h, import.c (parse_import_options, fix_hkp_corruption, * main.h, import.c (parse_import_options, fix_hkp_corruption,

6
g10/exec.c
View File

@ -587,19 +587,19 @@ int exec_finish(struct exec_info *info)
if(info->tempfile_in) if(info->tempfile_in)
{ {
if(unlink(info->tempfile_in)==-1) if(unlink(info->tempfile_in)==-1)
log_info(_("Warning: unable to remove tempfile (%s) \"%s\": %s\n"), log_info(_("WARNING: unable to remove tempfile (%s) \"%s\": %s\n"),
"in",info->tempfile_in,strerror(errno)); "in",info->tempfile_in,strerror(errno));
} }
if(info->tempfile_out) if(info->tempfile_out)
{ {
if(unlink(info->tempfile_out)==-1) if(unlink(info->tempfile_out)==-1)
log_info(_("Warning: unable to remove tempfile (%s) \"%s\": %s\n"), log_info(_("WARNING: unable to remove tempfile (%s) \"%s\": %s\n"),
"out",info->tempfile_out,strerror(errno)); "out",info->tempfile_out,strerror(errno));
} }
if(rmdir(info->tempdir)==-1) if(rmdir(info->tempdir)==-1)
log_info(_("Warning: unable to remove temp directory \"%s\": %s\n"), log_info(_("WARNING: unable to remove temp directory \"%s\": %s\n"),
info->tempdir,strerror(errno)); info->tempdir,strerror(errno));
} }

2
g10/export.c
View File

@ -315,7 +315,7 @@ do_export_stream( IOBUF out, STRLIST users, int secret,
node->pkt->pkt.secret_key->protect.sha1chk) node->pkt->pkt.secret_key->protect.sha1chk)
{ {
/* I hope this warning doesn't confuse people. */ /* I hope this warning doesn't confuse people. */
log_info("Warning: secret key %08lX does not have a " log_info("WARNING: secret key %08lX does not have a "
"simple SK checksum\n",(ulong)sk_keyid[1]); "simple SK checksum\n",(ulong)sk_keyid[1]);
sha1_warned=1; sha1_warned=1;

4
g10/import.c
View File

@ -1362,7 +1362,7 @@ revocation_present(KBNODE keyblock)
if(opt.keyserver_scheme && if(opt.keyserver_scheme &&
opt.keyserver_options.auto_key_retrieve) opt.keyserver_options.auto_key_retrieve)
{ {
log_info(_("Warning: key %08lX may be revoked: " log_info(_("WARNING: key %08lX may be revoked: "
"fetching revocation key %08lX\n"), "fetching revocation key %08lX\n"),
(ulong)keyid_from_pk(pk,NULL), (ulong)keyid_from_pk(pk,NULL),
(ulong)keyid[1]); (ulong)keyid[1]);
@ -1376,7 +1376,7 @@ revocation_present(KBNODE keyblock)
} }
if(rc==G10ERR_NO_PUBKEY || rc==G10ERR_UNU_PUBKEY) if(rc==G10ERR_NO_PUBKEY || rc==G10ERR_UNU_PUBKEY)
log_info(_("Warning: key %08lX may be revoked: " log_info(_("WARNING: key %08lX may be revoked: "
"revocation key %08lX not present.\n"), "revocation key %08lX not present.\n"),
(ulong)keyid_from_pk(pk,NULL), (ulong)keyid_from_pk(pk,NULL),
(ulong)keyid[1]); (ulong)keyid[1]);

6
g10/keyedit.c
View File

@ -374,7 +374,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
} }
else if(!uidnode->pkt->pkt.user_id->created) else if(!uidnode->pkt->pkt.user_id->created)
{ {
tty_printf(_("Warning: user ID \"%s\" is not " tty_printf(_("WARNING: user ID \"%s\" is not "
"self-signed.\n"),user); "self-signed.\n"),user);
} }
@ -602,12 +602,12 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
if( local ) if( local )
tty_printf( tty_printf(
_("\nWarning: the signature will not be marked " _("\nWARNING: the signature will not be marked "
"as non-exportable.\n")); "as non-exportable.\n"));
if( nonrevocable ) if( nonrevocable )
tty_printf( tty_printf(
_("\nWarning: the signature will not be marked " _("\nWARNING: the signature will not be marked "
"as non-revocable.\n")); "as non-revocable.\n"));
} }
else else

4
g10/keyserver.c
View File

@ -101,7 +101,7 @@ parse_keyserver_options(char *options)
#ifdef EXEC_TEMPFILE_ONLY #ifdef EXEC_TEMPFILE_ONLY
else if(ascii_strcasecmp(tok,"use-temp-files")==0 || else if(ascii_strcasecmp(tok,"use-temp-files")==0 ||
ascii_strcasecmp(tok,"no-use-temp-files")==0) ascii_strcasecmp(tok,"no-use-temp-files")==0)
log_info(_("Warning: keyserver option \"%s\" is not used " log_info(_("WARNING: keyserver option \"%s\" is not used "
"on this platform\n"),tok); "on this platform\n"),tok);
#else #else
else if(ascii_strcasecmp(tok,"use-temp-files")==0) else if(ascii_strcasecmp(tok,"use-temp-files")==0)
@ -567,7 +567,7 @@ keyserver_spawn(int action,STRLIST list,
else if(ascii_memcasecmp(ptr,"PROGRAM ",8)==0) else if(ascii_memcasecmp(ptr,"PROGRAM ",8)==0)
{ {
if(ascii_memcasecmp(&ptr[8],VERSION,strlen(VERSION))!=0) if(ascii_memcasecmp(&ptr[8],VERSION,strlen(VERSION))!=0)
log_info(_("Warning: keyserver handler from a different " log_info(_("WARNING: keyserver handler from a different "
"version of GnuPG (%s)\n"),&ptr[8]); "version of GnuPG (%s)\n"),&ptr[8]);
} }
else if(ascii_memcasecmp(ptr,"OPTION OUTOFBAND",16)==0) else if(ascii_memcasecmp(ptr,"OPTION OUTOFBAND",16)==0)

4
g10/misc.c
View File

@ -383,7 +383,7 @@ check_permissions(const char *path,int extension,int checkonly)
(extension && statbuf.st_uid!=0 && statbuf.st_uid!=getuid())) (extension && statbuf.st_uid!=0 && statbuf.st_uid!=getuid()))
{ {
if(!checkonly) if(!checkonly)
log_info(_("Warning: unsafe ownership on %s \"%s\"\n"), log_info(_("WARNING: unsafe ownership on %s \"%s\"\n"),
isdir?"directory":extension?"extension":"file",path); isdir?"directory":extension?"extension":"file",path);
goto end; goto end;
} }
@ -415,7 +415,7 @@ check_permissions(const char *path,int extension,int checkonly)
m_free(dir); m_free(dir);
if(!checkonly) if(!checkonly)
log_info(_("Warning: unsafe permissions on %s \"%s\"\n"), log_info(_("WARNING: unsafe permissions on %s \"%s\"\n"),
isdir?"directory":extension?"extension":"file",path); isdir?"directory":extension?"extension":"file",path);
goto end; goto end;
} }