update the silc-server package to version 0.7.1.

Submitted by Lubomir Sedlacik <salo@silcnet.org> in PR 14887

Changes in the NetBSD's package from version 0.6.4 -> 0.7.1:

   - upgrade to silc-server-0.7.1 (the main changes below)
     the biggest change is the ipv6 support (new configuration file format is
     needed, though)
   - removed patch-ac because it was integrated into distribution
     (patch-ad was moved in its place)
   - completely rewritten rc.d script to use rc.subr instead and fixed the
     problem with removing pidfile so now status) works fine.
   - added default motd file
   - INSTALL and DEINSTALL scripts are cleaner and more useful, check for logs
     directory before creating it, added motd.txt installing/removing.
   - better and more helpful default configuration file (added Example:
     sections for each variable)
   - added examples/ directory containing sample configurations of various
     scenarios into $DOCDIR

changes in the silc-server itself:
        o Fixed WHOIS and IDENTIFY commands to return correct replies,
          and correct error replies.  This fixes various weird bugs
          related to these commands.
        o Send NO_SUCH_CLIENT_ID error notify if received private
          message to invalid Client ID.  It is guaranteed that if
          private message is sent to unknown client, the sender will
          receive a notification for it.
        o Send the kicker's information in KICK command to the kicked
          client.
        o Fixed LIST command to return correct amount of channels.
          This fixes the weird bug that LIST would show like 50 channels
          and some channels multiple times.
        o Channel topics, and users SILC modes are announced now during
          server->router connecting.
        o Implemented the founder authentication during JOIN command.
        o Support for IPv6 based Server ID added.
        o Memory leak fixes.

9 files changed, 337 insertions, 78 deletions

diff --git a/chat/silc-server/DEINSTALL b/chat/silc-server/DEINSTALL
index f64ad3a920d..2294a28340e 100644
--- a/chat/silc-server/DEINSTALL
+++ b/chat/silc-server/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1.1.1 2001/11/30 23:33:34 hubertf Exp $
+# $NetBSD: DEINSTALL,v 1.2 2001/12/17 00:43:10 hubertf Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -17,7 +17,7 @@ LOGDIR=/var/log/silcd
 SAMPLECONFDIR=${PKG_PREFIX}/share/doc/silcd
 CONFDIR=${SERVERROOT}
 RCSCRIPT="@CONF_DIR@/rc.d/silcd"
-CONFFILES="silcd.conf"
+CONFFILES="silcd.conf motd.txt"
 NONCONFFILES="silcd.pub silcd.prv"
 
 case ${STAGE} in
diff --git a/chat/silc-server/INSTALL b/chat/silc-server/INSTALL
index c885dac5a6a..00601f1d8d2 100644
--- a/chat/silc-server/INSTALL
+++ b/chat/silc-server/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.1.1.1 2001/11/30 23:33:34 hubertf Exp $
+# $NetBSD: INSTALL,v 1.2 2001/12/17 00:43:10 hubertf Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -15,7 +15,7 @@ SERVERROOT="@SILCD_CONF_DIR@"
 LOGDIR=/var/log/silcd
 SAMPLECONFDIR=${PKG_PREFIX}/share/doc/silcd
 CONFDIR=${SERVERROOT}
-CONFFILES="silcd.conf"
+CONFFILES="silcd.conf motd.txt"
 PUBKEY="silcd.pub"
 PRIVKEY="silcd.prv"
 
@@ -24,6 +24,7 @@ PRE-INSTALL)
 	;;
 
 POST-INSTALL)
+	${MKDIR} ${SERVERROOT}
         ${CAT} << EOF
 ===========================================================================
 
@@ -31,11 +32,17 @@ POST-INSTALL)
 
 EOF
 
-	${MKDIR} ${SERVERROOT}
-	${MKDIR} ${LOGDIR}
+	if [ -d ${LOGDIR} ]
+	then
+		echo "        WARNING: ${LOGDIR} already exists, owner"
+		echo "                 and permissions may be changed."
+	else
+		${MKDIR} ${LOGDIR}
+		echo "        ${LOGDIR}"
+	fi
+
 	${CHOWN} root:nobody ${LOGDIR}
 	${CHMOD} 2775 ${LOGDIR}
-	echo "        ${LOGDIR}"
 
         ${CAT} << EOF
 
@@ -58,12 +65,13 @@ EOF
 		else
 			echo "        ${FILE}"
 			${CP} ${SAMPLEFILE} ${FILE}
-			${CHMOD} 600 ${FILE}
 		fi
 	done
+	${CHMOD} 600 ${CONFDIR}/silcd.conf
+	${CHMOD} 644 ${CONFDIR}/motd.txt
 	${CAT} << EOF
 
-  * you might need to customize your configuration file
+  * you might need to customize your configuration file and the MOTD
 
 ===========================================================================
 
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 3fb93af9df2..59b89a6eddd 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/11/30 23:33:34 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/17 00:43:10 hubertf Exp $
 
-DISTNAME=		silc-server-0.6.4
+DISTNAME=		silc-server-0.7.1
 CATEGORIES=		chat
 MASTER_SITES=		http://ftp.silcnet.org/server/sources/ \
 			ftp://ftp.silcnet.org/silc/server/sources/ \
@@ -49,12 +49,14 @@ FILES_SUBST+=		SILCD_CONF_DIR=${PKG_SYSCONFBASE}/${PKG_SYSCONFSUBDIR}
 FILES_SUBST+=		CONF_DIR=${PKG_SYSCONFBASE}
 FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/-e s!@/}
 
-post-build:
+pre-install:
 	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
 	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
 	${SED} ${FILES_SUBST_SED} ${FILESDIR}/silcd.sh > ${WRKDIR}/silcd.sh
+	${SED} ${FILES_SUBST_SED} ${FILESDIR}/motd.txt > ${WRKDIR}/motd.txt
 
 post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/motd.txt ${PREFIX}/share/doc/silcd/motd.txt.default
 	@PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 	${INSTALL_SCRIPT} ${WRKDIR}/silcd.sh ${PKG_SYSCONFBASE}/rc.d/silcd
 
diff --git a/chat/silc-server/PLIST b/chat/silc-server/PLIST
index 4712a17ed62..9b9aabbaa78 100644
--- a/chat/silc-server/PLIST
+++ b/chat/silc-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/11/30 23:33:34 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/17 00:43:10 hubertf Exp $
 sbin/silcd
 share/doc/silcd/CHANGES
 share/doc/silcd/COPYING
@@ -9,4 +9,19 @@ share/doc/silcd/INSTALL
 share/doc/silcd/README
 share/doc/silcd/TODO
 share/doc/silcd/silcd.conf.default
+share/doc/silcd/motd.txt.default
+share/doc/silcd/examples/README
+share/doc/silcd/examples/cell1_backup.conf
+share/doc/silcd/examples/cell1_router.conf
+share/doc/silcd/examples/cell1_server1.conf
+share/doc/silcd/examples/cell1_server2.conf
+share/doc/silcd/examples/cell2_router.conf
+share/doc/silcd/examples/cell2_server1.conf
+share/doc/silcd/examples/cell2_server2.conf
+share/doc/silcd/examples/cell3_router.conf
+share/doc/silcd/examples/cell3_server1.conf
+share/doc/silcd/examples/cell3_server2.conf
+share/doc/silcd/examples/silcd.prv
+share/doc/silcd/examples/silcd.pub
+@dirrm share/doc/silcd/examples
 @dirrm share/doc/silcd
diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo
index d27c1ca9ebc..406f61d56cd 100644
--- a/chat/silc-server/distinfo
+++ b/chat/silc-server/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/11/30 23:33:34 hubertf Exp $
+$NetBSD: distinfo,v 1.2 2001/12/17 00:43:11 hubertf Exp $
 
-SHA1 (silc-server-0.6.4.tar.bz2) = d53aabb36b0e24b365fd49a433d635eba1cb62b9
-Size (silc-server-0.6.4.tar.bz2) = 1002604 bytes
-SHA1 (patch-aa) = eafe1def396397b9e32581420ac35a32fb35cfa4
+SHA1 (silc-server-0.7.1.tar.bz2) = e6b71679c5f10d2982bfbd0a6188fffa310fcce5
+Size (silc-server-0.7.1.tar.bz2) = 1092236 bytes
+SHA1 (patch-aa) = b0d1100685af0e429a4405abf601d53bd8550fff
 SHA1 (patch-ab) = cd7902383fa1ede7677955bfa402c1fb7dc03c8e
-SHA1 (patch-ac) = 9aee9c5b74f0c59ae38a89f339bb0d5a96e789d6
-SHA1 (patch-ad) = af7435aae8da43041c8931b9b648415b83a5ffb3
+SHA1 (patch-ac) = 84e7e136d32b76a05654ddb07f65ab9c3a70efe2
diff --git a/chat/silc-server/files/motd.txt b/chat/silc-server/files/motd.txt
new file mode 100644
index 00000000000..78a7c3e77dd
--- /dev/null
+++ b/chat/silc-server/files/motd.txt
@@ -0,0 +1,10 @@
+-
+- Message of the Day:
+-
+- This is new installed SILC Server from the NetBSD pkgsrc package.
+-
+- Example configuration files are located in the following directory:
+-   @PREFIX@/share/doc/silcd/examples/
+-
+- For more information about the SILC browse to http://silcnet.org/
+-
diff --git a/chat/silc-server/files/silcd.sh b/chat/silc-server/files/silcd.sh
index 1cec8b25e5e..45b8bc90d53 100644
--- a/chat/silc-server/files/silcd.sh
+++ b/chat/silc-server/files/silcd.sh
@@ -1,48 +1,54 @@
 #!/bin/sh
 #
-# $NetBSD: silcd.sh,v 1.1.1.1 2001/11/30 23:33:35 hubertf Exp $
+# $NetBSD: silcd.sh,v 1.2 2001/12/17 00:43:11 hubertf Exp $
 #
 # PROVIDE: silcd
 # REQUIRE: DAEMON
 
+. /etc/rc.subr
+
 name="silcd"
 pidfile="/var/run/${name}.pid"
+command="@PREFIX@/sbin/silcd"
+start_precmd="silcd_precmd"
+stop_cmd="silcd_stop"
+confdir="@SILCD_CONF_DIR@"
 
-command=${1:-start}
-
-case ${command} in
-start)
-	if [ ! -f @SILCD_CONF_DIR@/silcd.prv ]
-	then
-		@PREFIX@/sbin/silcd -C @SILCD_CONF_DIR@
-	fi
-	if [ -x @PREFIX@/sbin/silcd -a -f @SILCD_CONF_DIR@/silcd.conf ]
-	then
-		echo "Starting ${name}."
-		@PREFIX@/sbin/silcd
-	fi
-	;;
-stop)
-	if [ -f ${pidfile} ]; then
-		pid=`head -1 ${pidfile}`
-		echo "Stopping ${name}."
-		kill -TERM ${pid}
+silcd_precmd()
+{
+	if [ -f $confdir/silcd.conf ]; then
+		if [ ! -f $confdir/silcd.prv ]; then
+			$command -C $confdir
+		fi
 	else
-		echo "${name} not running?"
+		warn "Cannot open $confdir/silcd.conf"
 	fi
-	;;
-restart)
-	( $0 stop )
-	sleep 1
-	$0 start
-	;;
-status)
-	if [ -f ${pidfile} ]; then
-		pid=`head -1 ${pidfile}`
-		echo "${name} is running as pid ${pid}."
-	else
-		echo "${name} is not running."
+}
+
+silcd_stop()
+{
+	if [ -z "$_pid" ]; then
+		if [ -n "$pidfile" ]; then
+			echo "${name} not running? (check $pidfile)."
+		else
+			echo "${name} not running?"
+		fi
+		exit 1
 	fi
-	;;
-esac
-exit 0
+
+	if ! eval $_precmd && [ -z "$_rc_force_run" ]; then
+		return 1
+	fi      
+
+	echo "Stopping ${name}."
+	_doit=\
+"${_user:+su -m $_user -c '}kill -${sig_stop:-TERM} $_pid${_user:+'}"
+	eval $_doit
+
+	eval $_pidcmd
+	if [ ! $_pid ]; then
+		rm -f $pidfile
+	fi
+}
+
+run_rc_command "$1"
diff --git a/chat/silc-server/patches/patch-aa b/chat/silc-server/patches/patch-aa
index 7e7fdc89ea9..42a69dee9ae 100644
--- a/chat/silc-server/patches/patch-aa
+++ b/chat/silc-server/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/11/30 23:33:34 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2001/12/17 00:43:11 hubertf Exp $
 
---- Makefile.in.orig	Sun Nov 11 18:02:38 2001
-+++ Makefile.in	Tue Nov 13 18:42:52 2001
-@@ -511,25 +511,12 @@
+--- Makefile.in.orig	Sun Dec  9 21:24:29 2001
++++ Makefile.in	Sun Dec  9 23:09:26 2001
+@@ -528,25 +528,12 @@
  	-rm -rf $(distdir)
  
  install-dirs:
@@ -29,9 +29,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/11/30 23:33:34 hubertf Exp $
  	$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
-@@ -537,19 +524,8 @@
- 	$(INSTALL_DATA) $(srcdir)/INSTALL $(docdir)/
- 	$(INSTALL_DATA) $(srcdir)/TODO $(docdir)/
+@@ -560,19 +547,8 @@
+ 	$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
+ 	$(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(docdir)/examples/
  
 -etc-install:
 -	-@if test '!' -f $(etcdir)/silcd.conf ; then \
@@ -45,8 +45,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/11/30 23:33:34 hubertf Exp $
 -	fi
 -
  @SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install
--@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install etc-install
-+@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs doc-install
+-@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install
++@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs doc-install examples-install
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
diff --git a/chat/silc-server/patches/patch-ac b/chat/silc-server/patches/patch-ac
index 29a2aba6e98..04abbbbbb0d 100644
--- a/chat/silc-server/patches/patch-ac
+++ b/chat/silc-server/patches/patch-ac
@@ -1,15 +1,234 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/11/30 23:33:34 hubertf Exp $
+$NetBSD: patch-ac,v 1.2 2001/12/17 00:43:11 hubertf Exp $
 
---- lib/silcmath/mpi/mpi-priv.h.orig    Sat Nov 24 20:06:50 2001
-+++ lib/silcmath/mpi/mpi-priv.h Sat Nov 24 20:07:51 2001
-@@ -242,3 +242,10 @@
- /* }}} */
- #endif
- 
-+#if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__))
-+# if defined restrict || 199901L <= __STDC_VERSION__           
-+#  define __restrict restrict                       
-+# else
-+#  define __restrict      
-+# endif
-+#endif
+--- doc/example_silcd.conf.in.orig	Thu Nov 29 21:23:19 2001
++++ doc/example_silcd.conf.in	Sun Dec  9 23:47:33 2001
+@@ -8,25 +8,27 @@
+ # Configured ciphers.
+ #
+ # Format: <name>:<module path>:<key length>:<block length>
++# Example: aes-256-cbc:/usr/local/lib/silc/aes.sim.so:32:16
+ #
+ # If the cipher is builtin the <module path> maybe omitted.
+ #
+ [Cipher]
+-aes-256-cbc:@MODULESDIR@/aes.sim.so:32:16
+-aes-192-cbc:@MODULESDIR@/aes.sim.so:24:16
+-aes-128-cbc:@MODULESDIR@/aes.sim.so:16:16
+-twofish-256-cbc:@MODULESDIR@/twofish.sim.so:32:16
+-twofish-192-cbc:@MODULESDIR@/twofish.sim.so:24:16
+-twofish-128-cbc:@MODULESDIR@/twofish.sim.so:16:16
+-mars-256-cbc:@MODULESDIR@/mars.sim.so:32:16
+-mars-192-cbc:@MODULESDIR@/mars.sim.so:24:16
+-mars-128-cbc:@MODULESDIR@/mars.sim.so:16:16
+-none:@MODULESDIR@/none.sim.so:0:0
++aes-256-cbc::32:16
++aes-192-cbc::24:16
++aes-128-cbc::16:16
++twofish-256-cbc::32:16
++twofish-192-cbc::24:16
++twofish-128-cbc::16:16
++mars-256-cbc::32:16
++mars-192-cbc::24:16
++mars-128-cbc::16:16
++none::0:0
+ 
+ #
+ # Configured hash functions.
+ #
+ # Format: <name>:<module path>:<block length>:<digest length>
++# Example: sha1::64:20
+ #
+ # If the hash function is builtin the <module path> maybe omitted.
+ #
+@@ -39,6 +41,7 @@
+ # configured to the [hash] section.
+ #
+ # Format: <name>:<hash name>:<mac length>
++# Example: hmac-sha1-96:sha1:12
+ #
+ [hmac]
+ hmac-sha1-96:sha1:12
+@@ -50,6 +53,7 @@
+ # Configured PKCS.
+ #
+ # Format: <name>
++# Example: rsa
+ #
+ [PKCS]
+ rsa
+@@ -59,6 +63,7 @@
+ # run as root.
+ #
+ # Format: <user>:<group>
++# Example: silcd:silcd
+ #
+ [Identity]
+ nobody:nobody
+@@ -67,22 +72,25 @@
+ # Server's administrative information.
+ #
+ # Format: <location>:<server type>:<admin's name>:<admin's email address>
++# Example: Kuopio, Finland:Test Server:Pekka Riikonen:priikone@poseidon.pspt.fi
+ #
+ [AdminInfo]
+-Kuopio, Finland:Test Server:Pekka Riikonen:priikone@poseidon.pspt.fi
++Default Location:NetBSD Test Server:Root of All Evil:root@localhost
+ 
+ #
+ # Server information.
+ #
+-# Format: +<server FQDN>:<server IP>:<geographic location>:<port>
++# Format: <server FQDN>:<server IP>:<geographic location>:<port>
++# Example: lassi.kuo.fi.ssh.com:10.2.1.6:Kuopio, Finland:706
+ #
+ [ServerInfo]
+-lassi.kuo.fi.ssh.com:10.2.1.6:Kuopio, Finland:706
++localhost:127.0.0.1:Default Location:706
+ 
+ #
+ # Server keys
+ #
+-# Format: +<public key>:<private key>
++# Format: <public key>:<private key>
++# Example: /usr/local/silc/etc/silcd.pub:/usr/local/silc/etc/silcd.prv
+ #
+ [ServerKeys]
+ @ETCDIR@/silcd.pub:@ETCDIR@/silcd.prv
+@@ -91,9 +99,10 @@
+ # Listenning ports.
+ #
+ # Format: <local IP>:<Listener IP>:<port>
++# Example: 10.2.1.6:10.2.1.6:706
+ #
+ [ListenPort]
+-10.2.1.6:10.2.1.6:706
++127.0.0.1:127.0.0.1:706
+ 
+ #
+ # Log files.
+@@ -107,12 +116,13 @@
+ #         warninglogile:<path>:<max byte size>
+ #         errorlogile:<path>:<max byte size>
+ #         fatallogile:<path>:<max byte size>
++# Example: infologfile:/usr/local/silc/logs/silcd.log:10000
+ #
+ [Logging]
+ infologfile:@LOGSDIR@/silcd.log:10000
+-#warninglogfile:@LOGSDIR@/silcd_warning.log:10000
+-#errorlogfile:@LOGSDIR@/error.log:10000
+-#fatallogfile:@LOGSDIR@/silcd_error.log:
++warninglogfile:@LOGSDIR@/silcd_warning.log:10000
++errorlogfile:@LOGSDIR@/error.log:10000
++fatallogfile:@LOGSDIR@/silcd_error.log:
+ 
+ #
+ # Connection classes.
+@@ -121,6 +131,7 @@
+ # used to optimize the server and the connections.#
+ #
+ # Format: <class number>:<ping freq>:<connect freq>:<max links>
++# Example: 1:100:100:100
+ #
+ [ConnectionClass]
+ 1:100:100:100
+@@ -130,6 +141,7 @@
+ # Configured client connections.
+ #
+ # Format: <remote host>:<auth method>:<auth data>:<port>:<class>
++# Example: :::706:1
+ #
+ # The <auth data> is either passphrase or file path to the public key
+ # file.
+@@ -141,12 +153,13 @@
+ # Configured server administrator connections
+ #
+ # Format: <host>:<username>:<nickname>:<auth method>:<auth data>
++# Example: 10.2.1.199:priikone:pekka:passwd:veryscret
+ #
+ # The <auth data> is either passphrase or file path to the public key
+ # file.
+ #
+ [AdminConnection]
+-10.2.1.199:priikone:pekka:passwd:veryscret
++127.0.0.1:admin:admin:passwd:verysecret
+ 
+ #
+ # Configured server connections.
+@@ -158,6 +171,10 @@
+ #
+ # Format: <remote host>:<auth method>:<auth data>:<port>:
+ #         <version ID>:<class>:<backup connection>
++# Example: 10.2.1.7:passwd:veryscret:706:1:1:0
++#          10.2.1.17:passwd:veryscret13:706:1:1:1   backup connection, that
++#                                                   host will use this server
++#                                                   as backup router.
+ #
+ # The <auth data> is either passphrase or file path to the public key
+ # file. If the connection is backup connection then set the <backup 
+@@ -165,10 +182,6 @@
+ # set to value 1 then this server will be backup router.
+ #
+ [ServerConnection]
+-10.2.1.7:passwd:veryscret:706:1:1:0
+-10.2.1.17:passwd:veryscret13:706:1:1:1   # backup connection, that host
+-                                         # will use this server as backup
+-                                         # router.
+ 
+ #
+ # Configured router connections.
+@@ -181,6 +194,9 @@
+ # Format: <remote host>:<auth method>:<auth data>:<port>:<version ID>:
+ #         <class>:<initiator>:<backup replace IP>:<backup replace port>:
+ #         <local backup>
++# Example: 10.2.1.100:passwd:veryverysecret:706:1:1:1
++#          10.2.100.131:pubkey:/path/to/the/publickey:706:1:1:1
++#          10.2.100.100:pubkey:/path/to/the/publickey:706:1:1:0:10.2.1.6:706:1
+ #
+ # The <auth data> is either passphrase or file path to the public key
+ # file. If you are the initiator of the connection then set the <initiator>
+@@ -195,9 +211,6 @@
+ # If the backup router is in other cell then set it to value 0.
+ #
+ [RouterConnection]
+-#10.2.1.100:passwd:veryverysecret:706:1:1:1
+-#10.2.100.131:pubkey:/path/to/the/publickey:706:1:1:1
+-#10.2.100.100:pubkey:/path/to/the/publickey:706:1:1:0:10.2.1.6:706:1
+ 
+ #
+ # Denied connections.
+@@ -205,22 +218,28 @@
+ # These connections are denied to connect our server.
+ #
+ # Format: <remote host>:<port>:<comment>
++# Example: 10.2.1.99:0:Your connection has been denied
+ #
+ [DenyConnection]
+-#10.2.1.99:0:Your connection has been denied
+ 
+ #
+ # Message Of The Day
+ #
+-# specify the text file containing the motd:
++# Specify the text file containing the motd.
+ #
+-#[motd]
+-#@ETCDIR@/motd.txt
++# Format: <filename>
++# Example: /usr/local/silc/etc/motd.txt
++#
++[motd]
++@ETCDIR@/motd.txt
+ 
+ #
+-# Pid File
++# Pidfile
++#
++# Specify the pidfile where it will be written.
+ #
+-# specify the pidfile where it will be written:
++# Format: <filename>
++# Example: /var/run/silcd.pid
+ #
+ [pid]
+-@PIDFILE@
++/var/run/silcd.pid