From 9ebfa320b724b6e745d768a003ef7086f091565e Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Mon, 30 Jun 2008 13:46:09 +0000 Subject: [PATCH] Documentation and program output now /consistently/ claim that the rcfile must not have more than 0700 (u=rwx,g=,o=) permissions, but fetchmail will still silently accept additional g=x permissions for compatibility with previous 6.2.X and 6.3.X versions. Inconsistency (program 0710, manpage 0600) reported by Petr Uzel. svn path=/branches/BRANCH_6-3/; revision=5211 --- NEWS | 5 +++++ TODO.txt | 2 ++ fetchmail.man | 4 ++-- po/ca.po | 6 +++--- po/cs.po | 6 +++--- po/da.po | 4 ++-- po/de.po | 6 +++--- po/el.po | 4 ++-- po/en_GB.po | 6 +++--- po/es.po | 6 +++--- po/fr.po | 6 +++--- po/gl.po | 2 +- po/ja.po | 6 +++--- po/pl.po | 6 +++--- po/pt_BR.po | 2 +- po/ru.po | 6 +++--- po/sk.po | 2 +- po/sq.po | 6 +++--- po/tr.po | 4 ++-- po/vi.po | 6 +++--- rcfile_y.y | 2 +- 21 files changed, 52 insertions(+), 45 deletions(-) diff --git a/NEWS b/NEWS index 50aa2271..da50ce3d 100644 --- a/NEWS +++ b/NEWS @@ -137,6 +137,11 @@ fetchmail 6.3.9 (not yet released): fetchmail is run. * The FAQ now recommends (#I9) not to use Google Mail for their disregard to the protocols they claim to support. +* Documentation and program output now /consistently/ claim that the rcfile must + not have more than 0700 (u=rwx,g=,o=) permissions, but fetchmail will still + silently accept additional g=x permissions for compatibility with previous + 6.2.X and 6.3.X versions. + Inconsistency (program 0710, manpage 0600) reported by Petr Uzel. # TRANSLATION UPDATES: * Polish (Jakub Bogusz) diff --git a/TODO.txt b/TODO.txt index ad651b9c..f99a56d6 100644 --- a/TODO.txt +++ b/TODO.txt @@ -54,6 +54,8 @@ questionable: around Nov 2nd)? 6.4: +- revisit maximum allowed rcfile permissions, fix inconsistency + (silently allowing g+x). - make UID code more efficient, parsing is O(n^2), should be no worse than O(n log n). - help systematic debugging diff --git a/fetchmail.man b/fetchmail.man index 1665bcc4..20b413d2 100644 --- a/fetchmail.man +++ b/fetchmail.man @@ -794,7 +794,7 @@ Specify a non-default name for the run control file. The pathname argument must be either "-" (a single dash, meaning to read the configuration from standard input) or a filename. Unless the \-\-version option is also on, a named file -argument must have permissions no more open than 0600 (u=rw,g=,o=) or +argument must have permissions no more open than 0700 (u=rwx,g=,o=) or else be /dev/null. .TP .B \-i | \-\-idfile @@ -1467,7 +1467,7 @@ When there is a conflict between the command-line arguments and the arguments in this file, the command-line arguments take precedence. .PP To protect the security of your passwords, -your \fI~/.fetchmailrc\fR may not normally have more than 0600 (u=rw,g=,o=) permissions; +your \fI~/.fetchmailrc\fR may not normally have more than 0700 (u=rwx,g=,o=) permissions; .I fetchmail will complain and exit otherwise (this check is suppressed when \-\-version is on). diff --git a/po/ca.po b/po/ca.po index f7aac251..5bb04cd6 100644 --- a/po/ca.po +++ b/po/ca.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: fetchmail 6.3.5-b1\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n" -"POT-Creation-Date: 2008-06-17 15:06+0200\n" +"POT-Creation-Date: 2008-06-30 15:43+0200\n" "PO-Revision-Date: 2006-08-31 19:22+0200\n" "Last-Translator: Ernest Adrogué Calveras \n" "Language-Team: Catalan \n" @@ -2432,8 +2432,8 @@ msgstr "El fitxer %s ha de ser un fitxer ordinari.\n" #: rcfile_y.y:431 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" -msgstr "El fitxer %s no pot tenir permisos més que -rwx--x--- (0710).\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" +msgstr "El fitxer %s no pot tenir permisos més que -rwx------ (0700).\n" #: rcfile_y.y:443 #, c-format diff --git a/po/cs.po b/po/cs.po index d5c41e85..3cb13507 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: fetchmail-6.2.6.alpha1\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n" -"POT-Creation-Date: 2008-06-17 15:06+0200\n" +"POT-Creation-Date: 2008-06-30 15:43+0200\n" "PO-Revision-Date: 2005-07-03 03:57+0200\n" "Last-Translator: Miloslav Trmac \n" "Language-Team: Czech \n" @@ -2395,8 +2395,8 @@ msgstr "Soubor %s musí být obyčejný soubor.\n" #: rcfile_y.y:431 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" -msgstr "Soubor %s nesmí mít oprávnění více než -rwx--x--- (0710).\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" +msgstr "Soubor %s nesmí mít oprávnění více než -rwx------ (0700).\n" #: rcfile_y.y:443 #, c-format diff --git a/po/da.po b/po/da.po index c3af16e3..67169993 100644 --- a/po/da.po +++ b/po/da.po @@ -2253,8 +2253,8 @@ msgstr "Filen %s skal v #: rcfile_y.y:428 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" -msgstr "Filen %s må ikke flere tilladelser end -rwx--x--- (0710).\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" +msgstr "Filen %s må ikke flere tilladelser end -rwx------ (0700).\n" #: rcfile_y.y:440 #, c-format diff --git a/po/de.po b/po/de.po index 265d4f5c..fddf93c6 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n" -"POT-Creation-Date: 2008-06-17 15:06+0200\n" +"POT-Creation-Date: 2008-06-30 15:43+0200\n" "PO-Revision-Date: 2006-11-27 04:32+0100\n" "Last-Translator: Matthias Andree \n" "Language-Team: Deutsch \n" @@ -2426,8 +2426,8 @@ msgstr "Datei %s muss eine reguläre Datei sein.\n" #: rcfile_y.y:431 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" -msgstr "Datei %s darf nicht mehr Zugriffrechte haben als -rwx--x-- (0710).\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" +msgstr "Datei %s darf nicht mehr Zugriffrechte haben als -rwx----- (0700).\n" #: rcfile_y.y:443 #, c-format diff --git a/po/el.po b/po/el.po index 2b4a558f..92a8b225 100644 --- a/po/el.po +++ b/po/el.po @@ -2291,8 +2291,8 @@ msgstr " #: rcfile_y.y:428 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" -msgstr "Ôï áñ÷åßï %s äå ðñÝðåé íá Ý÷åé ðÜíù áðü -rwx--x--- (0710) Üäåéåò.\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" +msgstr "Ôï áñ÷åßï %s äå ðñÝðåé íá Ý÷åé ðÜíù áðü -rwx------ (0700) Üäåéåò.\n" #: rcfile_y.y:440 #, c-format diff --git a/po/en_GB.po b/po/en_GB.po index 80ec9838..aae62c6c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: fetchmail 6.3.5\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n" -"POT-Creation-Date: 2008-06-17 15:06+0200\n" +"POT-Creation-Date: 2008-06-30 15:43+0200\n" "PO-Revision-Date: 2006-11-02 06:58-0000\n" "Last-Translator: David Lodge \n" "Language-Team: English (British) \n" @@ -2344,8 +2344,8 @@ msgstr "File %s must be a regular file.\n" #: rcfile_y.y:431 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" -msgstr "File %s must have no more than -rwx--x--- (0710) permissions.\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" +msgstr "File %s must have no more than -rwx------ (0700) permissions.\n" #: rcfile_y.y:443 #, c-format diff --git a/po/es.po b/po/es.po index e6c0eeb0..704bd63f 100644 --- a/po/es.po +++ b/po/es.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: fetchmail 6.3.4-rc1\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n" -"POT-Creation-Date: 2008-06-17 15:06+0200\n" +"POT-Creation-Date: 2008-06-30 15:43+0200\n" "PO-Revision-Date: 2007-05-02 00:05+0200\n" "Last-Translator: Héctor García \n" "Language-Team: Spanish \n" @@ -2508,8 +2508,8 @@ msgstr "El archivo %s debe ser de tipo normal.\n" #: rcfile_y.y:431 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" -msgstr "El archivo %s no debe tener mas que los permisos -rwx--x--- (0710).\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" +msgstr "El archivo %s no debe tener mas que los permisos -rwx------ (0700).\n" #: rcfile_y.y:443 #, c-format diff --git a/po/fr.po b/po/fr.po index 07dec3c5..df37e3ea 100644 --- a/po/fr.po +++ b/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: fetchmail 6.2.9-rc9\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n" -"POT-Creation-Date: 2008-06-17 15:06+0200\n" +"POT-Creation-Date: 2008-06-30 15:43+0200\n" "PO-Revision-Date: 2005-12-18 11:50+0100\n" "Last-Translator: Matthias Andree \n" "Language-Team: French \n" @@ -2456,8 +2456,8 @@ msgstr "Le fichier %s doit etre un fichier normal.\n" #: rcfile_y.y:431 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" -msgstr "Le fichier %s doit avoir au moins les permissions -rwx--x--- (0710)\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" +msgstr "Le fichier %s doit avoir au moins les permissions -rwx------ (0700)\n" #: rcfile_y.y:443 #, c-format diff --git a/po/gl.po b/po/gl.po index d169bb47..f43da152 100644 --- a/po/gl.po +++ b/po/gl.po @@ -2310,7 +2310,7 @@ msgstr "" #: rcfile_y.y:428 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" msgstr "" #: rcfile_y.y:440 diff --git a/po/ja.po b/po/ja.po index a0fa300f..18059599 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fetchmail 6.3.8\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n" -"POT-Creation-Date: 2008-06-17 15:06+0200\n" +"POT-Creation-Date: 2008-06-30 15:43+0200\n" "PO-Revision-Date: 2007-04-28 20:54+0900\n" "Last-Translator: Takeshi Hamasaki \n" "Language-Team: Japanese \n" @@ -2407,8 +2407,8 @@ msgstr "" #: rcfile_y.y:431 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" -msgstr "%s は -rwx--x--- (0710) 以外のパーミッションであってはいけません。\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" +msgstr "%s は -rwx------ (0700) 以外のパーミッションであってはいけません。\n" #: rcfile_y.y:443 #, c-format diff --git a/po/pl.po b/po/pl.po index 75384eb1..fd6be64c 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fetchmail 6.3.8\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n" -"POT-Creation-Date: 2008-06-17 15:06+0200\n" +"POT-Creation-Date: 2008-06-30 15:43+0200\n" "PO-Revision-Date: 2007-04-27 17:28+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" @@ -2442,8 +2442,8 @@ msgstr "Plik %s musi by #: rcfile_y.y:431 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" -msgstr "Plik %s nie mo¿e mieæ uprawnieñ wiêkszych ni¿ -rwx--x--- (0710).\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" +msgstr "Plik %s nie mo¿e mieæ uprawnieñ wiêkszych ni¿ -rwx------ (0700).\n" #: rcfile_y.y:443 #, c-format diff --git a/po/pt_BR.po b/po/pt_BR.po index 2a3987ac..7d8b090f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2315,7 +2315,7 @@ msgstr "" #: rcfile_y.y:428 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" msgstr "" #: rcfile_y.y:440 diff --git a/po/ru.po b/po/ru.po index 02a4340f..0bec88f2 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fetchmail-6.3.8-rc2\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n" -"POT-Creation-Date: 2008-06-17 15:06+0200\n" +"POT-Creation-Date: 2008-06-30 15:43+0200\n" "PO-Revision-Date: 2007-03-27 00:47+0300\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" @@ -2426,8 +2426,8 @@ msgstr "Файл %s должен быть обычным файлом.\n" #: rcfile_y.y:431 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" -msgstr "Файл %s должен иметь разрешения -rwx--x--- (0710), но не более того.\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" +msgstr "Файл %s должен иметь разрешения -rwx------ (0700), но не более того.\n" #: rcfile_y.y:443 #, c-format diff --git a/po/sk.po b/po/sk.po index 2c4be405..42b40a32 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2262,7 +2262,7 @@ msgstr "" #: rcfile_y.y:428 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" msgstr "" #: rcfile_y.y:440 diff --git a/po/sq.po b/po/sq.po index 88f4af7b..d63ff4f0 100644 --- a/po/sq.po +++ b/po/sq.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: fetchmail 6.2.9-rc9\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n" -"POT-Creation-Date: 2008-06-17 15:06+0200\n" +"POT-Creation-Date: 2008-06-30 15:43+0200\n" "PO-Revision-Date: 2005-11-18 22:25+0200\n" "Last-Translator: Besnik Bleta \n" "Language-Team: Albanian \n" @@ -2423,8 +2423,8 @@ msgstr "Kartela %s duhet t #: rcfile_y.y:431 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" -msgstr "Kartela %s duhet të ketë jo më shumë se lejet -rwx--x--- (0710).\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" +msgstr "Kartela %s duhet të ketë jo më shumë se lejet -rwx------ (0700).\n" #: rcfile_y.y:443 #, c-format diff --git a/po/tr.po b/po/tr.po index 288f22bb..effec637 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2338,8 +2338,8 @@ msgstr "%s dosyas #: rcfile_y.y:428 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" -msgstr "Dosyanýn (%s) izinleri -rwx--x--- (0710)'den çok olmamalý.\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" +msgstr "Dosyanýn (%s) izinleri -rwx------ (0700)'den çok olmamalý.\n" #: rcfile_y.y:440 #, c-format diff --git a/po/vi.po b/po/vi.po index 70ea9363..35e6d578 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: fetchmail 6.3.8\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n" -"POT-Creation-Date: 2008-06-17 15:06+0200\n" +"POT-Creation-Date: 2008-06-30 15:43+0200\n" "PO-Revision-Date: 2007-05-28 21:48+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -2409,9 +2409,9 @@ msgstr "Tập tin %s phải là một tập tin chuẩn.\n" #: rcfile_y.y:431 #, c-format -msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n" +msgid "File %s must have no more than -rwx------ (0700) permissions.\n" msgstr "" -"Không cho phép tập tin %s có quyền hạn lớn hÆ¡n « -rws--x--- » (0710).\n" +"Không cho phép tập tin %s có quyền hạn lớn hÆ¡n « -rwx------ » (0700).\n" #: rcfile_y.y:443 #, c-format diff --git a/rcfile_y.y b/rcfile_y.y index 0e622002..7503bee0 100644 --- a/rcfile_y.y +++ b/rcfile_y.y @@ -428,7 +428,7 @@ int prc_filecheck(const char *pathname, #endif /* __CYGWIN__ */ if (statbuf.st_mode & (S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH | S_IXOTH)) { - fprintf(stderr, GT_("File %s must have no more than -rwx--x--- (0710) permissions.\n"), + fprintf(stderr, GT_("File %s must have no more than -rwx------ (0700) permissions.\n"), pathname); return(PS_IOERR); } -- 2.43.2