[Pkg-silc-commits] [SCM] server for the SILC protocol branch, master, updated. debian/1.1.16-1-7-ge021731

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit e7d8ba47e13fbd8c9126692b6aeeb4d968107a47
Merge: fa150714d2562c855e7b2b9560f56a06f2b04a61 9ef6c4a1d32454a61db26a785dae49c12cd0ec96
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Mon Aug 31 13:55:48 2009 +0200

    Merge commit 'upstream/1.1.17'

diff --combined apps/silcd/serverconfig.c
index 6c8494b,6a3cbf0..a52fa6e
--- 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},
@@@ -1870,7 -1870,7 +1870,7 @@@ silc_server_config_find_client(SilcServ
      return NULL;
  
    for (client = config->clients; client; client = client->next) {
-     if (client->host && !silc_string_compare(client->host, host))
+     if (client->host && !silc_string_match(client->host, host))
        continue;
      break;
    }
@@@ -1898,11 -1898,11 +1898,11 @@@ silc_server_config_find_admin(SilcServe
      nick = "*";
  
    for (admin = config->admins; admin; admin = admin->next) {
-     if (admin->host && !silc_string_compare(admin->host, host))
+     if (admin->host && !silc_string_match(admin->host, host))
        continue;
-     if (admin->user && !silc_string_compare(admin->user, user))
+     if (admin->user && !silc_string_match(admin->user, user))
        continue;
-     if (admin->nick && !silc_string_compare(admin->nick, nick))
+     if (admin->nick && !silc_string_match(admin->nick, nick))
        continue;
      /* no checks failed -> this entry matches */
      break;
@@@ -1925,7 -1925,7 +1925,7 @@@ silc_server_config_find_denied(SilcServ
      return NULL;
  
    for (deny = config->denied; deny; deny = deny->next) {
-     if (deny->host && !silc_string_compare(deny->host, host))
+     if (deny->host && !silc_string_match(deny->host, host))
        continue;
      break;
    }
@@@ -1950,7 -1950,7 +1950,7 @@@ silc_server_config_find_server_conn(Sil
      return NULL;
  
    for (serv = config->servers; serv; serv = serv->next) {
-     if (!silc_string_compare(serv->host, host))
+     if (!silc_string_match(serv->host, host))
        continue;
      break;
    }
@@@ -1974,7 -1974,7 +1974,7 @@@ silc_server_config_find_router_conn(Sil
      return NULL;
  
    for (serv = config->routers; serv; serv = serv->next) {
-     if (!silc_string_compare(serv->host, host))
+     if (!silc_string_match(serv->host, host))
        continue;
      if (port && serv->port && serv->port != port)
        continue;
@@@ -2001,7 -2001,7 +2001,7 @@@ silc_server_config_find_backup_conn(Sil
    for (serv = config->routers; serv; serv = serv->next) {
      if (!serv->backup_router)
        continue;
-     if (!silc_string_compare(serv->host, host))
+     if (!silc_string_match(serv->host, host))
        continue;
      break;
    }

-- 
server for the SILC protocol