Merge branch 'dfsg-orig' into dfsg-debian

[tar] / gnu / priv-set.c

diff --git a/gnu/priv-set.c b/gnu/priv-set.c
index e9f8fb24f3993b484c11a682c2356be917167012..6d98a97232f0a34344936b3294bd485219efb557 100644 (file)
--- a/gnu/priv-set.c
+++ b/gnu/priv-set.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #include "priv-set.h"
 
-#if HAVE_GETPPRIV
+#if HAVE_GETPPRIV && HAVE_PRIV_H
 
 # include <errno.h>
 # include <stdbool.h>
@@ -80,7 +80,7 @@ priv_set_ismember (const char *priv)
 
 
 /* Try to remove priv from the effective set.
-   Returns 0 if priv was removed from or was not present in the effective set.
+   Returns 0 if priv was removed.
    Returns -1 on error with errno set appropriately.  */
 int
 priv_set_remove (const char *priv)
@@ -111,9 +111,8 @@ priv_set_remove (const char *priv)
 
 
 /* Try to restore priv to the effective set.
-   Returns 0 if priv was re-added to the effective set (after being prviously
-   removed by a call to priv_set_remove) or if priv was already in the
-   effective set.
+   Returns 0 if priv was re-added to the effective set (after being previously
+   removed by a call to priv_set_remove).
    Returns -1 on error with errno set appropriately.  */
 int
 priv_set_restore (const char *priv)