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

users

diff --git a/configure.ac b/configure.ac
index 669c4dd5a075422bf74b4795238dc888b2fe2e2a..69f2bc896e834a506e9763e2a331399d0f1476e5 100644 (file)
--- 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 5a59b314bd9d778ac9e7120072f73e5adc008236..017b81e7d2d19f6592a41d2b065ce25aea73c353 100644 (file)
--- 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 cd94b7c73630535471414184c70273199b2698e9..b62500a107ca0081f77a7d085e34025009a862e6 100644 (file)
--- 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
     ;;