postfix-pl.patch

   1 diff -Nur postfix-1.1.2.orig/src/bounce/bounce_notify_util.c postfix-1.1.2/src/bounce/bounce_notify_util.c
   2 --- postfix-1.1.2.orig/src/bounce/bounce_notify_util.c  Mon Nov 26 22:47:05 2001
   3 +++ postfix-1.1.2/src/bounce/bounce_notify_util.c       Mon Jan 28 12:33:52 2002
   4 @@ -275,7 +275,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 @@ -285,7 +285,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 @@ -300,15 +300,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 @@ -324,6 +315,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 %.1f godzin.",
  70 +                         var_delay_warn_time);
  71 +       post_mail_fprintf(bounce,
  72 +                         "Bêd± podejmowane próby wys³ania jeszcze przez %.1f 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 @@ -347,7 +405,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 @@ -359,6 +417,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 @@ -420,6 +479,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 @@ -440,7 +500,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 @@ -529,6 +590,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 -Nur postfix-1.1.2.orig/src/global/pipe_command.c postfix-1.1.2/src/global/pipe_command.c
 156 --- postfix-1.1.2.orig/src/global/pipe_command.c        Tue Nov 27 02:02:17 2001
 157 +++ postfix-1.1.2/src/global/pipe_command.c     Mon Jan 28 12:33:52 2002
 158 @@ -482,9 +482,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 @@ -494,28 +494,28 @@
 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 & MAIL_COPY_STAT_CORRUPT) {
 198             return (PIPE_STAT_CORRUPT);
 199         } else if (write_status && errno != EPIPE) {
 200 -           vstring_sprintf(why, "Command failed: %m: \"%s\"", args.command);
 201 +           vstring_sprintf(why, "Polecenie niepowiodlo sie / Command failed: %m: \"%s\"", args.command);
 202             return (PIPE_STAT_DEFER);
 203         } else {
 204             return (PIPE_STAT_OK);
 205 diff -Nur postfix-1.1.2.orig/src/global/sys_exits.c postfix-1.1.2/src/global/sys_exits.c
 206 --- postfix-1.1.2.orig/src/global/sys_exits.c   Fri Dec 11 19:55:25 1998
 207 +++ postfix-1.1.2/src/global/sys_exits.c        Mon Jan 28 12:33:52 2002
 208 @@ -60,21 +60,21 @@
 209  } SYS_EXITS_TABLE;
 210
 211  static SYS_EXITS_TABLE sys_exits_table[] = {
 212 -    0, EX_USAGE, "command line usage error",
 213 -    0, EX_DATAERR, "data format error",
 214 +    0, EX_USAGE, "bledne wywylanie polecanie / command line usage error",
 215 +    0, EX_DATAERR, "blad formatu danych / data format error",
 216      0, EX_NOINPUT, "cannot open input",
 217 -    0, EX_NOUSER, "user unknown",
 218 +    0, EX_NOUSER, "nieznany uzytkownik / user unknown",
 219      0, EX_NOHOST, "host name unknown",
 220 -    0, EX_UNAVAILABLE, "service unavailable",
 221 -    0, EX_SOFTWARE, "internal software error",
 222 +    0, EX_UNAVAILABLE, "niedostepny serwis / service unavailable",
 223 +    0, EX_SOFTWARE, "wewnetrzny blad oprogramowania / internal software error",
 224      1, EX_OSERR, "system resource problem",
 225      0, EX_OSFILE, "critical OS file missing",
 226      0, EX_CANTCREAT, "can't create user output file",
 227      0, EX_IOERR, "input/output error",
 228 -    1, EX_TEMPFAIL, "temporary failure",
 229 +    1, EX_TEMPFAIL, "chwilowe niepowodzenie / temporary failure",
 230      0, EX_PROTOCOL, "remote error in protocol",
 231 -    0, EX_NOPERM, "permission denied",
 232 -    0, EX_CONFIG, "local configuration error",
 233 +    0, EX_NOPERM, "brak dostêpu / permission denied",
 234 +    0, EX_CONFIG, "blad lokalnej konfiguracji / local configuration error",
 235  };
 236
 237  /* sys_exits_strerror - map exit status to error string */
 238
 239 --- postfix-2.0.10/src/smtpd/smtpd_check.c.orig Sun Jun  1 12:38:56 2003
 240 +++ postfix-2.0.10/src/smtpd/smtpd_check.c      Sun Jun  1 12:57:27 2003
 241 @@ -988,7 +988,7 @@
 242       */
 243      if (!valid_hostaddr(test_addr, DONT_GRIPE))
 244         stat = smtpd_check_reject(state, MAIL_ERROR_POLICY,
 245 -                                 "%d <%s>: %s rejected: invalid ip address",
 246 +                                 "%d <%s>: %s odrzucony/rejected: niepoprawny adres IP/invalid IP address",
 247                                 var_bad_name_code, reply_name, reply_class);
 248      else
 249         stat = SMTPD_CHECK_DUNNO;
 250 @@ -1024,7 +1024,7 @@
 251       */
 252      if (!valid_hostname(test_name, DONT_GRIPE))
 253         stat = smtpd_check_reject(state, MAIL_ERROR_POLICY,
 254 -                                 "%d <%s>: %s rejected: Invalid name",
 255 +                                 "%d <%s>: %s odrzucony/rejected: Niepoprawna nazwa / Invalid name",
 256                                 var_bad_name_code, reply_name, reply_class);
 257      else
 258         stat = SMTPD_CHECK_DUNNO;
 259 @@ -1060,7 +1060,7 @@
 260       */
 261      if (!valid_hostname(test_name, DONT_GRIPE) || !strchr(test_name, '.'))
 262         stat = smtpd_check_reject(state, MAIL_ERROR_POLICY,
 263 -                     "%d <%s>: %s rejected: need fully-qualified hostname",
 264 +                     "%d <%s>: %s odrzucowny/rejected: need fully-qualified hostname",
 265                                 var_non_fqdn_code, reply_name, reply_class);
 266      else
 267         stat = SMTPD_CHECK_DUNNO;
 268 @@ -1095,7 +1095,7 @@
 269                                   (VSTRING *) 0, RR_ADDR_TYPES, T_MX, 0);
 270      if (dns_status == DNS_NOTFOUND)
 271         return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
 272 -                                  "%d <%s>: %s rejected: Host not found",
 273 +                                  "%d <%s>: %s odrzucony/rejected: Host not found",
 274                                    var_unk_name_code,
 275                                    reply_name, reply_class));
 276      else if (dns_status != DNS_OK)
 277 @@ -1120,7 +1120,7 @@
 278                                   (VSTRING *) 0, RR_ADDR_TYPES, T_MX, 0);
 279      if (dns_status == DNS_NOTFOUND)
 280         return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
 281 -                                  "%d <%s>: %s rejected: Domain not found",
 282 +                                  "%d <%s>: %s odrzucony/rejected: Domain not found",
 283                                    var_unk_addr_code,
 284                                    reply_name, reply_class));
 285      else if (dns_status != DNS_OK)
 286 @@ -1201,7 +1201,8 @@
 287      vstring_strcat(reply_msg, "%d <%s>: %s ");
 288      vstring_strcat(reply_msg, var_reject_reply_msg_access_denied);
 289      return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
 290 -                           vstring_export(reply_msg), var_relay_code, reply_name, reply_class));
 291 +                           "%d <%s>: %s odrzucony/rejected: Relay access denied",
 292 +                           var_relay_code, reply_name, reply_class));
 293  }
 294
 295  /* permit_auth_destination - OK for message relaying */
 296 @@ -1650,7 +1651,7 @@
 297       */
 298      if (!*test_dom || !valid_hostname(test_dom, DONT_GRIPE) || !strchr(test_dom, '.'))
 299         stat = smtpd_check_reject(state, MAIL_ERROR_POLICY,
 300 -                      "%d <%s>: %s rejected: need fully-qualified address",
 301 +                      "%d <%s>: %s odrzucony/rejected: need fully-qualified address",
 302                                 var_non_fqdn_code, reply_name, reply_class);
 303      else
 304         stat = SMTPD_CHECK_DUNNO;
 305 @@ -1766,9 +1767,9 @@
 306       */
 307      if (STREQUAL(value, "REJECT", cmd_len)) {
 308         return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
 309 -                                  "%d <%s>: %s rejected: %s",
 310 +                                  "%d <%s>: %s odrzucony/rejected: %s",
 311                                var_access_map_code, reply_name, reply_class,
 312 -                                  *cmd_text ? cmd_text : "Access denied"));
 313 +                                  *cmd_text ? cmd_text : "Brak dostepu / Access denied"));
 314      }
 315
 316      /*
 317 @@ -1858,7 +1859,7 @@
 318         && ISDIGIT(value[0]) && ISDIGIT(value[1]) && ISDIGIT(value[2])) {
 319         code = atoi(value);
 320         return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
 321 -                                  "%d <%s>: %s rejected: %s",
 322 +                                  "%d <%s>: %s odrzucony/rejected: %s",
 323                                    code, reply_name, reply_class, cmd_text));
 324      }
 325
 326 @@ -2743,14 +2744,14 @@
 327                          cpp[1], PERMIT_ALL);
 328         } else if (strcasecmp(name, DEFER_ALL) == 0) {
 329             status = smtpd_check_reject(state, MAIL_ERROR_POLICY,
 330 -                                   "%d <%s>: %s rejected: Try again later",
 331 +                                   "%d <%s>: %s odrzucony/rejected: Sprobuj pozniej / Try again later",
 332                                    var_defer_code, reply_name, reply_class);
 333             if (cpp[1] != 0 && state->warn_if_reject == 0)
 334                 msg_warn("restriction `%s' after `%s' is ignored",
 335                          cpp[1], DEFER_ALL);
 336         } else if (strcasecmp(name, REJECT_ALL) == 0) {
 337             status = smtpd_check_reject(state, MAIL_ERROR_POLICY,
 338 -                                     "%d <%s>: %s rejected: Access denied",
 339 +                                     "%d <%s>: %s odrzucony/rejected: Brak dostepu / Access denied",
 340                                   var_reject_code, reply_name, reply_class);
 341             if (cpp[1] != 0 && state->warn_if_reject == 0)
 342                 msg_warn("restriction `%s' after `%s' is ignored",
 343 @@ -3356,10 +3357,10 @@
 344                        strlen(MAIL_ADDR_MAIL_DAEMON))
 345         && NOMATCH(local_rcpt_maps, CONST_STR(reply->recipient)))
 346         return (smtpd_check_reject(state, MAIL_ERROR_BOUNCE,
 347 -                                  "%d <%s>: User unknown%s",
 348 +                                  "%d <%s>: Nieznany uzytkownik / User unknown%s",
 349                                    var_local_rcpt_code, recipient,
 350                                    var_show_unk_rcpt_table ?
 351 -                                  " in local recipient table" : ""));
 352 +                                  " in local recipient table" : ""));
 353
 354      /*
 355       * Reject mail to unknown addresses in virtual mailbox domains.
 356 @@ -3368,10 +3369,10 @@
 357         && *var_virt_mailbox_maps
 358         && NOMATCHV8(virt_mailbox_maps, CONST_STR(reply->recipient)))
 359         return (smtpd_check_reject(state, MAIL_ERROR_BOUNCE,
 360 -                                  "%d <%s>: User unknown%s",
 361 +                                  "%d <%s>: Nieznany uzytkownik / User unknown%s",
 362                                    var_virt_mailbox_code, recipient,
 363                                    var_show_unk_rcpt_table ?
 364 -                                  " in virtual mailbox table" : ""));
 365 +                                  " in virtual mailbox table" : ""));
 366
 367      /*
 368       * Reject mail to unknown addresses in relay domains.
 369 @@ -3380,7 +3381,7 @@
 370         && *var_relay_rcpt_maps
 371         && NOMATCH(relay_rcpt_maps, CONST_STR(reply->recipient)))
 372         return (smtpd_check_reject(state, MAIL_ERROR_BOUNCE,
 373 -                                  "%d <%s>: User unknown%s",
 374 +                                  "%d <%s>: Nieznany uzytkownik / User unknown%s",
 375                                    var_relay_rcpt_code, recipient,
 376                                    var_show_unk_rcpt_table ?
 377                                    " in relay recipient table" : ""));
 378 @@ -3415,7 +3416,7 @@
 379
 380      if (var_message_limit > 0 && size > var_message_limit) {
 381         (void) smtpd_check_reject(state, MAIL_ERROR_POLICY,
 382 -                                 "552 Message size exceeds fixed limit");
 383 +                                 "552 Przekroczony rozmiar wiadomosci / Message size exceeds fixed limit");
 384         return (STR(error_text));
 385      }
 386      fsspace(".", &fsbuf);