- fix sysctl location

[packages/util-vserver.git] / util-vserver-rpm-fake-resolver-badperm-errorlogging.patch

diff --git a/util-vserver-rpm-fake-resolver-badperm-errorlogging.patch b/util-vserver-rpm-fake-resolver-badperm-errorlogging.patch
index a499624c03b598dab9a2996c77e182db6f178773..e82832cd3e0861852f358c45c3a727f592f95b34 100644 (file)
--- a/util-vserver-rpm-fake-resolver-badperm-errorlogging.patch
+++ b/util-vserver-rpm-fake-resolver-badperm-errorlogging.patch
@@ -17,29 +17,17 @@ 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 @@
-     if (EreadAll(0, buf, len)) {
-       buf[len] = '\0';
-       res = getpwnam(buf);
-+      if (!res) {
-+        WRITE_MSG(2, ENSC_WRAPPERS_PREFIX "getpwnam(): ");
-+        WRITE_STR(2, strerror(errno));
-+        WRITE_MSG(2, "\n");
-+        exit(1);
-+      }
-     }
-     
-     if (res!=0) sendResult(true,  res->pw_uid);
-@@ -182,6 +188,12 @@
-     if (EreadAll(0, buf, len)) {
-       buf[len] = '\0';
-       res = getgrnam(buf);
-+      if (!res) {
-+        WRITE_MSG(2, ENSC_WRAPPERS_PREFIX "getgrnam(): ");
-+        WRITE_STR(2, strerror(errno));
-+        WRITE_MSG(2, "\n");
-+        exit(1);
-+      }
-     }
-     
-     if (res!=0) sendResult(true,  res->gr_gid);
+@@ -300,6 +300,10 @@
+   if (args.chroot) Echroot(args.chroot);
+   Echdir("/");
+ 
++  if (access("/", X_OK) == -1) {
++        WRITE_MSG(2, "***  root directory is not accessible for specified uid. rpm-fake-resolver will most likely fail.\n");
++  }
++        
+   activateContext(args.ctx, args.in_ctx, args.caps, args.flags);
+   Esetgroups(0, &args.gid);
+   Esetgid(args.gid);
+   Echdir("/");
+ 
+