From: Lars Gustäbel <lars@gustaebel.de>
Date: Mon, 4 Oct 2010 15:37:53 +0000 (+0000)
Subject: Merged revisions 85211 via svnmerge from
X-Git-Tag: v2.7.1rc1~209
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6aab8d09b1d747d61945d3197335a99bd927b376;p=python

Merged revisions 85211 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85211 | lars.gustaebel | 2010-10-04 17:18:47 +0200 (Mon, 04 Oct 2010) | 14 lines

  Issue #9065: no longer use "root" as the default for the
  uname and gname field.

  If tarfile creates a new archive and adds a file with a
  uid/gid that doesn't have a corresponding name on the
  system (e.g. because the user/group account was deleted) it
  uses the empty string in the uname/gname field now instead
  of "root". Using "root" as the default was a bad idea
  because on extraction the uname/gname fields are supposed
  to override the uid/gid fields. So, all archive members
  with nameless uids/gids belonged to the root user after
  extraction.
........
---

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index a563ffb875..47be1d49df 100644
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -928,8 +928,8 @@ class TarInfo(object):
         self.chksum = 0         # header checksum
         self.type = REGTYPE     # member type
         self.linkname = ""      # link name
-        self.uname = "root"     # user name
-        self.gname = "root"     # group name
+        self.uname = ""         # user name
+        self.gname = ""         # group name
         self.devmajor = 0       # device major number
         self.devminor = 0       # device minor number
 
@@ -1112,8 +1112,8 @@ class TarInfo(object):
             info.get("type", REGTYPE),
             stn(info.get("linkname", ""), 100),
             stn(info.get("magic", POSIX_MAGIC), 8),
-            stn(info.get("uname", "root"), 32),
-            stn(info.get("gname", "root"), 32),
+            stn(info.get("uname", ""), 32),
+            stn(info.get("gname", ""), 32),
             itn(info.get("devmajor", 0), 8, format),
             itn(info.get("devminor", 0), 8, format),
             stn(info.get("prefix", ""), 155)
diff --git a/Misc/NEWS b/Misc/NEWS
index ea9c5024c8..acdccd1b0d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -50,6 +50,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #9065: tarfile no longer uses "root" as the default for the uname and
+  gname field.
+
 - Issue #1050268: parseaddr now correctly quotes double quote and backslash
   characters that appear inside quoted strings in email addresses.