svn commit: r195004 - head/lib/libc/posix1e

[Edward Tomasz Napierala]

Author: trasz
Date: Thu Jun 25 20:57:53 2009
New Revision: 195004
URL: http://svn.freebsd.org/changeset/base/195004

Log:
  Fix acl_set_fd(3) and acl_get_fd(3) for cases where the kernel doesn't know
  anything about _PC_ACL_NFS4.

Modified:
  head/lib/libc/posix1e/acl_get.c
  head/lib/libc/posix1e/acl_set.c

Modified: head/lib/libc/posix1e/acl_get.c
==============================================================================
--- head/lib/libc/posix1e/acl_get.c	Thu Jun 25 20:40:13 2009	(r195003)
+++ head/lib/libc/posix1e/acl_get.c	Thu Jun 25 20:57:53 2009	(r195004)
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include "un-namespace.h"
 
 #include <errno.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -102,7 +103,7 @@ acl_get_link_np(const char *path_p, acl_
 acl_t
 acl_get_fd(int fd)
 {
-	if (fpathconf(fd, _PC_ACL_NFS4))
+	if (fpathconf(fd, _PC_ACL_NFS4) == 1)
 		return (acl_get_fd_np(fd, ACL_TYPE_NFS4));
 
 	return (acl_get_fd_np(fd, ACL_TYPE_ACCESS));

Modified: head/lib/libc/posix1e/acl_set.c
==============================================================================
--- head/lib/libc/posix1e/acl_set.c	Thu Jun 25 20:40:13 2009	(r195003)
+++ head/lib/libc/posix1e/acl_set.c	Thu Jun 25 20:57:53 2009	(r195004)
@@ -108,7 +108,7 @@ int
 acl_set_fd(int fd, acl_t acl)
 {
 
-	if (fpathconf(fd, _PC_ACL_NFS4))
+	if (fpathconf(fd, _PC_ACL_NFS4) == 1)
 		return (acl_set_fd_np(fd, acl, ACL_TYPE_NFS4));
 
 	return (acl_set_fd_np(fd, acl, ACL_TYPE_ACCESS));