X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fpost.c;h=6f04593d9854cf84cb3637ba66d1ec0d1f5153f4;hb=79e665fc9bdaa67a9cd2dfd02bd4494bbec7cc2d;hp=08c62ebe3113f0eee5c4011f9787349270405604;hpb=84b65bad347129f751e3ed208516697bc3fe1820;p=mmh diff --git a/uip/post.c b/uip/post.c index 08c62eb..6f04593 100644 --- a/uip/post.c +++ b/uip/post.c @@ -1472,11 +1472,10 @@ do_addresses (int bccque, int talk) static void post (char *file, int bccque, int talk, char *envelope) { - int fd, onex; + int fd; int retval, i; pid_t child_id; - onex = !(msgflags & MINV) || bccque; if (verbose) { if (msgflags & MINV) printf (" -- Posting for %s Recipients --\n", @@ -1503,7 +1502,6 @@ post (char *file, int bccque, int talk, char *envelope) argp = sargv; *argp++ = "sendmail"; - *argp++ = "-m"; /* send to me too */ *argp++ = "-t"; /* read msg for recipients */ *argp++ = "-i"; /* don't stop on "." */ if (whomsw) @@ -1521,7 +1519,7 @@ post (char *file, int bccque, int talk, char *envelope) } } else { if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch, - verbose, snoop, onex, queued, sasl, + verbose, snoop, queued, sasl, saslssf, saslmech, user, tls)) || rp_isbad (retval = sm_winit (envelope))) die (NULL, "problem initializing server; %s", rp_string (retval)); @@ -1533,7 +1531,7 @@ post (char *file, int bccque, int talk, char *envelope) close (fd); fflush (stdout); - sm_end (onex ? OK : DONE); + sm_end (!(msgflags & MINV) || bccque ? OK : DONE); sigoff (); if (verbose) { @@ -1561,7 +1559,7 @@ verify_all_addresses (int talk, char *envelope) if (!whomsw || checksw) if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch, - verbose, snoop, 0, queued, sasl, + verbose, snoop, queued, sasl, saslssf, saslmech, user, tls)) || rp_isbad (retval = sm_winit (envelope))) die (NULL, "problem initializing server; %s", rp_string (retval));