[Selinux-commits] SF.net SVN: selinux: [2032] trunk/libselinux/include/selinux

[<mad...@us...>]

Revision: 2032
          http://svn.sourceforge.net/selinux/?rev=2032&view=rev
Author:   madmethod
Date:     2006-09-18 12:13:13 -0700 (Mon, 18 Sep 2006)

Log Message:
-----------
Author: Joe Nall
Email: jo...@na...
Subject: C++ reserved word 'class' used in selinux/avc.h with patch
Date: Fri, 15 Sep 2006 18:08:24 -0500

John Wiseman noticed that 'class', a reserved word in C++, is used  
in /usr/include/selinux/avc.h.

Save the following code as test.cc and compile

#include <selinux/avc.h>

int
main (int, char **)
     {
     }

results are

cc test.cc
/usr/include/selinux/avc.h:123: error: expected identifier before token
/usr/include/selinux/avc.h:124: error: two or more data types in declaration of parameter

Acked-By: Joshua Brindle <jbr...@tr...>
Acked-By: Stephen Smalley <sd...@ty...>

Modified Paths:
--------------
    tags/libselinux_1_30_28/libselinux/ChangeLog
    tags/libselinux_1_30_28/libselinux/include/selinux/avc.h
    trunk/libselinux/ChangeLog
    trunk/libselinux/include/selinux/avc.h

Modified: tags/libselinux_1_30_28/libselinux/ChangeLog
===================================================================
--- tags/libselinux_1_30_28/libselinux/ChangeLog	2006-09-13 21:31:24 UTC (rev 2031)
+++ tags/libselinux_1_30_28/libselinux/ChangeLog	2006-09-18 19:13:13 UTC (rev 2032)
@@ -1,5 +1,6 @@
 1.30.28 2006-09-13
 	* Merged patch from Steve Smalley to fix SIGPIPE in setrans_client
+	* Merged c++ class identifier fix from Joe Nall.
 
 1.30.27 2006-08-24
 	* Merged patch to not log avc stats upon a reset from Steve Grubb.

Modified: tags/libselinux_1_30_28/libselinux/include/selinux/avc.h
===================================================================
--- tags/libselinux_1_30_28/libselinux/include/selinux/avc.h	2006-09-13 21:31:24 UTC (rev 2031)
+++ tags/libselinux_1_30_28/libselinux/include/selinux/avc.h	2006-09-18 19:13:13 UTC (rev 2032)
@@ -120,7 +120,7 @@
 		void (*func_log) (const char *fmt, ...);
 		/* store a string representation of auditdata (corresponding
 		   to the given security class) into msgbuf. */
-		void (*func_audit) (void *auditdata, security_class_t class,
+		void (*func_audit) (void *auditdata, security_class_t cls,
 				    char *msgbuf, size_t msgbufsize);
 	};
 

Modified: trunk/libselinux/ChangeLog
===================================================================
--- trunk/libselinux/ChangeLog	2006-09-13 21:31:24 UTC (rev 2031)
+++ trunk/libselinux/ChangeLog	2006-09-18 19:13:13 UTC (rev 2032)
@@ -1,5 +1,6 @@
 1.30.28 2006-09-13
 	* Merged patch from Steve Smalley to fix SIGPIPE in setrans_client
+	* Merged c++ class identifier fix from Joe Nall.
 
 1.30.27 2006-08-24
 	* Merged patch to not log avc stats upon a reset from Steve Grubb.

Modified: trunk/libselinux/include/selinux/avc.h
===================================================================
--- trunk/libselinux/include/selinux/avc.h	2006-09-13 21:31:24 UTC (rev 2031)
+++ trunk/libselinux/include/selinux/avc.h	2006-09-18 19:13:13 UTC (rev 2032)
@@ -120,7 +120,7 @@
 		void (*func_log) (const char *fmt, ...);
 		/* store a string representation of auditdata (corresponding
 		   to the given security class) into msgbuf. */
-		void (*func_audit) (void *auditdata, security_class_t class,
+		void (*func_audit) (void *auditdata, security_class_t cls,
 				    char *msgbuf, size_t msgbufsize);
 	};
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.