ntfs-3g-cvs

[Jean-Pierre A. <jp...@us...>]

Update of /cvsroot/ntfs-3g/ntfs-3g/src
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5301/ntfs-3g/src

Modified Files:
      Tag: PERMISSION_HANDLING_BRANCH
	secaudit.c 
Log Message:
Fixed compilation of secaudit on OpenSolaris


Index: secaudit.c
===================================================================
RCS file: /cvsroot/ntfs-3g/ntfs-3g/src/Attic/secaudit.c,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- secaudit.c	19 Dec 2009 13:26:56 -0000	1.1.2.8
+++ secaudit.c	16 Jan 2010 18:27:17 -0000	1.1.2.9
@@ -1,7 +1,7 @@
 /*
  *		 Display and audit security attributes in an NTFS volume
  *
- * Copyright (c) 2007-2009 Jean-Pierre Andre
+ * Copyright (c) 2007-2010 Jean-Pierre Andre
  * 
  *	Options :
  *		-a auditing security data
@@ -164,6 +164,13 @@
  *
  *  Dec 2009, version 1.3.14
  *     - adapted to opensolaris
+ *
+ *  Jan 2010, version 1.3.15
+ *     - more adaptations to opensolaris
+ *     - removed the fix for return code of dorestore()
+ *
+ *  Jan 2010, version 1.3.16
+ *     - repeated the fix for return code of dorestore()
  */
 
 /*
@@ -187,7 +194,7 @@
  *		General parameters which may have to be adapted to needs
  */
 
-#define AUDT_VERSION "1.3.14"
+#define AUDT_VERSION "1.3.16"
 
 #define GET_FILE_SECURITY "ntfs_get_file_security"
 #define SET_FILE_SECURITY "ntfs_set_file_security"
@@ -5030,6 +5037,8 @@
 	return (err);
 }
 
+#ifdef HAVE_SETXATTR
+
 static ssize_t ntfs_getxattr(const char *path, const char *name, void *value, size_t size)
 {
 #if defined(__APPLE__) || defined(__DARWIN__)
@@ -5045,7 +5054,6 @@
 
 void showmounted(const char *fullname)
 {
-#ifdef HAVE_SETXATTR
 
 	static char attr[MAXATTRSZ];
 	struct stat st;
@@ -5139,11 +5147,17 @@
 		}
 	} else
 		printf("%s not found\n",fullname);
-#else
+}
+
+#else /* HAVE_SETXATTR */
+
+void showmounted(const char *fullname __attribute__((unused)))
+{
 	fprintf(stderr,"Not possible on this configuration\n");
-#endif
 }
 
+#endif /* HAVE_SETXATTR */
+
 #if POSIXACLS
 
 BOOL recurseset_posix(const char *path, const struct POSIX_SECURITY *pxdesc)