svn commit: samba r16024 - in branches/SAMBA_4_0/source/ntvfs/posix: .

metze at samba.org metze at samba.org
Sat Jun 3 09:38:24 GMT 2006


Author: metze
Date: 2006-06-03 09:38:22 +0000 (Sat, 03 Jun 2006)
New Revision: 16024

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16024

Log:
OpenBSD doesn't have ENOTSUP so use ENOSYS

metze
Modified:
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_xattr.c
   branches/SAMBA_4_0/source/ntvfs/posix/xattr_system.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_xattr.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_xattr.c	2006-06-03 07:21:51 UTC (rev 16023)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_xattr.c	2006-06-03 09:38:22 UTC (rev 16024)
@@ -47,8 +47,10 @@
 					fd, estimated_size, blob);
 
 	/* if the filesystem doesn't support them, then tell pvfs not to try again */
-	if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
-		DEBUG(5,("pvfs_xattr: xattr not supported in filesystem\n"));
+	if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)||
+	    NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED)||
+	    NT_STATUS_EQUAL(status, NT_STATUS_INVALID_SYSTEM_SERVICE)) {
+		DEBUG(5,("pvfs_xattr: xattr not supported in filesystem: %s\n", nt_errstr(status)));
 		pvfs->flags &= ~PVFS_FLAG_XATTR_ENABLE;
 		status = NT_STATUS_NOT_FOUND;
 	}

Modified: branches/SAMBA_4_0/source/ntvfs/posix/xattr_system.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/xattr_system.c	2006-06-03 07:21:51 UTC (rev 16023)
+++ branches/SAMBA_4_0/source/ntvfs/posix/xattr_system.c	2006-06-03 09:38:22 UTC (rev 16024)
@@ -57,32 +57,32 @@
 #elif !defined(HAVE_XATTR_SUPPORT)
 static ssize_t _none_fgetxattr(int fd, const char *name, void *value, size_t size)
 {
-	errno = ENOTSUP;
+	errno = ENOSYS;
 	return -1;
 }
 static ssize_t _none_getxattr(const char *path, const char *name, void *value, size_t size)
 {
-	errno = ENOTSUP;
+	errno = ENOSYS;
 	return -1;
 }
 static int _none_fsetxattr(int fd, const char *name, void *value, size_t size, int flags)
 {
-	errno = ENOTSUP;
+	errno = ENOSYS;
 	return -1;
 }
 static int _none_setxattr(const char *path, const char *name, void *value, size_t size, int flags)
 {
-	errno = ENOTSUP;
+	errno = ENOSYS;
 	return -1;
 }
 static int _none_fremovexattr(int fd, const char *name)
 {
-	errno = ENOTSUP;
+	errno = ENOSYS;
 	return -1;
 }
 static int _none_removexattr(const char *path, const char *name)
 {
-	errno = ENOTSUP;
+	errno = ENOSYS;
 	return -1;
 }
 #define fgetxattr	_none_fgetxattr



More information about the samba-cvs mailing list