adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-06 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moved isRoot check to a place before the code for --makeconf.

Browse Source 
Keeps users from doing --makeconf as root and then wondering why
ZNC complains when they try to start it up.
--makepass and --makepem still work as root.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1988 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
cflakes
2010-05-15 18:00:34 +00:00
parent 26ea4a6cf8
commit 63762e7735
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.cpp
+13 -13
View File
@@ -185,6 +185,19 @@ int main(int argc, char** argv) {
return 0;
}
if (isRoot()) {
CUtils::PrintError("You are running ZNC as root! Don't do that! There are not many valid");
CUtils::PrintError("reasons for this and it can, in theory, cause great damage!");
if (!bAllowRoot) {
delete pZNC;
return 1;
}
CUtils::PrintError("You have been warned.");
CUtils::PrintError("Hit CTRL+C now if you don't want to run ZNC as root.");
CUtils::PrintError("ZNC will start in 30 seconds.");
sleep(30);
}
if (bMakeConf) {
if (!pZNC->WriteNewConfig(sConfig)) {
delete pZNC;
@@ -205,19 +218,6 @@ int main(int argc, char** argv) {
return 1;
}
if (isRoot()) {
CUtils::PrintError("You are running ZNC as root! Don't do that! There are not many valid");
CUtils::PrintError("reasons for this and it can, in theory, cause great damage!");
if (!bAllowRoot) {
delete pZNC;
return 1;
}
CUtils::PrintError("You have been warned.");
CUtils::PrintError("Hit CTRL+C now if you don't want to run ZNC as root.");
CUtils::PrintError("ZNC will start in 30 seconds.");
sleep(30);
}
if (bForeground) {
int iPid = getpid();
CUtils::PrintMessage("Staying open for debugging [pid: " + CString(iPid) + "]");