From: Vincent Bernat <bernat@luffy.cx>
Date: Sat, 5 Mar 2011 06:32:24 +0000 (+0100)
Subject: Allow root to change configuration of lldpd when lldpctl has suid set
X-Git-Tag: 0.5.4~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05eacc7ad702a10d9908d04d32d77c06bab9259b;p=thirdparty%2Flldpd.git

Allow root to change configuration of lldpd when lldpctl has suid set

The previous check made lldpctl fails even when the user was root.
---

diff --git a/CHANGELOG b/CHANGELOG
index a142b13a..57e7a967 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+lldpd (0.5.3)
+  * Fixes:
+    + Allow root to change configuration of lldpd when lldpctl has suid set.
+
 lldpd (0.5.2)
   * Features:
     + More flexible smart mode and new default. Manual page has been updated.
diff --git a/src/lldpctl.c b/src/lldpctl.c
index c2bb2b56..49b490ce 100644
--- a/src/lldpctl.c
+++ b/src/lldpctl.c
@@ -671,7 +671,7 @@ main(int argc, char *argv[])
 
 	log_init(debug, __progname);
 
-	if ( ( action != 0 ) && ( getuid() != geteuid() ) ) {
+	if ((action != 0) && (getuid() != 0)) {
 		fatalx("mere mortals may not do that, 'root' privileges are required.");
 	}