Mercurial > masqmail

comparison src/accept.c @ 289:bb3005ce0837

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reformating of code
author markus schnalke <meillo@marmaro.de>
date Wed, 08 Dec 2010 17:17:38 -0300
parents 1abc1faeb45d
children 6281ff92cb86
comparison
equal deleted inserted replaced
288:84ea0b1fc8f8 289:bb3005ce0837
365 if (g_list_length(msg->rcpt_list) == 1) { 365 if (g_list_length(msg->rcpt_list) == 1) {
366 address *addr = (address *) (g_list_first(msg->rcpt_list)->data); 366 address *addr = (address *) (g_list_first(msg->rcpt_list)->data);
367 for_string = g_strdup_printf(" for %s", addr_string(addr)); 367 for_string = g_strdup_printf(" for %s", addr_string(addr));
368 } 368 }
369 369
370 if (msg->received_host == NULL) { 370 if (!msg->received_host) {
371 /* received locally */ 371 /* received locally */
372 hdr = create_header(HEAD_RECEIVED, "Received: from %s by %s with %s (%s %s) id %s%s; %s\n", 372 hdr = create_header(HEAD_RECEIVED,
373 passwd->pw_name, conf.host_name, prot_names[msg->received_prot], 373 "Received: from %s by %s with %s (%s %s) id %s%s; %s\n",
374 PACKAGE, VERSION, msg->uid, for_string ? for_string : "", rec_timestamp()); 374 passwd->pw_name, conf.host_name,
375 prot_names[msg->received_prot], PACKAGE, VERSION,
376 msg->uid, for_string ? for_string : "", rec_timestamp());
375 } else { 377 } else {
376 /* received from remote */ 378 /* received from remote */
377 #ifdef ENABLE_IDENT 379 #ifdef ENABLE_IDENT
378 DEBUG(5) debugf("adding 'Received:' header (5)\n"); 380 DEBUG(5) debugf("adding 'Received:' header (5)\n");
379 hdr = create_header(HEAD_RECEIVED, "Received: from %s (ident=%s) by %s with %s (%s %s) id %s%s; %s\n", 381 hdr = create_header(HEAD_RECEIVED,
380 msg->received_host, msg->ident ? msg->ident : "unknown", conf.host_name, 382 "Received: from %s (ident=%s) by %s with %s (%s %s) id %s%s; %s\n",
381 prot_names[msg->received_prot], PACKAGE, VERSION, msg->uid, for_string ? for_string : "", 383 msg->received_host, msg->ident ? msg->ident : "unknown",
382 rec_timestamp()); 384 conf.host_name, prot_names[msg->received_prot], PACKAGE,
385 VERSION, msg->uid, for_string ? for_string : "",
386 rec_timestamp());
383 #else 387 #else
384 hdr = create_header(HEAD_RECEIVED, "Received: from %s by %s with %s (%s %s) id %s%s; %s\n", 388 hdr = create_header(HEAD_RECEIVED,
385 msg->received_host, conf.host_name, prot_names[msg->received_prot], 389 "Received: from %s by %s with %s (%s %s) id %s%s; %s\n",
386 PACKAGE, VERSION, msg->uid, for_string ? for_string : "", rec_timestamp()); 390 msg->received_host, conf.host_name,
391 prot_names[msg->received_prot], PACKAGE, VERSION,
392 msg->uid, for_string ? for_string : "", rec_timestamp());
387 #endif 393 #endif
388 } 394 }
389 header_fold(hdr); 395 header_fold(hdr);
390 msg->hdr_list = g_list_prepend(msg->hdr_list, hdr); 396 msg->hdr_list = g_list_prepend(msg->hdr_list, hdr);
391 397