From: Elan Ruusamäe <glen@pld-linux.org>
Date: Fri, 16 Jun 2006 07:03:41 +0000 (+0000)
Subject: - use errno check as it's more reliable
X-Git-Tag: auto/ac/util-vserver-0_30_212-10~4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Futil-vserver.git;a=commitdiff_plain;h=e884357932f29e6e488be196d47d4b3f195e69c2

- use errno check as it's more reliable

Changed files:
    util-vserver-rpm-fake-resolver-badperm-errorlogging.patch -> 1.2
---

diff --git a/util-vserver-rpm-fake-resolver-badperm-errorlogging.patch b/util-vserver-rpm-fake-resolver-badperm-errorlogging.patch
index a499624..7f28483 100644
--- a/util-vserver-rpm-fake-resolver-badperm-errorlogging.patch
+++ b/util-vserver-rpm-fake-resolver-badperm-errorlogging.patch
@@ -17,11 +17,12 @@ real fix would be 'chmod 755 /vservers/test' if you just knew that is the proble
 
 --- util-vserver-0.30.210/src/rpm-fake-resolver.c~	2006-06-16 03:22:36.000000000 +0300
 +++ util-vserver-0.30.210/src/rpm-fake-resolver.c	2006-06-16 03:22:40.000000000 +0300
-@@ -161,6 +161,12 @@
+@@ -161,6 +161,13 @@
      if (EreadAll(0, buf, len)) {
        buf[len] = '\0';
++      errno = 0;
        res = getpwnam(buf);
-+      if (!res) {
++      if (errno) {
 +        WRITE_MSG(2, ENSC_WRAPPERS_PREFIX "getpwnam(): ");
 +        WRITE_STR(2, strerror(errno));
 +        WRITE_MSG(2, "\n");
@@ -30,11 +31,12 @@ real fix would be 'chmod 755 /vservers/test' if you just knew that is the proble
      }
      
      if (res!=0) sendResult(true,  res->pw_uid);
-@@ -182,6 +188,12 @@
+@@ -182,6 +189,13 @@
      if (EreadAll(0, buf, len)) {
        buf[len] = '\0';
++      errno = 0;
        res = getgrnam(buf);
-+      if (!res) {
++      if (errno) {
 +        WRITE_MSG(2, ENSC_WRAPPERS_PREFIX "getgrnam(): ");
 +        WRITE_STR(2, strerror(errno));
 +        WRITE_MSG(2, "\n");