Bläddra i källkod

Merge branch 'master' into next

* master:
  Disallow running as root
Bryan Drewery 14 år sedan
förälder
incheckning
7247ee1cb5
2 ändrade filer med 6 tillägg och 0 borttagningar
  1. 1 0
      doc/UPDATES
  2. 5 0
      src/main.c

+ 1 - 0
doc/UPDATES

@@ -6,6 +6,7 @@ next
 maint
   * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
   * Remove 'chanset +meankicks'. You can customize your kicks in doc/responses.txt and recompile.
+  * Don't allow running as root
 
 1.4.0 - http://wraith.botpack.net/milestone/1.4.0
   * Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.

+ 5 - 0
src/main.c

@@ -716,6 +716,11 @@ int main(int argc, char **argv)
   mypid = getpid();
   myuid = geteuid();
 
+  if (myuid == 0 || getuid() == 0) {
+    fprintf(stderr, "Don't run as root.\n");
+    return 1;
+  }
+
   srandom(now % (mypid + getppid()) * randint(1000));
 
   setlimits();