X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fwrite-any-file.c;h=2a26b2fab4b889df3f23f78afaf6726e7df502d5;hb=6f730e7ae5225bf9eb36554d94805b97a72784bd;hp=19ab99efd8f890a6106f2aa03ee4ceb6d6186f62;hpb=07784ae4244d8b09651185f26699c213ac693b8d;p=gnulib.git

diff --git a/lib/write-any-file.c b/lib/write-any-file.c
index 19ab99efd..2a26b2fab 100644
--- a/lib/write-any-file.c
+++ b/lib/write-any-file.c
@@ -1,11 +1,11 @@
 /* Determine whether we can write any file.
 
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,18 +13,15 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
 #include <config.h>
 
 #include "write-any-file.h"
+#include "priv-set.h"
 
-#if HAVE_PRIV_H
-# include <priv.h>
-#endif
 #include <unistd.h>
 
 /* Return true if we know that we can write any file, including
@@ -39,15 +36,8 @@ can_write_any_file (void)
   if (! initialized)
     {
       bool can = false;
-#if defined PRIV_EFFECTIVE && defined PRIV_FILE_DAC_WRITE
-      priv_set_t *pset = priv_allocset ();
-      if (pset)
-	{
-	  can =
-	    (getppriv (PRIV_EFFECTIVE, pset) == 0
-	     && priv_ismember (pset, PRIV_FILE_DAC_WRITE));
-	  priv_freeset (pset);
-	}
+#if defined PRIV_FILE_DAC_WRITE
+      can = (priv_set_ismember (PRIV_FILE_DAC_WRITE) == 1);
 #else
       /* In traditional Unix, only root can unlink directories.  */
       can = (geteuid () == 0);