Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

znc: drop unneeded root check patch

Browse source 
We don't run znc as root anymore, so no need to do the root check after
loading the config.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
This commit is contained in:
Jonas Gorski 2018-07-12 15:22:30 +02:00
parent cb202c0acb
commit a9051ca918
2 changed files with 1 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/znc/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=znc
PKG_VERSION:=1.7.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://znc.in/releases \

52
net/znc/patches/100-move_rootcheck_after_config.patch
View file

@ -1,52 +0,0 @@
diff --git a/src/main.cpp b/src/main.cpp
index 6ea10ec..0bf028b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -422,23 +422,6 @@ int main(int argc, char** argv) {
CUtils::PrintStatus(true, "");
}
- 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) {
- CZNC::DestroyInstance();
- 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)) {
CZNC::DestroyInstance();
@@ -460,6 +443,23 @@ 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) {
+ CZNC::DestroyInstance();
+ 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: " +