Common subdirectories: smtpclient-1.0.0-orig/etc and smtpclient-1.0.0/etc
diff smtpclient-1.0.0-orig/smtpclient_main.c smtpclient-1.0.0/smtpclient_main.c
67a68
> static int   custom_hdrs= 0;
110a112,113
> 	fprintf(stderr, "  -H, --custom-hdrs      headers will be contained in message\n");
> 	fprintf(stderr, "                         (blank line indicates start of body)\n");
295c298,299
<     { "help",         0, NULL, 'h' }
---
>     { "help",         0, NULL, 'h' },
> 	{ "custom-hdrs",  0, NULL, 'H' }
320c324
<     while ((c = getopt_long(argc, argv, ":s:f:r:e:c:S:P:MLvVh", options, NULL)) != EOF) {
---
>     while ((c = getopt_long(argc, argv, ":s:f:r:e:c:S:P:MLvVhH", options, NULL)) != EOF) {
357a362,364
> 			case 'H':
> 				custom_hdrs= 1;
> 				break;
460,490c467,497
<     /* 
<      *  Give out Message header. 
<      */
<     fprintf(sfp, "From: %s\r\n", from_addr);
<     if (subject)
<         fprintf(sfp, "Subject: %s\r\n", subject);
< 
<     if (reply_addr)
<         fprintf(sfp, "Reply-To: %s\r\n", reply_addr);
<     if (err_addr)
<         fprintf(sfp, "Errors-To: %s\r\n", err_addr);
<     if ((pwd = getpwuid(getuid())) == 0) {
<         fprintf(sfp, "Sender: userid-%d@%s\r\n", getuid(), my_name);
<     } else {
<         fprintf(sfp, "Sender: %s@%s\r\n", pwd->pw_name, my_name);
<     }
< 
<     fprintf(sfp, "To: %s", argv[optind]);
<     for (i = optind + 1; i < argc; i++)
<         fprintf(sfp, ",%s", argv[i]);
<     fprintf(sfp, "\r\n");
<     if (cc_addr)
<         fprintf(sfp, "Cc: %s\r\n", cc_addr);
< 
<     if (mime_style) {
<         fprintf(sfp, "MIME-Version: 1.0\r\n");
<         fprintf(sfp, "Content-Type: text/plain; charset=ISO-8859-1\r\n");
<         fprintf(sfp, "Content-Transfer-Encoding: quoted-printable\r\n");
<     }
< 
<     fprintf(sfp, "\r\n");
---
> 	if (!custom_hdrs) {
> 		/* 
> 		 *  Give out Message header. 
> 		 *  (But only if they're not being supplied from the message.)
> 		 */
> 		fprintf(sfp, "From: %s\r\n", from_addr);
> 		if (subject)
> 			fprintf(sfp, "Subject: %s\r\n", subject);
> 
> 		if (reply_addr)
> 			fprintf(sfp, "Reply-To: %s\r\n", reply_addr);
> 		if (err_addr)
> 			fprintf(sfp, "Errors-To: %s\r\n", err_addr);
> 		if ((pwd = getpwuid(getuid())) == 0) {
> 			fprintf(sfp, "Sender: userid-%d@%s\r\n", getuid(), my_name);
> 		} else {
> 			fprintf(sfp, "Sender: %s@%s\r\n", pwd->pw_name, my_name);
> 		}
> 
> 		fprintf(sfp, "To: %s", argv[optind]);
> 		for (i = optind + 1; i < argc; i++)
> 			fprintf(sfp, ",%s", argv[i]);
> 		fprintf(sfp, "\r\n");
> 		if (cc_addr)
> 			fprintf(sfp, "Cc: %s\r\n", cc_addr);
> 
> 		if (mime_style) {
> 			fprintf(sfp, "MIME-Version: 1.0\r\n");
> 			fprintf(sfp, "Content-Type: text/plain; charset=ISO-8859-1\r\n");
> 			fprintf(sfp, "Content-Transfer-Encoding: quoted-printable\r\n");
> 		}
491a499,500
> 		fprintf(sfp, "\r\n");
> 	}