From: Pekka Riikonen <priikone@silcnet.org>
Date: Tue, 8 Apr 2008 05:01:19 +0000 (+0300)
Subject: Accept 0600 and 0640 for server private key permissions.
X-Git-Tag: silc.server.1.1.3~8
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=9b290d7cd0ad262dfc23ef2e5673a2e088d1619e

Accept 0600 and 0640 for server private key permissions.
---

diff --git a/apps/silcd/serverconfig.c b/apps/silcd/serverconfig.c
index 796242a6..30d76af3 100644
--- a/apps/silcd/serverconfig.c
+++ b/apps/silcd/serverconfig.c
@@ -640,10 +640,11 @@ SILC_CONFIG_CALLBACK(fetch_serverinfo)
 
     /* Check the private key file permissions. */
     if ((stat(file_tmp, &st)) != -1) {
-      if ((st.st_mode & 0777) != 0600) {
+      if (((st.st_mode & 0777) != 0600) &&
+	  ((st.st_mode & 0777) != 0640)) {
 	SILC_SERVER_LOG_ERROR(("Wrong permissions in private key "
 			      "file \"%s\".  The permissions must be "
-			      "0600.", file_tmp));
+			      "0600 or 0640.", file_tmp));
         return SILC_CONFIG_ESILENT;
       }
     }