From: Pekka Riikonen <priikone@silcnet.org>
Date: Sun, 11 Feb 2001 16:35:24 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: SILC.0.1~254
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=1792a17447ac300ba5ffd27919d03afe1e173b87;p=silc.git

	updates.
---

diff --git a/apps/silcd/server.c b/apps/silcd/server.c
index 34cf7d97..c2efb186 100644
--- a/apps/silcd/server.c
+++ b/apps/silcd/server.c
@@ -357,41 +357,44 @@ void silc_server_daemonise(SilcServer server)
 {
   /* Are we executing silcd as root or a regular user? */
   if (geteuid()==0) {
-
-     struct passwd *pw;
-     struct group *gr;
-     char *user, *group;
-
-     if (!server->config->identity->user || 
-         !server->config->identity->group) {
-       SILC_LOG_DEBUG(("User and/or group not set"));
-       fprintf(stderr, "User and/or group not set, exiting\n");
-       exit(1);
-     }
-
-     /* Get the values given for user and group in configuration file */
-     user=server->config->identity->user;
-     group=server->config->identity->group;
-
-     /* Check whether the user/group information is text */ 
-     if (atoi(user)!=0 || atoi(group)!=0) {
-       SILC_LOG_DEBUG(("Invalid user and/or group information"));
-       SILC_LOG_DEBUG(("User and/or group given as number"));
-       fprintf(stderr, "Invalid user and/or group information\n");
-       fprintf(stderr, "Please assign them as names, not numbers\n");
-       exit(1);
-     }
-
-     /* Catch the nasty incident of string "0" returning 0 from atoi */
-     if (strcmp("0", user)==0 || strcmp("0", group)==0) {
-       SILC_LOG_DEBUG(("User and/or group configured to 0. Unacceptable"));
-       fprintf(stderr, "User and/or group configured to 0. Exiting\n");
-       exit(1);
-     }
-
-     pw=getpwnam(user);
-     gr=getgrnam(group);
-
+    
+    struct passwd *pw;
+    struct group *gr;
+    char *user, *group;
+    
+    if (!server->config->identity->user || 
+	!server->config->identity->group) {
+      fprintf(stderr, "Error:"
+       "\tSILC server must not be run as root.  For the security of your\n"
+       "\tsystem it is strongly suggested that you run SILC tunder dedicated\n"
+       "\tuser account.  Modify the [Identity] configuration section to run\n"
+       "\tthe server as non-root user.\n");
+      exit(1);
+    }
+    
+    /* Get the values given for user and group in configuration file */
+    user=server->config->identity->user;
+    group=server->config->identity->group;
+    
+    /* Check whether the user/group information is text */ 
+    if (atoi(user)!=0 || atoi(group)!=0) {
+      SILC_LOG_DEBUG(("Invalid user and/or group information"));
+      SILC_LOG_DEBUG(("User and/or group given as number"));
+      fprintf(stderr, "Invalid user and/or group information\n");
+      fprintf(stderr, "Please assign them as names, not numbers\n");
+      exit(1);
+    }
+    
+    /* Catch the nasty incident of string "0" returning 0 from atoi */
+    if (strcmp("0", user)==0 || strcmp("0", group)==0) {
+      SILC_LOG_DEBUG(("User and/or group configured to 0. Unacceptable"));
+      fprintf(stderr, "User and/or group configured to 0. Exiting\n");
+      exit(1);
+    }
+    
+    pw=getpwnam(user);
+    gr=getgrnam(group);
+    
     /* Check whether user and/or group is set to root. If yes, exit
        immediately. Otherwise, setgid and setuid server to user.group */
     if (gr->gr_gid==0 || pw->pw_uid==0) {
@@ -406,8 +409,8 @@ void silc_server_daemonise(SilcServer server)
         exit(0);
       } 
       setsid();
-   
-       SILC_LOG_DEBUG(("Changing to group %s", group));
+      
+      SILC_LOG_DEBUG(("Changing to group %s", group));
       if(setgid(gr->gr_gid)==0) {
         SILC_LOG_DEBUG(("Setgid to %s", group));
       } else {
@@ -437,7 +440,6 @@ void silc_server_daemonise(SilcServer server)
   }
 }
 
-
 /* Stops the SILC server. This function is used to shutdown the server. 
    This is usually called after the scheduler has returned. After stopping 
    the server one should call silc_server_free. */