- cleaner version of the hardlink basic suid protection. actually check that the...

svn path=/main/trunk/; revision=6579

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 986516e259ea48bd6dbfb7672347602ac24b0b0a..448df94df0b8d634f1edefecf1e4904469f5daf1 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1211,11 +1211,12 @@ class dblink(object):
                                                writemsg_stdout("--- !md5   %s %s\n" % ("obj", obj))
                                                continue
                                        try:
-                                               if statobj.st_nlink > 1:
-                                                       portage.writemsg("There are "+str(st.st_nlink-1)+ \
-                                                               " hardlinks to '%s'\n" % obj)
-                                               # Always blind chmod 0 before unlinking to avoid race conditions.
-                                               os.chmod(obj, 0000)
+                                               if statobj.st_mode & S_ISUID or statobj.st_mode & S_ISGID:
+                                                       # Always blind chmod 0 before unlinking to avoid race conditions.
+                                                       os.chmod(obj, 0000)
+                                                       if statobj.st_nlink > 1:
+                                                               portage.writemsg("setXid: "+str(st.st_nlink-1)+ \
+                                                                       " hardlinks to '%s'\n" % obj)
                                                os.unlink(obj)
                                        except (OSError, IOError), e:
                                                pass