- args.prefix = gssEapAttributeTypeToPrefix(ATTR_TYPE_SAML_ATTR);
- major = samlGetAttributeTypes(minor, name->samlCtx,
- &args, addAttribute);
+ /* Raw SAML attributes */
+#if 0
+ args.type = ATTR_TYPE_SAML_ATTR;
+ major = samlGetAttributeTypes(minor, args.type,
+ name, addAttribute, &args);
+ if (GSS_ERROR(major))
+ goto cleanup;
+#endif
+
+ /* Cooked local attributes */
+ args.type = ATTR_TYPE_NONE;
+ major = samlGetAttributeTypes(minor, name, args.type,
+ addAttribute, &args);
+ if (GSS_ERROR(major))
+ goto cleanup;
+ }
+
+ if (name->flags & NAME_FLAG_RADIUS_ATTRIBUTES) {
+ /* Raw RADIUS attributes */
+ args.type = ATTR_TYPE_RADIUS_AVP;
+ major = radiusGetAttributeTypes(minor, name,
+ addAttribute, &args);