Fix conflicts from merge of sendmail 8.11.0.

PR:		bin/11552 misc/18512 bin/15088

1 files changed, 8 insertions, 6 deletions

diff --git a/contrib/sendmail/contrib/bitdomain.c b/contrib/sendmail/contrib/bitdomain.c
index ec79b95..b864d65 100644
--- a/contrib/sendmail/contrib/bitdomain.c
+++ b/contrib/sendmail/contrib/bitdomain.c
@@ -9,15 +9,17 @@
  * Change directory to "netinfo" and get the file internet.listing
  * The file is updated monthly.
  *
- * Feed the output of this program to "makemap hash /etc/bitdomain.db"
+ * Feed the output of this program to "makemap hash /etc/mail/bitdomain.db"
  * to create the table used by the "FEATURE(bitdomain)" config file macro.
  * If your sendmail does not have the db library compiled in, you can instead
- * use "makemap dbm /etc/bitdomain" and
- * "FEATURE(bitdomain,`dbm -o /etc/bitdomain')"
+ * use "makemap dbm /etc/mail/bitdomain" and
+ * "FEATURE(bitdomain,`dbm -o /etc/mail/bitdomain')"
  *
  * The bitdomain table should be rebuilt monthly.
  */
 
+/* $FreeBSD$ */
+
 #include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -187,7 +189,7 @@ char *domainlen;
 	    case NO_DATA:
 		err = "registered in DNS, but not mailable";
 		break;
-		
+
 	    default:
 		err = "unknown nameserver error";
 		break;
@@ -210,7 +212,7 @@ valhost(host, hbsize)
 	int hbsize;
 {
 	register u_char *eom, *ap;
-	register int n; 
+	register int n;
 	HEADER *hp;
 	querybuf answer;
 	int ancount, qdcount;
@@ -406,4 +408,4 @@ finish()
 	}
     }
 }
-	    
+