From: Daniel Kouřil <kouril@ics.muni.cz>
Date: Tue, 19 May 2009 22:12:49 +0000 (+0000)
Subject: don't use hard-wired types for ACLs events but the ones generated automatically
X-Git-Tag: glite-lb-client_R_4_0_2_2~4
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=e01d5f8b7550914286a81fdf0df0711900060a44;p=jra1mw.git

don't use hard-wired types for ACLs events but the ones generated automatically
---

diff --git a/org.glite.lb.client/interface/producer.h.T b/org.glite.lb.client/interface/producer.h.T
index 86025ee..470383f 100644
--- a/org.glite.lb.client/interface/producer.h.T
+++ b/org.glite.lb.client/interface/producer.h.T
@@ -347,10 +347,10 @@ extern int edg_wll_ChangeACL(
 	edg_wll_Context		context,
 	glite_jobid_const_t	job,
 	const char *		user_id,
-	enum edg_wll_UserIdType	user_id_type,
-	enum edg_wll_Permission		permission,
-	enum edg_wll_PermissionType	permission_type,
-	enum edg_wll_ACLOperation	operation
+	enum edg_wll_ChangeACLUser_id_type	user_id_type,
+	enum edg_wll_ChangeACLPermission	permission,
+	enum edg_wll_ChangeACLPermission_type	permission_type,
+	enum edg_wll_ChangeACLOperation		operation
 );
 
 
diff --git a/org.glite.lb.client/src/producer.c b/org.glite.lb.client/src/producer.c
index 7e66d06..0cd4e92 100644
--- a/org.glite.lb.client/src/producer.c
+++ b/org.glite.lb.client/src/producer.c
@@ -1226,10 +1226,10 @@ int edg_wll_ChangeACL(
 		edg_wll_Context			ctx,
 		glite_jobid_const_t		jobid,
 		const char			*user_id,
-		enum edg_wll_UserIdType		user_id_type,
-		enum edg_wll_Permission		permission,
-		enum edg_wll_PermissionType	permission_type,
-		enum edg_wll_ACLOperation	operation)
+        	enum edg_wll_ChangeACLUser_id_type      user_id_type,
+        	enum edg_wll_ChangeACLPermission        permission,
+        	enum edg_wll_ChangeACLPermission_type   permission_type,
+        	enum edg_wll_ChangeACLOperation         operation)
 {
 	if ( edg_wll_SetLoggingJob(ctx, jobid, NULL, EDG_WLL_SEQ_NORMAL) == 0 ) {
 		edg_wll_LogEventMaster(ctx, EDG_WLL_LOGFLAG_LOCAL | EDG_WLL_LOGFLAG_SYNC, 
diff --git a/org.glite.lb.common/interface/events.h.T b/org.glite.lb.common/interface/events.h.T
index ed18766..f86b3ac 100644
--- a/org.glite.lb.common/interface/events.h.T
+++ b/org.glite.lb.common/interface/events.h.T
@@ -428,30 +428,6 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
 #define EDG_WLL_LOGFLAG_DIRECT  16 /**< logging directly to bkserver */
 #define EDG_WLL_LOGFLAG_INTERNAL  32 /**< internally generated event, don't forward */
 
-/* enums for the ChangeACL event */
-
-enum edg_wll_Permission {
-	EDG_WLL_PERM_READ  = 1,
-	EDG_WLL_PERM_WRITE = 4,
-	EDG_WLL_PERM_ADMIN = 8,
-};
-
-enum edg_wll_PermissionType {
-	EDG_WLL_PERM_ALLOW,
-	EDG_WLL_PERM_DENY,
-};
-
-enum edg_wll_ACLOperation {
-	EDG_WLL_ACL_ADD,
-	EDG_WLL_ACL_REMOVE,
-};
-
-enum edg_wll_UserIdType {
-	EDG_WLL_USER_SUBJECT,           /* X.509 subject name */
-	EDG_WLL_USER_VOMS_GROUP,        /* VOMS group membership */
-	EDG_WLL_USER_FQAN,		/* Full qualified attribute name */
-};
-
 /*
  *@} end of group
  */