summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Dauvergne <bdauvergne@entrouvert.com>2015-04-08 08:54:23 (GMT)
committerBenjamin Dauvergne <bdauvergne@entrouvert.com>2015-04-08 08:54:23 (GMT)
commit037dd98163a84324775bf8bd7a33594783c0959e (patch)
treeebbb6d9812c57315fdd231a176e2c25693c16d79
parent0bf3b07f85f1dc6b3c8df8a60179f5ca1e513f5b (diff)
downloadmodmellon-037dd98163a84324775bf8bd7a33594783c0959e.zip
modmellon-037dd98163a84324775bf8bd7a33594783c0959e.tar.gz
modmellon-037dd98163a84324775bf8bd7a33594783c0959e.tar.bz2
Revert "Fix handling of attribute values"
This reverts commit d8f39d6867deb230350c8d082ee0584717a71e3c.
-rw-r--r--auth_mellon_handler.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/auth_mellon_handler.c b/auth_mellon_handler.c
index 3f1698f..242530f 100644
--- a/auth_mellon_handler.c
+++ b/auth_mellon_handler.c
@@ -1667,26 +1667,14 @@ static int add_attributes(am_cache_entry_t *session, request_rec *r,
continue;
}
- /* Verify there is only one node */
- if (value->any->next != NULL) {
- char *dump = lasso_node_dump(LASSO_NODE(value));
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
- "AttributeValue element contained more "
- "than one node: %s", dump);
- g_free(dump);
- continue;
- }
/* Verify that this is a LassoMiscTextNode object. */
- if(!LASSO_IS_MISC_TEXT_NODE(value->any->data) ||
- !LASSO_MISC_TEXT_NODE(value->any->data)->text_child) {
- char *dump = lasso_node_dump(LASSO_NODE(value));
+ if(!LASSO_IS_MISC_TEXT_NODE(value->any->data)) {
ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
"AttributeValue element contained an "
- " element which wasn't a text node: %s",
- dump);
- g_free(dump);
+ " element which wasn't a text node.");
continue;
}
+
value_text = LASSO_MISC_TEXT_NODE(value->any->data);