PublicKeyDir cannot be used in Admin block.

diff --git a/CHANGES b/CHANGES
index fa8a3230e41200c56bb8f9c066cb40328725e488..2ebf810f8dca4e78ef571ea89376c3cc49b9033a 100644 (file)
--- 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 0afc3f39d67f77aaaf67d490672dc8c5a26c27f1..3b04fc108dd09f848189ef29a3689c59b2864539 100644 (file)
--- 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;