diff options
| -rw-r--r-- | src/eldap_filter_yecc.yrl | 4 | ||||
| -rw-r--r-- | src/mod_pubsub.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/eldap_filter_yecc.yrl b/src/eldap_filter_yecc.yrl index a70ea3e74..fe2a075c0 100644 --- a/src/eldap_filter_yecc.yrl +++ b/src/eldap_filter_yecc.yrl @@ -38,9 +38,9 @@ any -> '$empty': []. initial -> value: initial('$1'). final -> value: final('$1'). -extensible -> xattr ':dn' ':' matchingrule ':=' value: extensible('$6', ['$1', '$4']). +extensible -> xattr ':dn' ':' matchingrule ':=' value: extensible('$6', ['$1', '$4', {dnAttributes, true}]). extensible -> xattr ':' matchingrule ':=' value: extensible('$5', ['$1', '$3']). -extensible -> xattr ':dn' ':=' value: extensible('$4', ['$1']). +extensible -> xattr ':dn' ':=' value: extensible('$4', ['$1', {dnAttributes, true}]). extensible -> xattr ':=' value: extensible('$3', ['$1']). extensible -> ':dn' ':' matchingrule ':=' value: extensible('$5', ['$3']). extensible -> ':' matchingrule ':=' value: extensible('$4', ['$2']). diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl index 3dbbabe9f..91b5afead 100644 --- a/src/mod_pubsub.erl +++ b/src/mod_pubsub.erl @@ -690,9 +690,9 @@ update_node_database(Host, ServerHost) -> end, mnesia:transaction(fun () -> case catch mnesia:first(pubsub_node) of - {_, L} when is_binary(L) -> + {_, L} when is_list(L) -> lists:foreach(fun ({H, N}) - when is_binary(N) -> + when is_list(N) -> [Node] = mnesia:read({pubsub_node, {H, |