Update silc-server to 0.8.

Patches contributed by Lubomir Sedlacik <salo@Xtrmntr.org> in PR 15779

Changes from 0.7.9 to 0.8:
==========================

* Removed 0.6.x backwards support.
* Added `prefer_ipv6' argument to the functions
  silc_net_gethostbyname[_async].  If it is TRUE it will return
  IPv6 address over IPv4.  If FALSE IPv4 address is returned
  even if IPv6 address was found.
* Added support silc_net_create_connection[_async] to fallback
  to IPv4 address if IPv6 address could not be used (like if
  it doesn't work on a specific system).  Affected file in
* Added `user_count' to the SilcChannelEntry which now tells the
  number of users on the channel.  The user count is now saved
  in normal server of global channels as well.
* Added following new config file settings:
  channel_rekey_secs, key_exchange_rekey, key_exchange_pfs,
  key_exchange_timeout, conn_auth_timeout, connections_max,
  links_max.
  Implemented all the new config settings handling in the server.
  Optimized the use of SKE Mutual flag usage.  Use it only
  if connection authentication protocol is not based in public
  key authentication.
* Added new configuration options and blocks:
  keepalive_secs, reconnect_count, reconnect_interval,
  reconnect_interval_max, reconnect_keep_trying and
  require_reverser_lookup.  Added ConnectionParam block, and
  implemented the connection parameters when connecting as
  initiator and when accepting connections as responder.
* Splitted the doc/example_silcd.conf.in.  Separated the crypto
  algorithm parts and created new file silcalgs.conf, that
  is now included from the example_silcd.conf.in.
* Optimized the silc_server_connect_to_router_second to take
  the connection configuration object from the SilcServerConnection
  object instead of finding it during the connecting phase.
  Added the configuration object to SilcServerConnection struct.
* Fixed the public key authentication to allocate always the
  destination signature buffer instead of using static buffer.
* Added new Passphrase and Publickey authentication methods to
  config file, allowing both public key and passphrase based
  authentication to be set at the same time.
  Added `prefer_passphrase_auth' setting in config file which
  can be used to set to prefer passwd auth if both passwd and
  public key is set.  If not set, public key is preferred.
  This has effect only when being initiator (responder will try
  both anyway).
  Added support for authentication with passphrase and public key
  at the same time.  The passphrase is tried first always since
  it is faster to check.
* Merged the new SILC Config library, with the server parsing
  support.  Read the header file silcconfig.h or the toolkit
  documentation for the news.

5 files changed, 166 insertions, 263 deletions

diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index f90a35360ca..6b874a367dc 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2002/02/02 10:58:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/03 23:49:49 hubertf Exp $
 
-DISTNAME=		silc-server-0.7.9
+DISTNAME=		silc-server-0.8
 CATEGORIES=		chat
-MASTER_SITES=		http://silcnet.org/download/server/sources/ \
+MASTER_SITES=		http://www.silcnet.org/download/server/sources/ \
 			ftp://ftp.silcnet.org/silc/server/sources/ \
-			http://www.planetmirror.com/pub/silcnet/server/sources/ \
+			http://www.fi.silcnet.org/download/server/sources/ \
 			ftp://ftp.au.silcnet.org/pub/silcnet/server/sources/ \
-			http://munitions.vipul.net/software/mirrors/silc/server/sources/ \
+			http://www.us.silcnet.org/download/server/sources/ \
 			ftp://ftp.no.silcnet.org/pub/silc/server/sources/ \
-			http://the.wiretapped.net/security/network-security/silc/server/sources/ \
-			ftp://ftp.wiretapped.net/pub/security/network-security/silc/server/sources/
+			http://www.at.silcnet.org/download/server/sources/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		salo@silcnet.org
@@ -31,12 +30,14 @@ PKG_USERS=		${SILCD_USER}:${SILCD_GROUP}::SILC\\ Server\\ user
 PKG_SYSCONFSUBDIR?=	silcd
 
 CONF_FILES_MODE=	0600
-CONF_FILES=		${PREFIX}/share/doc/silcd/silcd.conf.default \
+CONF_FILES+=		${PREFIX}/share/doc/silcd/silcd.conf.default \
 			${PKG_SYSCONFDIR}/silcd.conf
-CONF_FILES_PERMS=	${PREFIX}/share/doc/silcd/motd.txt.default \
+CONF_FILES+=		${PREFIX}/share/doc/silcd/silcalgs.conf.default \
+			${PKG_SYSCONFDIR}/silcalgs.conf
+CONF_FILES_PERMS+=	${PREFIX}/share/doc/silcd/motd.txt.default \
 			${PKG_SYSCONFDIR}/motd.txt \
 			${ROOT_USER} ${ROOT_GROUP} 0644
-SUPPORT_FILES_PERMS=	${PREFIX}/share/doc/silcd/silcd.default \
+SUPPORT_FILES_PERMS+=	${PREFIX}/share/doc/silcd/silcd.default \
 			${PREFIX}/etc/rc.d/silcd \
 			${ROOT_USER} ${ROOT_GROUP} 0555
 
@@ -55,6 +56,10 @@ CONFIGURE_ARGS+=	--with-silcd-pid-file=/var/run/silcd.pid
 CONFIGURE_ARGS+=	--with-logsdir=/var/log/silcd
 CONFIGURE_ARGS+=	--without-ncurses
 
+# If you want to debug silc-server, uncomment this
+#
+#CONFIGURE_ARGS+=       --enable-debug
+
 .if (${MACHINE_ARCH} != "i386")
 CONFIGURE_ARGS+=	--disable-asm
 .endif
@@ -66,6 +71,5 @@ post-install:
 		> ${PREFIX}/share/doc/silcd/motd.txt.default
 
 .include "../../devel/glib/buildlink.mk"
-.include "../../devel/pth/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/silc-server/PLIST b/chat/silc-server/PLIST
index e31d5825839..7dbd1b94056 100644
--- a/chat/silc-server/PLIST
+++ b/chat/silc-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/01/26 14:43:16 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/03/03 23:49:49 hubertf Exp $
 sbin/silcd
 share/doc/silcd/CHANGES
 share/doc/silcd/COPYING
@@ -8,6 +8,7 @@ share/doc/silcd/FAQ
 share/doc/silcd/INSTALL
 share/doc/silcd/README
 share/doc/silcd/TODO
+share/doc/silcd/silcalgs.conf.default
 share/doc/silcd/silcd.conf.default
 share/doc/silcd/silcd.default
 share/doc/silcd/motd.txt.default
diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo
index dbe98c80b56..2e8eee3f543 100644
--- a/chat/silc-server/distinfo
+++ b/chat/silc-server/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2002/02/02 10:58:32 hubertf Exp $
+$NetBSD: distinfo,v 1.8 2002/03/03 23:49:49 hubertf Exp $
 
-SHA1 (silc-server-0.7.9.tar.bz2) = 2ebffd45b9fc7863e9d610580c699e0220b72d21
-Size (silc-server-0.7.9.tar.bz2) = 897484 bytes
-SHA1 (patch-aa) = e255bc11303169014374977733e7593d8121a27a
-SHA1 (patch-ab) = 91395362f578ffd75419a57399bed0bf3ba2d5ff
+SHA1 (silc-server-0.8.tar.bz2) = 9198f8afec6cbc042633b13abf375416f5bfd77c
+Size (silc-server-0.8.tar.bz2) = 919208 bytes
+SHA1 (patch-aa) = 97ccff02e5d2d1bd3ff64a1a1942525e5a4522bd
+SHA1 (patch-ab) = c80a6746f04d153690b67709874acf443e0afc21
diff --git a/chat/silc-server/patches/patch-aa b/chat/silc-server/patches/patch-aa
index 3addd35ddfd..3baa58e33d1 100644
--- a/chat/silc-server/patches/patch-aa
+++ b/chat/silc-server/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2002/02/02 10:31:22 hubertf Exp $
+$NetBSD: patch-aa,v 1.5 2002/03/03 23:49:49 hubertf Exp $
 
---- Makefile.in.orig	Mon Jan 28 23:16:47 2002
-+++ Makefile.in	Tue Jan 29 16:12:23 2002
-@@ -528,25 +528,12 @@
+--- Makefile.in.orig	Fri Mar  1 11:26:19 2002
++++ Makefile.in	Fri Mar  1 18:58:44 2002
+@@ -527,11 +527,7 @@
  	-rm -rf $(distdir)
  
  install-dirs:
@@ -11,42 +11,26 @@ $NetBSD: patch-aa,v 1.4 2002/02/02 10:31:22 hubertf Exp $
 -	-mkdir -p $(helpdir)
  	-mkdir -p $(docdir)
 -	-mkdir -p $(logsdir)
--
--generate-server-key:
--	-@if test '!' -f $(etcdir)/silcd.pub ; then \
--	  $(sbindir)/silcd -C $(etcdir); \
--	fi
--
--sim-install:
--	-$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
  
+ generate-server-key:
+ 	-@if test '!' -f $(etcdir)/silcd.pub ; then \
+@@ -544,8 +540,8 @@
  doc-install:
  	$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/
 -	$(INSTALL_DATA) $(srcdir)/doc/example_* $(docdir)/
 -	$(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/
 +	$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(docdir)/silcd.conf.default
++	$(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf $(docdir)/silcalgs.conf.default
  	$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
-@@ -560,19 +547,8 @@
- 	$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
- 	$(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(docdir)/examples/
+@@ -579,7 +575,7 @@
  
--etc-install:
--	-@if test '!' -f $(etcdir)/silcd.conf ; then \
--	  $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \
--	  $(etcdir)/silcd.conf; \
--          chmod go= $(etcdir)/silcd.conf; \
--	fi
--	-@if test '!' -f $(etcdir)/silc.conf ; then \
--	  $(INSTALL_DATA) $(srcdir)/doc/example_silc.conf \
--	  $(etcdir)/silc.conf; \
--	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 examples-install etc-install
-+@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs doc-install examples-install
+ @SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs generate-server-key sim-install doc-install toolkit-install examples-install etc-install
+-@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install
++@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_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-ab b/chat/silc-server/patches/patch-ab
index ad18372502f..710b14b6ca6 100644
--- a/chat/silc-server/patches/patch-ab
+++ b/chat/silc-server/patches/patch-ab
@@ -1,232 +1,146 @@
-$NetBSD: patch-ab,v 1.3 2002/01/26 14:43:18 hubertf Exp $
+$NetBSD: patch-ab,v 1.4 2002/03/03 23:49:49 hubertf Exp $
 
---- doc/example_silcd.conf.in.orig	Mon Jan 14 23:03:37 2002
-+++ doc/example_silcd.conf.in
-@@ -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
+--- doc/example_silcd.conf.in.orig	Wed Feb 27 17:47:05 2002
++++ doc/example_silcd.conf.in	Fri Mar  1 18:53:08 2002
+@@ -36,7 +36,7 @@
+ 	# This is the default path where to search modules.  If omitted
+ 	# built-in modules will be used.  Built-in modules will also be
+ 	# used if a module file cannot be located.
+-	module_path = "@MODULESDIR@";
++	module_path = "";
  
- #
- # 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,30 +63,34 @@
- # run as root.
- #
- # Format: <user>:<group>
-+# Example: nobody:nobody
- #
- [Identity]
--nobody:nobody
-+silcd:silcd
+ 	# If both passphrase and public key authentication is set for a
+ 	# connection the public key authentication is the preferred one
+@@ -123,37 +123,37 @@
+ 	#
+ 	# Server FQDN and IP address
+ 	#
+-	hostname = "lassi.kuo.fi.ssh.com";
+-	ip = "10.2.1.6";
++	hostname = "localhost";
++	ip = "127.0.0.1";
+ 	port = 706;
  
- #
- # 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
+ 	#
+ 	# ServerType field specifies the purpose of this server
+ 	# This is only a descriptive field.
+ 	#
+-	ServerType = "Test Server";
++	ServerType = "NetBSD Test Server";
  
- #
- # 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
+ 	#
+ 	# Geographic location
+ 	#
+-	Location = "Kuopio, Finland";
++	Location = "Default City, Default Country";
  
- #
- # 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
+ 	#
+ 	# Full admin name
+ 	#
+-	Admin = "Foo T. Bar";
++	Admin = "Root of All Evil";
  
- #
- # Log files.
-@@ -120,9 +129,13 @@
- #         warninglogile:<path>:<max byte size>
- #         errorlogile:<path>:<max byte size>
- #         fatallogile:<path>:<max byte size>
-+# Example: quicklogs:no:
-+#          flushdelay:10:
-+#          infologfile:/usr/local/silc/logs/silcd.log:10000
-+#          
- #
- [Logging]
--quicklogs:no:
-+quicklogs:yes:
- flushdelay:300:
- infologfile:@LOGSDIR@/silcd.log:50000
- warninglogfile:@LOGSDIR@/silcd_warnings.log:50000
-@@ -136,6 +149,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
-@@ -145,6 +159,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.
-@@ -156,12 +171,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
+ 	#
+ 	# Admin's email address
+ 	#
+-	AdminEmail = "foo-admin@bar.com";
++	AdminEmail = "root@localhost";
  
- #
- # Configured server connections.
-@@ -173,6 +189,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 
-@@ -180,10 +200,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.
+ 	#
+ 	# Run SILC server as specific user and group. The server must be 
+ 	# initially run as root.
+ 	#
+-	User = "nobody";
+-	Group = "nobody";
++	User = "silcd";
++	Group = "silcd";
  
- #
- # Configured router connections.
-@@ -196,6 +212,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>
-@@ -210,9 +229,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
+ 	#
+ 	# Public and private keys
+@@ -166,12 +166,12 @@
+ 	#
+ 	# Specifies the text file displayed on client connection
+ 	#
+-	#MotdFile = "@ETCDIR@/motd.txt";
++	MotdFile = "@ETCDIR@/motd.txt";
  
- #
- # Denied connections.
-@@ -220,22 +236,27 @@
- # 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
+ 	#
+ 	# Pid file
+ 	#
+-	PidFile = "@PIDFILE@";
++	PidFile = "/var/run/silcd.pid";
+ };
  
  #
- # 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
+@@ -193,7 +193,7 @@
+ 	# real-time. This causes a bit more CPU and HDD activity, but
+ 	# reduces memory usage. (if unsure say true).
+ 	#
+-	QuickLogs = false;
++	QuickLogs = true;
+ 
+ 	#
+ 	# (Only if QuickLogs is false)
+@@ -327,9 +327,9 @@
+ # required.
+ #
+ Admin {
+-	Host = "10.2.1.199";
+-	User = "priikone";
+-	Nick = "pekka";
++	Host = "127.0.0.1";
++	User = "admin";
++	Nick = "admin";
+ 	Passphrase = "verysecret";
+ 	# Publickey = "/path/to/the/public.key";
+ };
+@@ -352,13 +352,13 @@
+ # to true. For normal connections set it false. If it is set to true then
+ # this server will be backup router.
+ #
+-ServerConnection {
+-	Host = "10.2.1.7";
+-	Passphrase = "verysecret";
+-	#Publickey = "/path/to/the/public.key";
+-	Params = "normal";
+-	Backup = false;
+-};
++#ServerConnection {
++#	Host = "10.2.1.7";
++#	Passphrase = "verysecret";
++#	#Publickey = "/path/to/the/public.key";
++#	Params = "normal";
++#	Backup = false;
++#};
  
  #
- # Pid File
- #
--# specify the pidfile where it will be written:
-+# Specify the pidfile where it will be written.
+ # Configured router connections
+@@ -385,17 +385,17 @@
+ # backup router is in our cell then set the "BackupLocal" option to true.
+ # If the backup router is in other cell then set it to false.
+ #
+-RouterConnection {
+-	Host = "10.2.1.100";
+-	Port = 706;
+-	Passphrase = "verysecret";
+-	#Publickey = "/path/to/the/public.key";
+-	Params = "normal";
+-	Initiator = true;
+-	#BackupHost = "10.2.1.6";
+-	#BackupPort = 706;
+-	#BackupLocal = true;
+-};
++#RouterConnection {
++#	Host = "10.2.1.100";
++#	Port = 706;
++#	Passphrase = "verysecret";
++#	#Publickey = "/path/to/the/public.key";
++#	Params = "normal";
++#	Initiator = true;
++#	#BackupHost = "10.2.1.6";
++#	#BackupPort = 706;
++#	#BackupLocal = true;
++#};
+ 
  #
-+# Format: <filename>
-+# Example: /var/run/silcd.pid
- [pid]
--@PIDFILE@
-+/var/run/silcd.pid
+ # Denied connections