Fix uid/euid usage

diff --git a/zypp/PathInfo.cc b/zypp/PathInfo.cc
index e79e12b..3b9e570 100644 (file)
--- a/zypp/PathInfo.cc
+++ b/zypp/PathInfo.cc
@@ -226,9 +226,9 @@ namespace zypp
     {
       if ( !isExist() )
         return 0;
-      if ( owner() == getuid() ) {
+      if ( owner() == geteuid() ) {
         return( uperm()/0100 );
-      } else if ( group() == getgid() ) {
+      } else if ( group() == getegid() ) {
         return( gperm()/010 );
       }
       return operm();

diff --git a/zypp/media/CurlConfig.cc b/zypp/media/CurlConfig.cc
index 1c59d1a..5f0e2ad 100644 (file)
--- a/zypp/media/CurlConfig.cc
+++ b/zypp/media/CurlConfig.cc
@@ -38,8 +38,8 @@ namespace zypp
     PathInfo h_info(curlrcFile.dirname(), PathInfo::LSTAT);
     PathInfo c_info(curlrcFile,           PathInfo::LSTAT);
 
-    if( h_info.isDir()  && h_info.owner() == getuid() &&
-        c_info.isFile() && c_info.owner() == getuid())
+    if( h_info.isDir()  && h_info.userMayRX() &&
+        c_info.isFile() && c_info.userMayR() )
     {
       MIL << "Going to parse " << curlrcFile << endl;
     }

diff --git a/zypp/media/MediaHandler.cc b/zypp/media/MediaHandler.cc
index 622473c..d634c73 100644 (file)
--- a/zypp/media/MediaHandler.cc
+++ b/zypp/media/MediaHandler.cc
@@ -385,7 +385,7 @@ MediaHandler::createAttachPoint(const Pathname &attach_root) const
   }
 
   PathInfo adir( attach_root );
-  if( !adir.isDir() || (getuid() != 0 && !adir.userMayRWX())) {
+  if( !adir.isDir() || (geteuid() != 0 && !adir.userMayRWX())) {
     DBG << "Create attach point: attach root is not a writable directory: '"
         << attach_root << "'" << std::endl;
     return apoint;