postfix-pl.patch

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