search only in given host in mod_vcard_odbc and _mnesia

esl · Oct 8, 2015 · 8d71cb2 · 8d71cb2
1 parent 3bd5f06
commit 8d71cb2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/apps/ejabberd/src/mod_vcard_mnesia.erl b/apps/ejabberd/src/mod_vcard_mnesia.erl
@@ -61,7 +61,8 @@ search(VHost, Data, _Lang, DefaultReportedFields) ->
 
 do_search(_, #vcard_search{_ = '_'}) ->
     [];
-do_search(VHost, MatchHead) ->
+do_search(VHost, MatchHeadIn) ->
+    MatchHead = MatchHeadIn#vcard_search{us = {'_', VHost}},
     case catch mnesia:dirty_select(vcard_search,
         [{MatchHead, [], ['$_']}]) of
         {'EXIT', Reason} ->
@@ -269,9 +270,7 @@ filter_fields([{SVar, [Val]} | Ds], Match, VHost)
     LVal = stringprep:tolower(Val),
     NewMatch =
         case SVar of
-            <<"user">> ->
-                Host = find_my_host(VHost),
-                Match#vcard_search{us = {make_val(LVal), Host}};
+            <<"user">> -> Match#vcard_search{luser = make_val(LVal)};
             <<"fn">>       -> Match#vcard_search{lfn       = make_val(LVal)};
             <<"last">>     -> Match#vcard_search{lfamily   = make_val(LVal)};
             <<"first">>    -> Match#vcard_search{lgiven    = make_val(LVal)};

diff --git a/apps/ejabberd/src/mod_vcard_odbc.erl b/apps/ejabberd/src/mod_vcard_odbc.erl
@@ -136,14 +136,14 @@ search_fields(_VHost) ->
 make_restriction_sql(LServer, Data) ->
     filter_fields(Data, "", LServer).
 
-filter_fields([], RestrictionSQL, _LServer) ->
-    case RestrictionSQL of
+filter_fields([], RestrictionSQLIn, LServer) ->
+    case RestrictionSQLIn of
 	"" ->
 	    "";
         <<>> ->
             <<>>;
 	_ ->
-	    [" where ", RestrictionSQL]
+	    [" where ", [RestrictionSQLIn, " and ", ["server = '", ejabberd_odbc:escape(LServer),"'"]]]
     end;
 filter_fields([{SVar, [Val]} | Ds], RestrictionSQL, LServer)
   when is_binary(Val) and (Val /= <<"">>) ->