X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmkdir-p.c;h=6f71ec84d5660288f14fe223a4c13bb29c631aa8;hb=c68c756f05b4d51ffa5a12b391ff996990deee14;hp=19b962bf0fc9fa3a66581c728e3b853390c72a23;hpb=76cfe20c721a2dcefaabf27de32082458b51b281;p=gnulib.git

diff --git a/lib/mkdir-p.c b/lib/mkdir-p.c
index 19b962bf0..6f71ec84d 100644
--- a/lib/mkdir-p.c
+++ b/lib/mkdir-p.c
@@ -1,7 +1,7 @@
 /* mkdir-p.c -- Ensure that a directory and its parents exist.
 
-   Copyright (C) 1990, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005,
+   2006, 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -115,18 +115,33 @@ make_dir_parents (char *dir,
 
       if (0 <= prefix_len)
 	{
-	  if (mkdir (dir + prefix_len, mode) == 0)
+	  /* If the ownership might change, or if the directory will be
+	     writeable to other users and its special mode bits may
+	     change after the directory is created, create it with
+	     more restrictive permissions at first, so unauthorized
+	     users cannot nip in before the directory is ready.  */
+	  bool keep_owner = owner == (uid_t) -1 && group == (gid_t) -1;
+	  bool keep_special_mode_bits =
+	    ((mode_bits & (S_ISUID | S_ISGID)) | (mode & S_ISVTX)) == 0;
+	  mode_t mkdir_mode = mode;
+	  if (! keep_owner)
+	    mkdir_mode &= ~ (S_IRWXG | S_IRWXO);
+	  else if (! keep_special_mode_bits)
+	    mkdir_mode &= ~ (S_IWGRP | S_IWOTH);
+
+	  if (mkdir (dir + prefix_len, mkdir_mode) == 0)
 	    {
 	      announce (dir, options);
-	      preserve_existing =
-		(owner == (uid_t) -1 && group == (gid_t) -1
-		 && ! ((mode_bits & (S_ISUID | S_ISGID)) | (mode & S_ISVTX)));
+	      preserve_existing = keep_owner & keep_special_mode_bits;
 	      savewd_chdir_options |=
 		(SAVEWD_CHDIR_NOFOLLOW
 		 | (mode & S_IRUSR ? SAVEWD_CHDIR_READABLE : 0));
 	    }
 	  else
-	    mkdir_errno = errno;
+	    {
+	      mkdir_errno = errno;
+	      mkdir_mode = -1;
+	    }
 
 	  if (preserve_existing)
 	    {
@@ -163,7 +178,6 @@ make_dir_parents (char *dir,
 		    }
 		  else
 		    {
-		      mode_t mkdir_mode = (mkdir_errno == 0 ? mode : -1);
 		      char const *subdir = (chdir_ok ? "." : dir + prefix_len);
 		      if (dirchownmod (fd, subdir, mkdir_mode, owner, group,
 				       mode, mode_bits)
@@ -179,7 +193,7 @@ make_dir_parents (char *dir,
 			     (! chdir_failed_unexpectedly ? errno
 			      : ! chdir_ok && (mode & S_IXUSR) ? chdir_errno
 			      : open_result[1]),
-			     _(owner == (uid_t) -1 && group == (gid_t) -1
+			     _(keep_owner
 			       ? "cannot change permissions of %s"
 			       : "cannot change owner and permissions of %s"),
 			     quote (dir));