From: Vincent Bernat <bernat@luffy.cx>
Date: Sat, 15 Nov 2008 07:52:01 +0000 (+0100)
Subject: Use _lldpd instead of lldpd for username to avoid collision with real
X-Git-Tag: 0.2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6629befa876131ca802fb989ed6e4e614d6b9663;p=thirdparty%2Flldpd.git

Use _lldpd instead of lldpd for username to avoid collision with real
users
---

diff --git a/configure.ac b/configure.ac
index 669c4dd5..69f2bc89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,12 +26,12 @@ AC_ARG_WITH(privsep-user,
 	AC_HELP_STRING([--with-privsep-user],
 		       [Which user to use for privilege separation]),
 	AC_DEFINE_UNQUOTED([PRIVSEP_USER], "$withval", [User for privilege separation]),
-	AC_DEFINE_UNQUOTED([PRIVSEP_USER], "lldpd", [User for privilege separation]))
+	AC_DEFINE_UNQUOTED([PRIVSEP_USER], "_lldpd", [User for privilege separation]))
 AC_ARG_WITH(privsep-group,
 	AC_HELP_STRING([--with-privsep-group],
 		       [Which group to use for privilege separation]),
 	AC_DEFINE_UNQUOTED([PRIVSEP_GROUP], "$withval", [Group for privilege separation]),
-	AC_DEFINE_UNQUOTED([PRIVSEP_GROUP], "lldpd", [Group for privilege separation]))
+	AC_DEFINE_UNQUOTED([PRIVSEP_GROUP], "_lldpd", [Group for privilege separation]))
 AC_ARG_WITH(privsep-chroot,
 	AC_HELP_STRING([--with-privsep-chroot],
 		       [Which directory to use to chroot lldpd]),
diff --git a/debian/postinst b/debian/postinst
index 5a59b314..017b81e7 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -5,7 +5,7 @@ if ! ([ "$1" = "configure" ] || [ "$1" = "reconfigure" ]); then
 fi
 
 adduser --system --disabled-password --disabled-login --home /var/run/lldpd \
-       	--no-create-home --quiet --group lldpd
+       	--no-create-home --quiet --group _lldpd
 [ -d /var/run/lldpd ] || mkdir -p /var/run/lldpd
 
 #DEBHELPER#
diff --git a/debian/postrm b/debian/postrm
index cd94b7c7..b62500a1 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -4,8 +4,8 @@
 
 case "$1" in
     purge)
-        deluser --system lldpd || true
-        delgroup --system lldpd || true
+        deluser --system _lldpd || true
+        delgroup --system _lldpd || true
 
         rm -rf /var/run/lldpd
     ;;