* ejabberd 1.1.2 final

SVN Revision: 656

ChangeLog

@@ -1,8 +1,3 @@
-2007-02-02  Christophe Romain <christophe.romain@process-one.net>
-
-	* doc/release_notes_1.1.3.txt: Creation.
-	* src/mod_roster_odbc.erl: Security bugfix.
-
 2006-09-27  Mickael Remond  <mickael.remond@process-one.net>
 
 	* doc/release_notes_1.1.2.txt: Minor fixes.

doc/release_notes_1.1.3.txt

@@ -1,50 +0,0 @@
-				Release Notes
-				ejabberd 1.1.3
-			      2 February 2007
-
-   This document describes the change in ejabberd 1.1.3.
-
-   This version is a security improvement over ejabberd 1.1.2, solving
-   the mod_roster_odbc SQL injection issue.
-
-   Users of ejabberd 1.1.2 that are using mod_roster_odbc MUST upgrade to
-   this new release.
-
-   ejabberd can be downloaded from the Process-one website:
-   http://www.process-one.net/en/ejabberd/
-
-   Detailed information can be found in the Feature Sheet and in the
-   Installation and Operation Guide which are both available on the
-   Process-one website:
-   http://www.process-one.net/en/ejabberd/docs.html
-
-   Installation Notes
-
-Supported Erlang Version
-
-   - You need at least Erlang/OTP R9C-2 to run ejabberd 1.1.3.
-   - The recommanded version is Erlang/OTP R11B-3.
-
-Installation
-
-   Installers are provided for Microsoft Windows, Linux/x86 and MacOSX/PPC.
-   They can be retrieved from:
-   http://www.process-one.net/en/ejabberd/download.html
-
-Migration Notes
-
-   - Before any migration, ejabberd system and database must be properly
-   backed up.
-
-
-References
-
-   Contributed tutorials and documents of interest are:
-   - Migration from other XMPP servers to ejabberd:
-     http://ejabberd.jabber.ru/migrate-to-ejabberd     
-   - Transport configuration for connecting to other networks:
-     http://ejabberd.jabber.ru/tutorials-transports
-   - Frequently Asked Questions:
-     http://ejabberd.jabber.ru/faq
-
-END

src/Makefile.in

@@ -89,7 +89,7 @@ install: all
 	install -d $(MSGSDIR)
 	install -m 644 msgs/*.msg $(MSGSDIR)
 	install -d $(ETCDIR)
-	[ -f $(ETCDIR)/ejabberd.cfg ] && install -b -m 644 ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new || install -b -m 644 ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
+	install -b -m 644 ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
 	install -d $(LOGDIR)
 
 clean: clean-recursive clean-local

src/ejabberd.hrl

@@ -6,7 +6,7 @@
 %%% Id      : $Id$
 %%%----------------------------------------------------------------------
 
--define(VERSION, "1.1.3").
+-define(VERSION, "1.1.2").
 
 %-define(ejabberd_debug, true).
 %-define(DBGFSM, true).

src/ejabberd_c2s.erl

@@ -1354,7 +1354,7 @@ presence_update(From, Packet, StateData) ->
 				  get_priority_from_presence(OldPresence)
 			  end,
 	    NewPriority = get_priority_from_presence(Packet),
-	    update_priority(NewPriority, Packet, StateData),
+	    update_priority(NewPriority, StateData),
 	    FromUnavail = (StateData#state.pres_last == undefined) or
 		StateData#state.pres_invis,
 	    ?DEBUG("from unavail = ~p~n", [FromUnavail]),
@@ -1633,13 +1633,12 @@ roster_change(IJID, ISubscription, StateData) ->
     end.
 
 
-update_priority(Priority, Packet, StateData) ->
+update_priority(Pri, StateData) ->
     ejabberd_sm:set_presence(StateData#state.sid,
 			     StateData#state.user,
 			     StateData#state.server,
 			     StateData#state.resource,
-			     Priority,
-                 Packet).
+			     Pri).
 
 get_priority_from_presence(PresencePacket) ->
     case xml:get_subtag(PresencePacket, "priority") of

src/ejabberd_sm.erl

@@ -18,7 +18,7 @@
 	 bounce_offline_message/3,
 	 disconnect_removed_user/2,
 	 get_user_resources/2,
-	 set_presence/6,
+	 set_presence/5,
 	 unset_presence/5,
 	 close_session_unset_presence/5,
 	 dirty_get_sessions_list/0,
@@ -101,10 +101,8 @@ get_user_resources(User, Server) ->
 	    [element(3, S#session.usr) || S <- clean_session_list(Ss)]
     end.
 
-set_presence(SID, User, Server, Resource, Priority, Presence) ->
-    set_session(SID, User, Server, Resource, Priority),
-    ejabberd_hooks:run(set_presence_hook, jlib:nameprep(Server),
-               [User, Server, Resource, Presence]).
+set_presence(SID, User, Server, Resource, Priority) ->
+    set_session(SID, User, Server, Resource, Priority).
 
 unset_presence(SID, User, Server, Resource, Status) ->
     set_session(SID, User, Server, Resource, undefined),

src/mod_roster_odbc.erl

@@ -821,13 +821,12 @@ record_to_string(#roster{us = {User, _Server},
 	       in	   -> "I";
 	       none	   -> "N"
 	   end,
-    SAskMessage = ejabberd_odbc:escape(AskMessage),
     ["'", Username, "',"
      "'", SJID, "',"
      "'", Nick, "',"
      "'", SSubscription, "',"
      "'", SAsk, "',"
-     "'", SAskMessage, "',"
+     "'", AskMessage, "',"
      "'N', '', 'item'"].
 
 groups_to_string(#roster{us = {User, _Server},