[Pkg-silc-commits] [SCM] server for the SILC protocol branch, master, updated. fa150714d2562c855e7b2b9560f56a06f2b04a61
Jérémy Bobbio
lunar at debian.org
Fri Jun 26 15:22:07 UTC 2009
The following commit has been merged in the master branch:
commit f6e99aef518784e5e7c01643dce12e3e1f3af4ed
Merge: 091cd4233eb69011b20957a3bbdaa0ad40ad7a90 9f33f8d35a07e9c03e76b35d888adf77ec65e8ca
Author: Jérémy Bobbio <lunar at debian.org>
Date: Thu Jun 25 18:00:29 2009 +0200
Merge commit 'upstream/1.1.16'
Conflicts:
ChangeLog
Makefile.am
Makefile.in
aclocal.m4
apps/Makefile.am
apps/Makefile.in
apps/silcd/idlist.c
apps/silcd/packet_receive.c
apps/silcd/server.c
apps/silcd/server_util.c
apps/silcd/silc-server.spec
config.guess
config.sub
configure
configure.ac
debian/silcd.conf.default
doc/Makefile.am
doc/Makefile.in
doc/silcd.8
doc/silcd.conf.5
includes/Makefile.am
includes/Makefile.in
includes/silc.h
includes/silcdistdefs.h
lib/Makefile.am
lib/Makefile.in
lib/contrib/Makefile.am
lib/contrib/Makefile.in
lib/silcapputil/Makefile.am
lib/silcapputil/Makefile.in
lib/silcasn1/Makefile.am
lib/silcasn1/Makefile.in
lib/silccore/Makefile.am
lib/silccore/Makefile.in
lib/silccore/silcpacket.c
lib/silccrypt/Makefile.am
lib/silccrypt/Makefile.in
lib/silchttp/Makefile.am
lib/silchttp/Makefile.in
lib/silcmath/Makefile.am
lib/silcmath/Makefile.in
lib/silcske/Makefile.am
lib/silcske/Makefile.in
lib/silcskr/Makefile.am
lib/silcskr/Makefile.in
lib/silcutil/Makefile.am
lib/silcutil/Makefile.in
lib/silcutil/silcconfig.c
ltmain.sh
silcdefs.h.in
diff --combined apps/silcd/serverconfig.c
index e47c8f2,a2c5892..6c8494b
--- a/apps/silcd/serverconfig.c
+++ b/apps/silcd/serverconfig.c
@@@ -1255,10 -1255,10 +1255,10 @@@ static const SilcConfigTable table_serv
{ "hostname", SILC_CONFIG_ARG_STR, fetch_serverinfo, NULL},
{ "primary", SILC_CONFIG_ARG_BLOCK, fetch_serverinfo, table_serverinfo_c},
{ "secondary", SILC_CONFIG_ARG_BLOCK, fetch_serverinfo, table_serverinfo_c},
- { "servertype", SILC_CONFIG_ARG_STR, fetch_serverinfo, NULL},
- { "location", SILC_CONFIG_ARG_STR, fetch_serverinfo, NULL},
- { "admin", SILC_CONFIG_ARG_STR, fetch_serverinfo, NULL},
- { "adminemail", SILC_CONFIG_ARG_STR, fetch_serverinfo, NULL},
+ { "servertype", SILC_CONFIG_ARG_STRE, fetch_serverinfo, NULL},
+ { "location", SILC_CONFIG_ARG_STRE, fetch_serverinfo, NULL},
+ { "admin", SILC_CONFIG_ARG_STRE, fetch_serverinfo, NULL},
+ { "adminemail", SILC_CONFIG_ARG_STRE, fetch_serverinfo, NULL},
{ "user", SILC_CONFIG_ARG_STR, fetch_serverinfo, NULL},
{ "group", SILC_CONFIG_ARG_STR, fetch_serverinfo, NULL},
{ "publickey", SILC_CONFIG_ARG_STR, fetch_serverinfo, NULL},
@@@ -1542,7 -1542,7 +1542,7 @@@ SilcServerConfig silc_server_config_all
silc_config_strerror(ret)));
linebuf = silc_config_read_line(file, line);
if (linebuf) {
- SILC_SERVER_LOG_ERROR((" file %s line %lu: %s\n", filename,
+ SILC_SERVER_LOG_ERROR((" file %s line %u: %s\n", filename,
line, linebuf));
silc_free(linebuf);
}
diff --combined debian/silcd.conf.default
index 237fbf8,88bb630..02f4fa8
--- a/debian/silcd.conf.default
+++ b/debian/silcd.conf.default
@@@ -1,11 -1,9 +1,11 @@@
#
# silcd.conf
#
-# Example configuration file. Note that this attempts to present various
-# configuration possibilities and may not actually give any sensible
-# configuration. For real life example see the examples/ directory.
+# Main Debian configuration file for the SILC server. Some option in this file
+# are managed using debconf. You can invoke `dpkg-reconfigure silcd` if
+# you want to change such options.
+#
+# The syntax and options of this file are documented in silcd.conf(5).
#
# Most of the settings in this file are optional. If some setting is
# mandatory it is mentioned separately. If some setting is omitted it means
@@@ -24,7 -22,7 +24,7 @@@
# Include global algorithms from the "silcalgs.conf" file. This file defines
# ciphers, hash functions, HMACs and PKCS algorithms that can be used.
#
-Include "/usr/local/etc/silcalgs.conf";
+Include "/etc/silcd/silcalgs.conf";
#
# General configuration options
@@@ -178,7 -176,7 +178,7 @@@ General
# Debug string. Debug string can be set to print debugging from
# the running server. The debug is redirected to stderr.
- # debug_string = "";
+ #debug_string = "";
};
#
@@@ -188,14 -186,17 +188,16 @@@ ServerInfo
#
# Server name (FQDN)
#
- hostname = "lassi.kuo.fi.ssh.com";
+ hostname = "";
#
# Primary listener. Specify the IP address and the port to bind
- # the server.
+ # the server. The public_ip can be used to specify the public IP
+ # if the server is behind NAT.
#
Primary {
- Include "/etc/silcd/silcd-primary-ip.conf";
- ip = "10.2.1.6";
+ # public_ip = "11.1.1.1";
- port = 706;
++ Include "/etc/silcd/silcd-primary-ip.conf";
};
#
@@@ -209,47 -210,47 +211,47 @@@
# ServerType field specifies the purpose of this server
# This is only a descriptive field.
#
- ServerType = "Test Server";
+ ServerType = "";
#
# Geographic location
#
- Location = "Kuopio, Finland";
+ Location = "";
#
# Full admin name
#
- Admin = "Foo T. Bar";
+ Admin = "";
#
# Admin's email address
#
- AdminEmail = "foo-admin at bar.com";
+ AdminEmail = "";
#
# Run SILC server as specific user and group. The server must be
# initially run as root.
#
User = "nobody";
- Group = "nobody";
+ Group = "nogroup";
#
# Public and private keys
#
- PublicKey = "/usr/local/etc/silcd.pub";
- PrivateKey = "/usr/local/etc/silcd.prv";
+ PublicKey = "/etc/silcd/silcd.pub";
+ PrivateKey = "/etc/silcd/silcd.prv";
#
# Motd file
#
# Specifies the text file displayed on client connection
#
- #MotdFile = "/usr/local/etc/motd.txt";
+ #MotdFile = "/etc/silcd/motd.txt";
#
# Pid file
#
- PidFile = "/usr/local/var/silcd.pid";
+ PidFile = "/var/run/silcd.pid";
};
#
@@@ -287,25 -288,25 +289,25 @@@ Logging
# Informational messages
Info {
- File = "/usr/local/logs/silcd.log";
+ File = "/var/log/silcd/silcd.log";
Size = "100k";
};
# Warning messages
#Warnings {
- # File = "/usr/local/logs/silcd_warnings.log";
+ # File = "/var/log/silcd/silcd_warnings.log";
# Size = "50k";
#};
# Error messages
#Errors {
- # File = "/usr/local/logs/silcd_errors.log";
+ # File = "/var/log/silcd/silcd_errors.log";
# Size = "50k";
#};
# Fatal messages
#Fatals {
- # File = "/usr/local/logs/silcd_fatals.log";
+ # File = "/var/log/silcd/silcd_fatals.log";
# Size = "50k";
#};
};
@@@ -457,7 -458,11 +459,7 @@@ Client
# required.
#
Admin {
- Host = "10.2.1.199";
- User = "priikone";
- Nick = "pekka";
- Passphrase = "verysecret";
- # PublicKey = "/path/to/the/public.pub";
+ Include "/etc/silcd/silcd-admin.conf";
};
#
@@@ -479,13 -484,13 +481,13 @@@
# to true. For normal connections set it false. If it is set to true then
# your server will be backup router.
#
-ServerConnection {
- Host = "10.2.1.7";
- Passphrase = "verysecret";
- #PublicKey = "/path/to/the/public.pub";
- Params = "normal";
- Backup = false;
-};
+#ServerConnection {
+# Host = "10.2.1.7";
+# Passphrase = "verysecret";
+# #PublicKey = "/etc/silcd/router.pub";
+# Params = "normal";
+# Backup = false;
+#};
#
# Configured router connections
@@@ -515,17 -520,17 +517,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.pub";
- Params = "normal";
- Initiator = true;
- #BackupHost = "10.2.1.6";
- #BackupPort = 706;
- #BackupLocal = true;
-};
+#RouterConnection {
+# Host = "10.2.1.100";
+# Port = 706;
+# Passphrase = "verysecret";
+# #PublicKey = "/etc/silcd/router.pub";
+# Params = "normal";
+# Initiator = true;
+# #BackupHost = "10.2.1.6";
+# #BackupPort = 706;
+# #BackupLocal = true;
+#};
#
# Denied connections
--
server for the SILC protocol
More information about the Pkg-silc-commits
mailing list