postfix-pl.patch

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