Merge branch 'master' into xml-ng

Conflicts:
	src/adhoc.erl
	src/cyrsasl_oauth.erl
	src/ejabberd_c2s.erl
	src/ejabberd_config.erl
	src/ejabberd_service.erl
	src/gen_mod.erl
	src/mod_admin_extra.erl
	src/mod_announce.erl
	src/mod_carboncopy.erl
	src/mod_client_state.erl
	src/mod_configure.erl
	src/mod_echo.erl
	src/mod_mam.erl
	src/mod_muc.erl
	src/mod_muc_room.erl
	src/mod_offline.erl
	src/mod_pubsub.erl
	src/mod_stats.erl
	src/node_flat_sql.erl
	src/randoms.erl

1 files changed, 65 insertions, 0 deletions

diff --git a/specs/xmpp_codec.spec b/specs/xmpp_codec.spec
index 608e1fe2d..12bc4b6a9 100644
--- a/specs/xmpp_codec.spec
+++ b/specs/xmpp_codec.spec
@@ -3387,6 +3387,71 @@
 			  dec = {dec_int, [0, infinity]},
 			  enc = {enc_int, []}}]}).
 
+-xml(privilege_perm,
+     #elem{name = <<"perm">>,
+	   xmlns = <<"urn:xmpp:privilege:1">>,
+	   result = {privilege_perm, '$access', '$type'},
+	   attrs = [#attr{name = <<"access">>,
+			  required = true,
+			  dec = {dec_enum, [[roster, message, presence]]},
+			  enc = {enc_enum, []}},
+		    #attr{name = <<"type">>,
+			  required = true,
+			  dec = {dec_enum, [[none, get, set, both,
+					     outgoing, roster,
+					     managed_entity]]},
+			  enc = {enc_enum, []}}]}).
+
+-xml(privilege,
+     #elem{name = <<"privilege">>,
+	   xmlns = <<"urn:xmpp:privilege:1">>,
+	   result = {privilege, '$perms', '$forwarded'},
+	   refs = [#ref{name = privilege_perm, label = '$perms'},
+		   #ref{name = forwarded, min = 0,
+                        max = 1, label = '$forwarded'}]}).
+
+-xml(delegated_attribute,
+     #elem{name = <<"attribute">>,
+	   xmlns = <<"urn:xmpp:delegation:1">>,
+	   result = '$name',
+	   attrs = [#attr{name = <<"name">>,
+			  required = true}]}).
+
+-xml(delegated,
+     #elem{name = <<"delegated">>,
+	   xmlns = <<"urn:xmpp:delegation:1">>,
+	   result = {delegated, '$ns', '$attrs'},
+	   attrs = [#attr{name = <<"namespace">>,
+			  label = '$ns',
+			  required = true}],
+	   refs = [#ref{name = delegated_attribute,
+			label = '$attrs'}]}).
+
+-xml(delegation,
+     #elem{name = <<"delegation">>,
+	   xmlns = <<"urn:xmpp:delegation:1">>,
+	   result = {delegation, '$delegated', '$forwarded'},
+	   refs = [#ref{name = delegated, label = '$delegated'},
+		   #ref{name = forwarded, min = 0,
+			max = 1, label = '$forwarded'}]}).
+
+-xml(delegate,
+     #elem{name = <<"delegate">>,
+	   xmlns = <<"urn:xmpp:delegation:1">>,
+	   result = '$namespace',
+	   attrs = [#attr{name = <<"namespace">>,
+			  required = true}]}).
+
+-xml(delegation_query,
+     #elem{name = <<"query">>,
+	   xmlns = <<"urn:xmpp:delegation:1">>,
+	   result = {delegation_query, '$to', '$delegate'},
+	   attrs = [#attr{name = <<"to">>,
+			  required = true,
+			  dec = {dec_jid, []},
+			  enc = {enc_jid, []}}],
+	   refs = [#ref{name = delegate, label = '$delegate'}]}).
+
 -spec dec_tzo(_) -> {integer(), integer()}.
 dec_tzo(Val) ->
     [H1, M1] = str:tokens(Val, <<":">>),