Set default "tar" umask to 002 and owner.group to root.root

In order to make the generated tar files more friendly to users who
extract them as root using GNU tar and its implied -p option, change
the default umask to 002 and change the owner name and group name to
root.  This ensures that a) the extracted files and directories are
not world-writable and b) that they belong to user and group root.

Before they would have been assigned to a user and/or group named
git if it existed.  This also answers the question in the removed
comment: uid=0, gid=0, uname=root, gname=root is exactly what we
want.

Normal users who let tar apply their umask while extracting are
only affected if their umask allowed the world to change their
files (e.g. a umask of zero).  This case is so unlikely and strange
that we don't need to support it.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/archive-tar.c b/archive-tar.c
index af47fdc95572bfa67b9c67369222a69c32ddea02..7d52a061f4f8b5d29c52912889ca0d6ee46e4ee0 100644 (file)
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -15,7 +15,7 @@ static char block[BLOCKSIZE];
 static unsigned long offset;
 
 static time_t archive_time;
 static unsigned long offset;
 
 static time_t archive_time;

-static int tar_umask;
+static int tar_umask = 002;

 static int verbose;
 
 /* writes out the whole block, but only if it is full */
 static int verbose;
 
 /* writes out the whole block, but only if it is full */


@@ -210,11 +210,10 @@ static void write_entry(const unsigned char *sha1, struct strbuf *path,
        sprintf(header.size, "%011lo", S_ISREG(mode) ? size : 0);
        sprintf(header.mtime, "%011lo", archive_time);
 
        sprintf(header.size, "%011lo", S_ISREG(mode) ? size : 0);
        sprintf(header.mtime, "%011lo", archive_time);
 

-       /* XXX: should we provide more meaningful info here? */

        sprintf(header.uid, "%07o", 0);
        sprintf(header.gid, "%07o", 0);
        sprintf(header.uid, "%07o", 0);
        sprintf(header.gid, "%07o", 0);

-       strlcpy(header.uname, "git", sizeof(header.uname));
-       strlcpy(header.gname, "git", sizeof(header.gname));
+       strlcpy(header.uname, "root", sizeof(header.uname));
+       strlcpy(header.gname, "root", sizeof(header.gname));

        sprintf(header.devmajor, "%07o", 0);
        sprintf(header.devminor, "%07o", 0);
 
        sprintf(header.devmajor, "%07o", 0);
        sprintf(header.devminor, "%07o", 0);