From 825a298fae95d1ee0fe4270a4e7484724fa69eec Mon Sep 17 00:00:00 2001
From: beck <>
Date: Sun, 9 Mar 2003 19:22:25 +0000
Subject: [PATCH] Fix a few typos, Make spamd and spamd-setup use /etc/services
 to find their ports. Adds "spamd" and "spamd-cfg" services to /etc/services.
 Mostly from Daniel Lucq <daniel@lucq.org>.

---
 src/etc/services   |  4 +++-
 src/etc/spamd.conf | 10 ++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/etc/services b/src/etc/services
index 05f485ab..aef55858 100644
--- a/src/etc/services
+++ b/src/etc/services
@@ -1,4 +1,4 @@
-#	$OpenBSD: services,v 1.49 2003/01/24 06:43:29 millert Exp $
+#	$OpenBSD: services,v 1.50 2003/03/09 19:22:25 beck Exp $
 #
 # Network services, Internet style
 #
@@ -250,6 +250,8 @@ mysql		3306/tcp		# MySQL
 postgresql	5432/tcp		# PostgreSQL
 canna		5680/tcp		# Kana->Kanji server
 icb		7326/tcp		# Internet Citizen's Band
+spamd		8025/tcp		# spamd(8)
+spamd-cfg	8026/tcp		# spamd(8) configuration
 hunt		26740/udp		# hunt(6)
 #
 # Appletalk
diff --git a/src/etc/spamd.conf b/src/etc/spamd.conf
index 4b6588ec..16d5f34d 100644
--- a/src/etc/spamd.conf
+++ b/src/etc/spamd.conf
@@ -1,6 +1,8 @@
-# $OpenBSD: spamd.conf,v 1.2 2003/03/08 21:39:50 deraadt Exp $
+# $OpenBSD: spamd.conf,v 1.3 2003/03/09 19:22:25 beck Exp $
 #
-# spamd config file, read by spamd.conf(5) and spamd-setup(8)
+# spamd config file, read by spamd-setup(8) for spamd(8)
+#
+# See spamd.conf(5)
 #
 # Configures whitelists and blacklists for spamd
 #
@@ -31,14 +33,14 @@ spews2:\
 
 china:\
         :black:\
-	:msg="SPAM. Your address %A appears to be from china\n\
+	:msg="SPAM. Your address %A appears to be from China\n\
 	See http://www.okean.com/asianspamblocks.html for more details":\
         :method=http:\
         :file=www.okean.com/chinacidr.txt:
 
 korea:\
         :black:\
-	:msg="SPAM. Your address %A appears to be from korea\n\
+	:msg="SPAM. Your address %A appears to be from Korea\n\
 	See http://www.okean.com/asianspamblocks.html for more details":\
         :method=http:\
         :file=www.okean.com/koreacidr.txt: