[kwrited/f22] Rebase call-setgroups patch
Daniel Vrátil
dvratil at fedoraproject.org
Tue Feb 24 11:49:23 UTC 2015
commit 86fc6790e5aa25ab5b2b99302d4b1a0066a6c238
Author: Dan Vrátil <dvratil at redhat.com>
Date: Tue Feb 24 12:49:01 2015 +0100
Rebase call-setgroups patch
kwrited-call-setgroups.patch | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
---
diff --git a/kwrited-call-setgroups.patch b/kwrited-call-setgroups.patch
index d01a065..099a152 100644
--- a/kwrited-call-setgroups.patch
+++ b/kwrited-call-setgroups.patch
@@ -1,8 +1,8 @@
diff --git a/kwrited.cpp b/kwrited.cpp
-index a4dac6b..1eaef2a 100644
+index 2b73e36..27b309e 100644
--- a/kwrited.cpp
+++ b/kwrited.cpp
-@@ -34,11 +34,13 @@
+@@ -35,6 +35,7 @@
# include <signal.h>
# include <sys/types.h>
# include <unistd.h>
@@ -10,13 +10,7 @@ index a4dac6b..1eaef2a 100644
#else
# include <kpluginfactory.h>
# include <kpluginloader.h>
- #endif
-
-+
- static inline KAboutData aboutData()
- {
- return KAboutData("kwrited", i18n("kwrited"), PROJECT_VERSION);
-@@ -60,6 +62,7 @@ int main(int argc, char **argv)
+@@ -61,6 +62,7 @@ int main(int argc, char **argv)
//drop elevated privileges temporarily
original_euid = geteuid();
original_egid = getegid();
@@ -24,7 +18,7 @@ index a4dac6b..1eaef2a 100644
seteuid(getuid());
setegid(getgid());
-@@ -111,6 +114,7 @@ KWrited::KWrited() : QObject()
+@@ -119,6 +121,7 @@ KWrited::KWrited() : QObject()
#if defined(BUILD_AS_EXECUTABLE)
//drop privileges again
@@ -32,7 +26,7 @@ index a4dac6b..1eaef2a 100644
seteuid(getuid());
setegid(getgid());
#endif
-@@ -131,6 +135,7 @@ KWrited::~KWrited()
+@@ -139,6 +142,7 @@ KWrited::~KWrited()
#if defined(BUILD_AS_EXECUTABLE)
//drop privileges again
@@ -40,10 +34,3 @@ index a4dac6b..1eaef2a 100644
seteuid(getuid());
setegid(getgid());
#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
More information about the scm-commits
mailing list