aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/ejabberd.cfg.example6
-rw-r--r--src/odbc/ejabberd_odbc.erl2
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0aaf53893..cbf913647 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2005-04-18 Alexey Shchepin <alexey@sevcom.net>
+ * src/odbc/ejabberd_odbc.erl: ODBC connection string can be
+ specified via odbc_server option now
+ * src/ejabberd.cfg.example: Added ODBC usage example
+
* doc/guide.tex: Updated
* src/msgs/pl.msg: New Polish translation (thanks to Andrew Smyk)
diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example
index 3940f43f1..6185200e7 100644
--- a/src/ejabberd.cfg.example
+++ b/src/ejabberd.cfg.example
@@ -85,9 +85,13 @@
%{auth_method, external}.
%{extauth_program, "/path/to/authentification/script"}.
+% For authentification via ODBC use the following:
+%{auth_method, odbc}.
+%{odbc_server, "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"}.
+
% Host name:
-{host, "localhost"}.
+{hosts, ["localhost"]}.
% Default language for server messages
diff --git a/src/odbc/ejabberd_odbc.erl b/src/odbc/ejabberd_odbc.erl
index 3800d141e..77f90f957 100644
--- a/src/odbc/ejabberd_odbc.erl
+++ b/src/odbc/ejabberd_odbc.erl
@@ -68,7 +68,7 @@ escape(S) ->
%% {stop, Reason}
%%----------------------------------------------------------------------
init([]) ->
- {ok, Ref} = odbc:connect("DSN=ejabberd;UID=ejabberd;PWD=ejabberd",
+ {ok, Ref} = odbc:connect(ejabberd_config:get_local_option(odbc_server),
[{scrollable_cursors, off}]),
{ok, #state{odbc_ref = Ref}}.