This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch master
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=41bc12bd8d518653aa4564d22fea675717391798

commit 41bc12bd8d518653aa4564d22fea675717391798
Author: Guillem Jover <[email protected]>
AuthorDate: Fri Feb 1 03:57:54 2019 +0100

    dpkg: Clarify error on unknown system user/group in statoverride database
    
    Closes: #920880
---
 debian/changelog            |  2 ++
 lib/dpkg/db-fsys-override.c | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8134a20a5..3d844527b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ dpkg (1.19.5) UNRELEASED; urgency=medium
     --force-all for now.
   * dpkg, dpkg-statoverride: Add new option --refuse-security-mac to control
     SELinux. See #811037.
+  * dpkg: Clarify error on unknown system user/group in statoverride database.
+    Closes: #920880
   * Documentation:
     - start-stop-daemon(1): Document behavior of --pidfile security checks.
       Closes: #921557
diff --git a/lib/dpkg/db-fsys-override.c b/lib/dpkg/db-fsys-override.c
index 981bd1891..e079c5ffb 100644
--- a/lib/dpkg/db-fsys-override.c
+++ b/lib/dpkg/db-fsys-override.c
@@ -208,8 +208,9 @@ ensure_statoverrides(enum statdb_parse_flags flags)
                        fso->uname = NULL;
 
                if (fso->uid == (uid_t)-1 && !(flags & STATDB_PARSE_LAX))
-                       ohshit(_("unknown user '%s' in statoverride file"),
-                              thisline);
+                       ohshit(_("unknown system user '%s' in statoverride 
file; the system user got removed\n"
+                                "before the override, which is most probably a 
packaging bug, to recover you\n"
+                                "can remove the override manually with %s"), 
thisline, DPKGSTAT);
 
                /* Move to the next bit */
                thisline = ptr + 1;
@@ -229,8 +230,9 @@ ensure_statoverrides(enum statdb_parse_flags flags)
                        fso->gname = NULL;
 
                if (fso->gid == (gid_t)-1 && !(flags & STATDB_PARSE_LAX))
-                       ohshit(_("unknown group '%s' in statoverride file"),
-                              thisline);
+                       ohshit(_("unknown system group '%s' in statoverride 
file; the system group got removed\n"
+                                "before the override, which is most probably a 
packaging bug, to recover you\n"
+                                "can remove the override manually with %s"), 
thisline, DPKGSTAT);
 
                /* Move to the next bit */
                thisline = ptr + 1;

-- 
Dpkg.Org's dpkg

Reply via email to