diff options
| author | Peter Powell <petpow@saberuk.com> | 2019-12-08 23:08:57 +0000 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2019-12-08 23:08:57 +0000 |
| commit | cca482b0061d43818e176c427616b0f6a4a86387 (patch) | |
| tree | 747163c6cb3e2ec6ea5f93e68a65b8936aa143f5 /include | |
| parent | bd20bdda21a242f0a54da327bf08049562078a9b (diff) | |
Improve behaviour when running as root.
- Only give the annoying message about root if --runasroot is not
specified.
- If --runasroot is specified then assume the user knows what they
are doing.
- Move CheckRoot to a static function in inspircd.cpp.
Diffstat (limited to 'include')
| -rw-r--r-- | include/exitcodes.h | 2 | ||||
| -rw-r--r-- | include/inspircd.h | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/exitcodes.h b/include/exitcodes.h index b1090d141..737433def 100644 --- a/include/exitcodes.h +++ b/include/exitcodes.h @@ -33,7 +33,7 @@ enum ExitStatus EXIT_STATUS_ARGV = 5, /* Invalid program arguments */ EXIT_STATUS_PID = 6, /* Couldn't write PID file */ EXIT_STATUS_SOCKETENGINE = 7, /* Couldn't start socket engine */ - EXIT_STATUS_ROOT = 8, /* Refusing to start as root */ + EXIT_STATUS_ROOT = 8, /* DEPRECATED */ EXIT_STATUS_MODULE = 9, /* Couldn't load a required module */ EXIT_STATUS_SIGTERM = 10 /* Received SIGTERM */ }; diff --git a/include/inspircd.h b/include/inspircd.h index 56ad556d7..f3e718dcc 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -192,11 +192,6 @@ class CoreExport InspIRCd ClientProtocol::RFCEvents rfcevents; - /** Check we aren't running as root, and exit if we are - * with exit code EXIT_STATUS_ROOT. - */ - void CheckRoot(); - public: UIDGenerator UIDGen; |