Rebase call-setgroups patch

epel9
Dan Vrátil 10 years ago
parent e1a3a73de7
commit 86fc6790e5

@ -1,8 +1,8 @@
diff --git a/kwrited.cpp b/kwrited.cpp diff --git a/kwrited.cpp b/kwrited.cpp
index a4dac6b..1eaef2a 100644 index 2b73e36..27b309e 100644
--- a/kwrited.cpp --- a/kwrited.cpp
+++ b/kwrited.cpp +++ b/kwrited.cpp
@@ -34,11 +34,13 @@ @@ -35,6 +35,7 @@
# include <signal.h> # include <signal.h>
# include <sys/types.h> # include <sys/types.h>
# include <unistd.h> # include <unistd.h>
@ -10,13 +10,7 @@ index a4dac6b..1eaef2a 100644
#else #else
# include <kpluginfactory.h> # include <kpluginfactory.h>
# include <kpluginloader.h> # include <kpluginloader.h>
#endif @@ -61,6 +62,7 @@ int main(int argc, char **argv)
+
static inline KAboutData aboutData()
{
return KAboutData("kwrited", i18n("kwrited"), PROJECT_VERSION);
@@ -60,6 +62,7 @@ int main(int argc, char **argv)
//drop elevated privileges temporarily //drop elevated privileges temporarily
original_euid = geteuid(); original_euid = geteuid();
original_egid = getegid(); original_egid = getegid();
@ -24,7 +18,7 @@ index a4dac6b..1eaef2a 100644
seteuid(getuid()); seteuid(getuid());
setegid(getgid()); setegid(getgid());
@@ -111,6 +114,7 @@ KWrited::KWrited() : QObject() @@ -119,6 +121,7 @@ KWrited::KWrited() : QObject()
#if defined(BUILD_AS_EXECUTABLE) #if defined(BUILD_AS_EXECUTABLE)
//drop privileges again //drop privileges again
@ -32,7 +26,7 @@ index a4dac6b..1eaef2a 100644
seteuid(getuid()); seteuid(getuid());
setegid(getgid()); setegid(getgid());
#endif #endif
@@ -131,6 +135,7 @@ KWrited::~KWrited() @@ -139,6 +142,7 @@ KWrited::~KWrited()
#if defined(BUILD_AS_EXECUTABLE) #if defined(BUILD_AS_EXECUTABLE)
//drop privileges again //drop privileges again
@ -40,10 +34,3 @@ index a4dac6b..1eaef2a 100644
seteuid(getuid()); seteuid(getuid());
setegid(getgid()); setegid(getgid());
#endif #endif
@@ -156,4 +161,4 @@ void KWrited::block_in()
#if !defined(BUILD_AS_EXECUTABLE)
#include "kwrited.moc"
-#endif
\ No newline at end of file
+#endif

Loading…
Cancel
Save