postfix-pl.patch

   1 diff -urN snapshot-20011114/src/bounce/bounce_notify_util.c snapshot-20011114.my/src/bounce/bounce_notify_util.c
   2 --- snapshot-20011114/src/bounce/bounce_notify_util.c   Thu Aug 23 01:49:42 2001
   3 +++ snapshot-20011114.my/src/bounce/bounce_notify_util.c        Thu Nov 15 10:50:21 2001
   4 @@ -273,7 +273,7 @@
   5         post_mail_fputs(bounce, dest == var_bounce_rcpt
   6                      || dest == var_2bounce_rcpt || dest == var_delay_rcpt ?
   7                         "Subject: Postmaster Copy: Undelivered Mail" :
   8 -                       "Subject: Undelivered Mail Returned to Sender");
   9 +                       "Subject: Zwrot niedostarczonej poczty / Undelivered Mail Returned to Sender");
  10      }
  11
  12      /*
  13 @@ -283,7 +283,7 @@
  14         post_mail_fputs(bounce, dest == var_bounce_rcpt
  15                      || dest == var_2bounce_rcpt || dest == var_delay_rcpt ?
  16                         "Subject: Postmaster Warning: Delayed Mail" :
  17 -                       "Subject: Delayed Mail (still being retried)");
  18 +                       "Subject:  Opoznienie wyslania / Delayed Mail (still being retried)");
  19      }
  20      post_mail_fprintf(bounce, "To: %s",
  21                       STR(quote_822_local(bounce_info->buf, dest)));
  22 @@ -298,15 +298,6 @@
  23      post_mail_fputs(bounce, "");
  24      post_mail_fputs(bounce, "This is a MIME-encapsulated message.");
  25
  26 -    /*
  27 -     * MIME header.
  28 -     */
  29 -    post_mail_fputs(bounce, "");
  30 -    post_mail_fprintf(bounce, "--%s", bounce_info->mime_boundary);
  31 -    post_mail_fprintf(bounce, "Content-Description: %s", "Notification");
  32 -    post_mail_fprintf(bounce, "Content-Type: %s", "text/plain");
  33 -    post_mail_fputs(bounce, "");
  34 -
  35      return (vstream_ferror(bounce));
  36  }
  37
  38 @@ -322,6 +313,73 @@
  39       * word wrapping to make the text look nicer. No matter how hard we would
  40       * try, receiving bounced mail will always suck.
  41       */
  42 +
  43 +
  44 +    /* teraz po polsku */
  45 +    post_mail_fputs(bounce, "");
  46 +    post_mail_fprintf(bounce, "--%s", bounce_info->mime_boundary);
  47 +    post_mail_fprintf(bounce, "Content-Description: %s", "Informacja");
  48 +    post_mail_fprintf(bounce, "Content-Type: %s", "text/plain; charset=iso-8859-2");
  49 +    post_mail_fprintf(bounce, "Content-Transfer-Encoding: %s", "8bit");
  50 +    post_mail_fputs(bounce, "");
  51 +
  52 +    post_mail_fprintf(bounce, "Informacja od systemu pocztowego %s.",
  53 +                     var_myhostname);
  54 +    post_mail_fputs(bounce, "");
  55 +    if (bounce_info->flush) {
  56 +       post_mail_fputs(bounce,
  57 +               "Twój list nie móg³ byæ dostarczony do jednego");
  58 +       post_mail_fputs(bounce,
  59 +               "lub wiêkszej liczby odbiorców.");
  60 +    } else {
  61 +       post_mail_fputs(bounce,
  62 +                       "########################################################################");
  63 +       post_mail_fputs(bounce,
  64 +                       "# TO JEST TYLKO OSTRZE¯ENIE. NIE MUSISZ PONOWNIE WYSY£AÆ SWOJEGO LISTU #");
  65 +       post_mail_fputs(bounce,
  66 +                       "########################################################################");
  67 +       post_mail_fputs(bounce, "");
  68 +       post_mail_fprintf(bounce,
  69 +                       "Twój list nie móg³ byæ dostarczony przez %d godzin.",
  70 +                         var_delay_warn_time);
  71 +       post_mail_fprintf(bounce,
  72 +                         "Bêd± podejmowane próby wys³ania jeszcze przez %d dni.",
  73 +                         var_max_queue_time);
  74 +    }
  75 +
  76 +    post_mail_fputs(bounce, "");
  77 +
  78 +    /* FIXME */
  79 +#if 0
  80 +    post_mail_fprintf(bounce,
  81 +                     "For further assistance, please contact <%s>",
  82 +                     STR(canon_addr_external(buf, MAIL_ADDR_POSTMASTER)));
  83 +    if (flush) {
  84 +       post_mail_fputs(bounce, "");
  85 +       post_mail_fprintf(bounce,
  86 +              "If you do so, please include this problem report. You can");
  87 +       post_mail_fprintf(bounce,
  88 +                  "delete your own text from the message returned below.");
  89 +       post_mail_fprintf(bounce,
  90 +              "If you do so, please include this problem report. You can");
  91 +       post_mail_fprintf(bounce,
  92 +                  "delete your own text from the message returned below.");
  93 +    }
  94 +    /* FIXME */
  95 +    post_mail_fputs(bounce, "");
  96 +    post_mail_fprintf(bounce, "\t\t\tProgram %s", var_mail_name);
  97 +    post_mail_fputs(bounce, "");
  98 +#endif
  99 +
 100 +       /*
 101 +     * MIME header.
 102 +     */
 103 +    post_mail_fputs(bounce, "");
 104 +    post_mail_fprintf(bounce, "--%s", bounce_info->mime_boundary);
 105 +    post_mail_fprintf(bounce, "Content-Description: %s", "Notification");
 106 +    post_mail_fprintf(bounce, "Content-Type: %s", "text/plain");
 107 +    post_mail_fputs(bounce, "");
 108 +
 109      post_mail_fprintf(bounce, "This is the %s program at host %s.",
 110                       var_mail_name, var_myhostname);
 111      post_mail_fputs(bounce, "");
 112 @@ -345,7 +403,7 @@
 113                           "It will be retried until it is %.1f days old.",
 114                           var_max_queue_time / 86400.0);
 115      }
 116 -
 117 +#if 0
 118      post_mail_fputs(bounce, "");
 119      post_mail_fprintf(bounce,
 120                       "For further assistance, please send mail to <%s>",
 121 @@ -357,6 +415,7 @@
 122         post_mail_fprintf(bounce,
 123                    "delete your own text from the message returned below.");
 124      }
 125 +#endif
 126      post_mail_fputs(bounce, "");
 127      post_mail_fprintf(bounce, "\t\t\tThe %s program", var_mail_name);
 128      return (vstream_ferror(bounce));
 129 @@ -418,6 +477,7 @@
 130      if (bounce_info->log_handle == 0
 131         || bounce_log_rewind(bounce_info->log_handle)) {
 132         post_mail_fputs(bounce, "\t--- Delivery error report unavailable ---");
 133 +       post_mail_fputs(bounce, "\t--- Raport dostarczenia niedostepny   ---");
 134      } else {
 135         while (bounce_log_read(bounce_info->log_handle) != 0)
 136             if (bounce_recipient_log(bounce, bounce_info) != 0)
 137 @@ -438,7 +498,8 @@
 138      post_mail_fprintf(bounce, "--%s", bounce_info->mime_boundary);
 139      post_mail_fprintf(bounce, "Content-Description: %s",
 140                       "Delivery error report");
 141 -    post_mail_fprintf(bounce, "Content-Type: %s", "message/delivery-status");
 142 +    post_mail_fprintf(bounce, "Content-Type: %s", "message/delivery-status; charset=iso-8859-2");
 143 +       post_mail_fprintf(bounce, "Content-Transfer-Encoding: %s", "8bit");
 144
 145      /*
 146       * According to RFC 1894: The body of a message/delivery-status consists
 147 @@ -527,6 +588,7 @@
 148      if (bounce_info->orig_offs == 0 || vstream_fseek(bounce_info->orig_fp,
 149                                     bounce_info->orig_offs, SEEK_SET) < 0) {
 150         post_mail_fputs(bounce, "\t--- Undelivered message unavailable ---");
 151 +       post_mail_fputs(bounce, "\t--- Niedostepna kopia niedostarczonego listu ---");
 152         return (vstream_ferror(bounce));
 153      }
 154
 155 diff -urN snapshot-20011114/src/global/pipe_command.c snapshot-20011114.my/src/global/pipe_command.c
 156 --- snapshot-20011114/src/global/pipe_command.c Wed Oct 17 21:57:39 2001
 157 +++ snapshot-20011114.my/src/global/pipe_command.c      Thu Nov 15 10:50:21 2001
 158 @@ -479,9 +479,9 @@
 159         if (pipe_command_wait_or_kill(pid, &wait_status, SIGKILL) < 0)
 160             msg_fatal("wait: %m");
 161         if (pipe_command_timeout) {
 162 -           vstring_sprintf(why, "Command time limit exceeded: \"%s\"%s%s",
 163 +           vstring_sprintf(why, "Przekroczony czas wykonania polecania / Command time limit exceeded: \"%s\"%s%s",
 164                             args.command,
 165 -                           log_len ? ". Command output: " : "", log_buf);
 166 +                           log_len ? ". Wyniki polecenia / Command output: " : "", log_buf);
 167             return (PIPE_STAT_BOUNCE);
 168         }
 169
 170 @@ -491,26 +491,26 @@
 171          */
 172         if (!NORMAL_EXIT_STATUS(wait_status)) {
 173             if (WIFSIGNALED(wait_status)) {
 174 -               vstring_sprintf(why, "Command died with signal %d: \"%s\"%s%s",
 175 +               vstring_sprintf(why, "Polecenia zakonczone blendem / Command died with signal %d: \"%s\"%s%s",
 176                                 WTERMSIG(wait_status),
 177                                 args.command,
 178 -                             log_len ? ". Command output: " : "", log_buf);
 179 +                             log_len ? ". Wynik polecenia / Command output: " : "", log_buf);
 180                 return (PIPE_STAT_DEFER);
 181             } else if (SYS_EXITS_CODE(WEXITSTATUS(wait_status))) {
 182                 vstring_sprintf(why, "%s%s%s",
 183                                 sys_exits_strerror(WEXITSTATUS(wait_status)),
 184 -                             log_len ? ". Command output: " : "", log_buf);
 185 +                             log_len ? ". Wynik polecenia / Command output: " : "", log_buf);
 186                 return (sys_exits_softerror(WEXITSTATUS(wait_status)) ?
 187                         PIPE_STAT_DEFER : PIPE_STAT_BOUNCE);
 188             } else {
 189 -               vstring_sprintf(why, "Command died with status %d: \"%s\"%s%s",
 190 +               vstring_sprintf(why, "Polecenie zakonczone bledem / Command died with status %d: \"%s\"%s%s",
 191                                 WEXITSTATUS(wait_status),
 192                                 args.command,
 193 -                             log_len ? ". Command output: " : "", log_buf);
 194 +                             log_len ? ". Wynik polecenia / Command output: " : "", log_buf);
 195                 return (PIPE_STAT_BOUNCE);
 196             }
 197         } else if (write_status && errno != EPIPE) {
 198 -           vstring_sprintf(why, "Command failed: %m: \"%s\"", args.command);
 199 +           vstring_sprintf(why, "Polecenie niepowiodlo sie / Command failed: %m: \"%s\"", args.command);
 200             return (PIPE_STAT_DEFER);
 201         } else {
 202             return (PIPE_STAT_OK);
 203 diff -urN snapshot-20011114/src/global/sys_exits.c snapshot-20011114.my/src/global/sys_exits.c
 204 --- snapshot-20011114/src/global/sys_exits.c    Fri Dec 11 19:55:25 1998
 205 +++ snapshot-20011114.my/src/global/sys_exits.c Thu Nov 15 10:50:21 2001
 206 @@ -60,21 +60,21 @@
 207  } SYS_EXITS_TABLE;
 208
 209  static SYS_EXITS_TABLE sys_exits_table[] = {
 210 -    0, EX_USAGE, "command line usage error",
 211 -    0, EX_DATAERR, "data format error",
 212 +    0, EX_USAGE, "bledne wywylanie polecanie / command line usage error",
 213 +    0, EX_DATAERR, "blad formatu danych / data format error",
 214      0, EX_NOINPUT, "cannot open input",
 215 -    0, EX_NOUSER, "user unknown",
 216 +    0, EX_NOUSER, "nieznany uzytkownik / user unknown",
 217      0, EX_NOHOST, "host name unknown",
 218 -    0, EX_UNAVAILABLE, "service unavailable",
 219 -    0, EX_SOFTWARE, "internal software error",
 220 +    0, EX_UNAVAILABLE, "niedostepny serwis / service unavailable",
 221 +    0, EX_SOFTWARE, "wewnetrzny blad oprogramowania / internal software error",
 222      1, EX_OSERR, "system resource problem",
 223      0, EX_OSFILE, "critical OS file missing",
 224      0, EX_CANTCREAT, "can't create user output file",
 225      0, EX_IOERR, "input/output error",
 226 -    1, EX_TEMPFAIL, "temporary failure",
 227 +    1, EX_TEMPFAIL, "chwilowe niepowodzenie / temporary failure",
 228      0, EX_PROTOCOL, "remote error in protocol",
 229 -    0, EX_NOPERM, "permission denied",
 230 -    0, EX_CONFIG, "local configuration error",
 231 +    0, EX_NOPERM, "brak dostêpu / permission denied",
 232 +    0, EX_CONFIG, "blad lokalnej konfiguracji / local configuration error",
 233  };
 234
 235  /* sys_exits_strerror - map exit status to error string */
 236 diff -urN snapshot-20011114/src/smtpd/smtpd_check.c snapshot-20011114.my/src/smtpd/smtpd_check.c
 237 --- snapshot-20011114/src/smtpd/smtpd_check.c   Wed Oct 17 20:00:39 2001
 238 +++ snapshot-20011114.my/src/smtpd/smtpd_check.c        Thu Nov 15 10:56:32 2001
 239 @@ -765,7 +765,7 @@
 240       */
 241      if (!valid_hostaddr(test_addr, DONT_GRIPE))
 242         stat = smtpd_check_reject(state, MAIL_ERROR_POLICY,
 243 -                                 "%d <%s>: %s rejected: invalid ip address",
 244 +                                 "%d <%s>: %s odrzucony/rejected: niepoprawny adres IP/invalid IP address",
 245                                 var_bad_name_code, reply_name, reply_class);
 246      else
 247         stat = SMTPD_CHECK_DUNNO;
 248 @@ -801,7 +801,7 @@
 249       */
 250      if (!valid_hostname(test_name, DONT_GRIPE))
 251         stat = smtpd_check_reject(state, MAIL_ERROR_POLICY,
 252 -                                 "%d <%s>: %s rejected: Invalid name",
 253 +                                 "%d <%s>: %s odrzucony/rejected: Niepoprawna nazwa / Invalid name",
 254                                 var_bad_name_code, reply_name, reply_class);
 255      else
 256         stat = SMTPD_CHECK_DUNNO;
 257 @@ -837,7 +837,7 @@
 258       */
 259      if (!valid_hostname(test_name, DONT_GRIPE) || !strchr(test_name, '.'))
 260         stat = smtpd_check_reject(state, MAIL_ERROR_POLICY,
 261 -                     "%d <%s>: %s rejected: need fully-qualified hostname",
 262 +                     "%d <%s>: %s odrzucowny/rejected: need fully-qualified hostname",
 263                                 var_non_fqdn_code, reply_name, reply_class);
 264      else
 265         stat = SMTPD_CHECK_DUNNO;
 266 @@ -866,7 +866,7 @@
 267                                   (VSTRING *) 0, T_A, T_MX, 0);
 268      if (dns_status != DNS_OK)
 269         return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
 270 -                                  "%d <%s>: %s rejected: Host not found",
 271 +                                  "%d <%s>: %s odrzucony/rejected: Host not found",
 272                                    dns_status == DNS_NOTFOUND ?
 273                                    var_unk_name_code : 450,
 274                                    reply_name, reply_class));
 275 @@ -888,7 +888,7 @@
 276                                   (VSTRING *) 0, T_A, T_MX, 0);
 277      if (dns_status != DNS_OK)
 278         return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
 279 -                                  "%d <%s>: %s rejected: Domain not found",
 280 +                                  "%d <%s>: %s odrzucony/rejected: Domain not found",
 281                                    dns_status == DNS_NOTFOUND ?
 282                                    var_unk_addr_code : 450,
 283                                    reply_name, reply_class));
 284 @@ -923,7 +923,7 @@
 285       * Deny relaying between sites that both are not in relay_domains.
 286       */
 287      return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
 288 -                              "%d <%s>: %s rejected: Relay access denied",
 289 +                              "%d <%s>: %s odrzucony/rejected: Relay access denied",
 290                                var_relay_code, reply_name, reply_class));
 291  }
 292
 293 @@ -1315,7 +1315,7 @@
 294       */
 295      if (!*test_dom || !valid_hostname(test_dom, DONT_GRIPE) || !strchr(test_dom, '.'))
 296         stat = smtpd_check_reject(state, MAIL_ERROR_POLICY,
 297 -                      "%d <%s>: %s rejected: need fully-qualified address",
 298 +                      "%d <%s>: %s odrzucony/rejected: need fully-qualified address",
 299                                 var_non_fqdn_code, reply_name, reply_class);
 300      else
 301         stat = SMTPD_CHECK_DUNNO;
 302 @@ -1397,7 +1397,7 @@
 303       */
 304      if (strcasecmp(value, "REJECT") == 0)
 305         return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
 306 -                                  "%d <%s>: %s rejected: Access denied",
 307 +                                  "%d <%s>: %s odrzucony/rejected: Brak dostepu / Access denied",
 308                              var_access_map_code, reply_name, reply_class));
 309
 310      /*
 311 @@ -1416,7 +1416,7 @@
 312         while (ISDIGIT(*value) || ISSPACE(*value))
 313             value++;
 314         return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
 315 -                                  "%d <%s>: %s rejected: %s",
 316 +                                  "%d <%s>: %s odrzucony/rejected: %s",
 317                                    code, reply_name, reply_class, value));
 318      }
 319
 320 @@ -1769,7 +1769,7 @@
 321             rbl_fodder = rbl_reason = "";
 322         }
 323         result = smtpd_check_reject(state, MAIL_ERROR_POLICY,
 324 -                       "%d Service unavailable; [%s] blocked using %s%s%s",
 325 +                       "%d Niedostepny serwis / Service unavailable; [%s] blocked using %s%s%s",
 326                                  var_maps_rbl_code, state->addr, rbl_domain,
 327                                     rbl_fodder, rbl_reason);
 328         if (txt_list)
 329 @@ -1852,7 +1852,7 @@
 330                          cpp[1], PERMIT_ALL);
 331         } else if (strcasecmp(name, REJECT_ALL) == 0) {
 332             status = smtpd_check_reject(state, MAIL_ERROR_POLICY,
 333 -                                     "%d <%s>: %s rejected: Access denied",
 334 +                                     "%d <%s>: %s odrzucony/rejected: Brak dostepu / Access denied",
 335                                   var_reject_code, reply_name, reply_class);
 336             if (cpp[1] != 0)
 337                 msg_warn("restriction `%s' after `%s' is ignored",
 338 @@ -2286,7 +2286,7 @@
 339             && NOMATCH(virt_mailbox_maps, CONST_STR(reply->recipient))
 340             && NOMATCH(virtual_maps, CONST_STR(reply->recipient))) {
 341             (void) smtpd_check_reject(state, MAIL_ERROR_BOUNCE,
 342 -                                  "%d <%s>: User unknown", 550, recipient);
 343 +                                  "%d <%s>: Nieznany uzytkonik / User unknown", 550, recipient);
 344             SMTPD_CHECK_RCPT_RETURN(STR(error_text));
 345         }
 346      }
 347 @@ -2302,7 +2302,7 @@
 348             && NOMATCH(virt_mailbox_maps, CONST_STR(reply->recipient))
 349             && NOMATCH(virtual_maps, CONST_STR(reply->recipient))) {
 350             (void) smtpd_check_reject(state, MAIL_ERROR_BOUNCE,
 351 -                                  "%d <%s>: User unknown", 550, recipient);
 352 +                                  "%d <%s>: Nieznany uzytkonik / User unknown", 550, recipient);
 353             SMTPD_CHECK_RCPT_RETURN(STR(error_text));
 354         }
 355      }
 356 @@ -2320,7 +2320,7 @@
 357             && NOMATCH(virtual_maps, CONST_STR(reply->recipient))
 358             && NOMATCH(local_rcpt_maps, CONST_STR(reply->recipient))) {
 359             (void) smtpd_check_reject(state, MAIL_ERROR_BOUNCE,
 360 -                                  "%d <%s>: User unknown", 550, recipient);
 361 +                                  "%d <%s>: Nieznany uzytkonik / User unknown", 550, recipient);
 362             SMTPD_CHECK_RCPT_RETURN(STR(error_text));
 363         }
 364      }
 365 @@ -2354,7 +2354,7 @@
 366
 367      if (var_message_limit > 0 && size > var_message_limit) {
 368         (void) smtpd_check_reject(state, MAIL_ERROR_POLICY,
 369 -                                 "552 Message size exceeds fixed limit");
 370 +                                 "552 Przekroczony rozmiar wiadomosci / Message size exceeds fixed limit");
 371         return (STR(error_text));
 372      }
 373      fsspace(".", &fsbuf);