Merge r1666 from trunk:

* src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721)
* src/mod_roster.erl: Likewise
* src/mod_roster_odbc.erl: Likewise
* src/mod_shared_roster.erl: Likewise

SVN Revision: 1894

diff --git a/ChangeLog b/ChangeLog
index a9a394c74063effdf432459c1485476b3c3bcb99..b2a1c43bf0ca410de293593c5d608dfff1d0f62d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-21  Badlop  <badlop@process-one.net>
+
+       * src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721)
+       * src/mod_roster.erl: Likewise
+       * src/mod_roster_odbc.erl: Likewise
+       * src/mod_shared_roster.erl: Likewise
+
 2009-02-19  Christophe Romain <christophe.romain@process-one.net>
 
        * src/mod_pubsub/mod_pubsub.erl: fix nodetree plugin resolver

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 8407d976b5a271c264b4c32646924441d8abb2fc..8e624612d6b2ce86211fcede3d11c0cc3234e321 100644 (file)
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1171,7 +1171,7 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
                            NewPL ->
                                PrivPushIQ =
                                    #iq{type = set, xmlns = ?NS_PRIVACY,
-                                       id = "push",
+                                       id = "push" ++ randoms:get_string(),
                                        sub_el = [{xmlelement, "query",
                                                   [{"xmlns", ?NS_PRIVACY}],
                                                   [{xmlelement, "list",

diff --git a/src/mod_roster.erl b/src/mod_roster.erl
index 9f2e85c6d848d932412bc7f222faa105a13cc1b4..278602b8ea8fc797dfff0c0105a56939b725cad1 100644 (file)
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -371,7 +371,7 @@ push_item(User, Server, Resource, _From, Item) ->
 
 push_item(User, Server, Resource, From, Item) ->
     ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
-               id = "push",
+               id = "push" ++ randoms:get_string(),
                sub_el = [{xmlelement, "query",
                           [{"xmlns", ?NS_ROSTER}],
                           [item_to_xml(Item)]}]},

diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl
index fa428da9f9e41db439114857cc675ea27ea10ad4..90483cf9581a8be2f7391d17624ef476d0c65d3a 100644 (file)
--- a/src/mod_roster_odbc.erl
+++ b/src/mod_roster_odbc.erl
@@ -407,7 +407,7 @@ push_item(User, Server, Resource, _From, Item) ->
 
 push_item(User, Resource, From, Item) ->
     ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
-               id = "push",
+               id = "push" ++ randoms:get_string(),
                sub_el = [{xmlelement, "query",
                           [{"xmlns", ?NS_ROSTER}],
                           [item_to_xml(Item)]}]},

diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl
index af123c2a501e24af7e9833e20ab3538ec8093d7e..7ca15494729a7cba0d678e9fb4a20f313f58ff2e 100644 (file)
--- a/src/mod_shared_roster.erl
+++ b/src/mod_shared_roster.erl
@@ -248,7 +248,7 @@ set_new_rosteritems(UserFrom, ServerFrom,
 
 set_item(User, Server, Resource, Item) ->
     ResIQ = #iq{type = set, xmlns = ?NS_ROSTER,
-               id = "push",
+               id = "push" ++ randoms:get_string(),
                sub_el = [{xmlelement, "query",
                           [{"xmlns", ?NS_ROSTER}],
                           [mod_roster:item_to_xml(Item)]}]},
@@ -617,7 +617,7 @@ push_item(User, Server, From, Item) ->
                         Item#roster.subscription}]}),
     Stanza = jlib:iq_to_xml(
               #iq{type = set, xmlns = ?NS_ROSTER,
-                  id = "push",
+                  id = "push" ++ randoms:get_string(),
                   sub_el = [{xmlelement, "query",
                              [{"xmlns", ?NS_ROSTER}],
                              [item_to_xml(Item)]}]}),