attribute ordering done only if explicitely enabled

diff --git a/org.glite.security.proxyrenewal/interface/renewal_core.h b/org.glite.security.proxyrenewal/interface/renewal_core.h
index 166a3d0..7bfd7e7 100644 (file)
--- a/org.glite.security.proxyrenewal/interface/renewal_core.h
+++ b/org.glite.security.proxyrenewal/interface/renewal_core.h
@@ -20,6 +20,7 @@ typedef struct glite_renewal_core_context_data {
   glite_renewal_log_dst log_dst;
   char *err_message;
   char *voms_conf;
+  int order_attributes;
 } glite_renewal_core_context_data;
 
 typedef struct glite_renewal_core_context_data *glite_renewal_core_context;

diff --git a/org.glite.security.proxyrenewal/src/voms.c b/org.glite.security.proxyrenewal/src/voms.c
index 958e905..1fe12f6 100644 (file)
--- a/org.glite.security.proxyrenewal/src/voms.c
+++ b/org.glite.security.proxyrenewal/src/voms.c
@@ -138,11 +138,8 @@ create_voms_command(glite_renewal_core_context ctx, struct vomsdata *vd, struct
                (role) ? ":" : "",
                (role) ? role : "");
 
-      /* XXXXXXX */
-      if (i < 5) 
-      {
+      if (ctx->order_attributes) 
          VOMS_Ordering(str, vd, &voms_err);
-      }
 
       asprintf(&tmp, "%s%s%s%s",
                (cmd) ? cmd : "",