X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funlinkdir.c;h=f991a2fc41254de526803329be96b9cd965c8dac;hb=7a719c1772d45a9990560820a78ae76534ae3497;hp=12e669e752bfd7c0da80cace0d4a5bac7a2d4543;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git
diff --git a/lib/unlinkdir.c b/lib/unlinkdir.c
index 12e669e75..f991a2fc4 100644
--- a/lib/unlinkdir.c
+++ b/lib/unlinkdir.c
@@ -1,6 +1,6 @@
-/* unlinkdir.c - determine (and maybe change) whether we can unlink directories
+/* unlinkdir.c - determine whether we can unlink directories
- Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2009-2012 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
@@ -15,22 +15,18 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
-/* Written by Paul Eggert and Jim Meyering. */
+/* Written by Paul Eggert, Jim Meyering, and David Bartley. */
#include
#include "unlinkdir.h"
-
-#if HAVE_PRIV_H
-# include
-#endif
+#include "priv-set.h"
#include
#if ! UNLINK_CANNOT_UNLINK_DIR
/* Return true if we cannot unlink directories, false if we might be
- able to unlink directories. If possible, tell the kernel we don't
- want to be able to unlink directories, so that we can return true. */
+ able to unlink directories. */
bool
cannot_unlink_dir (void)
@@ -40,20 +36,11 @@ cannot_unlink_dir (void)
if (! initialized)
{
-# if defined PRIV_EFFECTIVE && defined PRIV_SYS_LINKDIR
+# if defined PRIV_SYS_LINKDIR
/* We might be able to unlink directories if we cannot
- determine our privileges, or if we have the
- PRIV_SYS_LINKDIR privilege and cannot delete it. */
- priv_set_t *pset = priv_allocset ();
- if (pset)
- {
- cannot =
- (getppriv (PRIV_EFFECTIVE, pset) == 0
- && (! priv_ismember (pset, PRIV_SYS_LINKDIR)
- || (priv_delset (pset, PRIV_SYS_LINKDIR) == 0
- && setppriv (PRIV_SET, PRIV_EFFECTIVE, pset) == 0)));
- priv_freeset (pset);
- }
+ determine our privileges, or if we have the
+ PRIV_SYS_LINKDIR privilege. */
+ cannot = (priv_set_ismember (PRIV_SYS_LINKDIR) == 0);
# else
/* In traditional Unix, only root can unlink directories. */
cannot = (geteuid () != 0);