NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...

[gnulib.git] / lib / write-any-file.c

diff --git a/lib/write-any-file.c b/lib/write-any-file.c
index 8492ac8..1cd0b79 100644 (file)
--- a/lib/write-any-file.c
+++ b/lib/write-any-file.c
@@ -1,6 +1,6 @@
 /* Determine whether we can write any file.
 
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2014 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
@@ -20,10 +20,9 @@
 #include <config.h>
 
 #include "write-any-file.h"
+#include "priv-set.h"
+#include "root-uid.h"
 
-#if HAVE_PRIV_H
-# include <priv.h>
-#endif
 #include <unistd.h>
 
 /* Return true if we know that we can write any file, including
@@ -38,18 +37,11 @@ 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);
+      can = (geteuid () == ROOT_UID);
 #endif
       can_write = can;
       initialized = true;