From: Pekka Riikonen <priikone@silcnet.org>
Date: Mon, 18 Apr 2005 06:53:39 +0000 (+0000)
Subject: 	PublicKeyDir cannot be used in Admin block.
X-Git-Tag: silc.toolkit.0.9.14~5
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=6ac004d8fc96048346835b42e9604ec6c4bcdbc8

	PublicKeyDir cannot be used in Admin block.
---

diff --git a/CHANGES b/CHANGES
index fa8a3230..2ebf810f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+Mon Apr 18 09:53:28 EEST 2005  Pekka Riikonen <priikone@silcnet.org>
+
+	* Added pkg-config check to configure.
+
+	* The PublicKeyDir must not be used with Admin block in server
+	  config.  Affected file silcd/serverconfig.c.
+
 Sat Apr 16 20:23:48 EEST 2005  Pekka Riikonen <priikone@silcnet.org>
 
 	* Added Autodist.
diff --git a/apps/silcd/serverconfig.c b/apps/silcd/serverconfig.c
index 0afc3f39..3b04fc10 100644
--- a/apps/silcd/serverconfig.c
+++ b/apps/silcd/serverconfig.c
@@ -921,12 +921,6 @@ SILC_CONFIG_CALLBACK(fetch_admin)
       goto got_err;
     }
   }
-  else if (!strcmp(name, "publickeydir")) {
-    if (!my_parse_publickeydir((char *) val, (void *)&tmp->publickeys)) {
-      got_errno = SILC_CONFIG_EPRINTLINE;
-      goto got_err;
-    }
-  }
   else
     return SILC_CONFIG_EINTERNAL;
   return SILC_CONFIG_OK;