* src/win32/inetrc: Added (thanks to Sergei Golovan)

* src/Makefile.win32: Updated (thanks to Sergei Golovan)
* src/win32/ejabberd.cfg: Likewise
* src/win32/ejabberd.nsi: Likewise

* doc/guide.tex: Updated

* src/ejabberd.hrl: Updated version

SVN Revision: 402

8 files changed, 33 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index d8df94a1f..22e0f3efa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-08-05  Alexey Shchepin  <alexey@sevcom.net>
+
+	* src/win32/inetrc: Added (thanks to Sergei Golovan)
+
+	* src/Makefile.win32: Updated (thanks to Sergei Golovan)
+	* src/win32/ejabberd.cfg: Likewise
+	* src/win32/ejabberd.nsi: Likewise
+
+	* doc/guide.tex: Updated
+
+	* src/ejabberd.hrl: Updated version
+
 2005-08-01  Alexey Shchepin  <alexey@sevcom.net>
 
 	* src/msgs/ru.msg: Updated (thanks to Sergei Golovan)
diff --git a/doc/guide.html b/doc/guide.html
index 41e148c35..06f9025d2 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -149,8 +149,6 @@ Works on most of popular platforms: *nix (tested on Linux, FreeBSD and
 The misfeatures of <TT>ejabberd</TT> are:
 <UL><LI>
 No support for authentication and STARTTLS in S2S connections
-<LI>Access rules can be defined only for global conext, not for specific
- virtual host
 </UL>
 <!--TOC section Installation from Source-->
 
diff --git a/doc/guide.tex b/doc/guide.tex
index 665a0a8c4..de5f8ede0 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -134,8 +134,6 @@ The main features of \ejabberd{} are:
 The misfeatures of \ejabberd{} are:
 \begin{itemize}
 \item No support for authentication and STARTTLS in S2S connections
-\item Access rules can be defined only for global conext, not for specific
-  virtual host
 \end{itemize}
 
 
diff --git a/src/Makefile.win32 b/src/Makefile.win32
index cfa872e75..09a5988e5 100644
--- a/src/Makefile.win32
+++ b/src/Makefile.win32
@@ -8,8 +8,8 @@ EREL=$(REL)\ejabberd-$(EJABBERD_VERSION)
 EBIN_DIR=$(EREL)\ebin
 SRC_DIR=$(EREL)\src
 PRIV_DIR=$(EREL)\priv
-SO_DIR=$(PRIV_DIR)\lib
-MSGS_DIR=$(PRIV_DIR)\msgs
+SO_DIR=$(EREL)
+MSGS_DIR=$(EREL)\msgs
 WIN32_DIR=$(EREL)\win32
 DOC_DIR=$(EREL)\doc
 
@@ -35,13 +35,12 @@ release : build release_clean
 	copy *.beam $(EBIN_DIR)
 	@erase $(EBIN_DIR)\configure.beam
 	copy *.app $(EBIN_DIR)
-	mkdir $(PRIV_DIR)
-	mkdir $(SO_DIR)
 	copy *.dll $(SO_DIR)
 	mkdir $(MSGS_DIR)
 	copy msgs\*.msg $(MSGS_DIR)
 	mkdir $(WIN32_DIR)
 	copy win32\ejabberd.cfg $(EREL)
+	copy win32\inetrc $(EREL)
 	copy $(SYSTEMROOT)\system32\libeay32.dll $(EREL)
 	copy $(SYSTEMROOT)\system32\ssleay32.dll $(EREL)
 	copy win32\ejabberd.ico $(WIN32_DIR)
@@ -71,6 +70,7 @@ release : build release_clean
 	mkdir $(SRC_DIR)\odbc
 	copy odbc\*.erl $(SRC_DIR)\odbc
 	mkdir $(DOC_DIR)
+	copy ..\doc\*.txt $(DOC_DIR)
 	copy ..\doc\*.html $(DOC_DIR)
 	copy ..\doc\*.png $(DOC_DIR)
 
diff --git a/src/ejabberd.hrl b/src/ejabberd.hrl
index 14e5dde17..7bb74f860 100644
--- a/src/ejabberd.hrl
+++ b/src/ejabberd.hrl
@@ -6,7 +6,7 @@
 %%% Id      : $Id$
 %%%----------------------------------------------------------------------
 
--define(VERSION, "0.9.8").
+-define(VERSION, "0.9.9-alpha").
 
 %-define(ejabberd_debug, true).
 %-define(DBGFSM, true).
diff --git a/src/win32/ejabberd.cfg b/src/win32/ejabberd.cfg
index f882f7cc6..7ba191be0 100644
--- a/src/win32/ejabberd.cfg
+++ b/src/win32/ejabberd.cfg
@@ -80,11 +80,17 @@
 %{ldap_servers, ["localhost"]}.    % List of LDAP servers

 %{ldap_uidattr, "uid"}.            % LDAP attribute that holds user ID

 %{ldap_base, "dc=example,dc=com"}. % Base of LDAP directory

+%{ldap_rootdn, "dc=example,dc=com"}. % LDAP manager

+%{ldap_password, "******"}. % Password to LDAP manager

 

 % For authentification via external script use the following:

 %{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(s):

 {hosts, ["localhost"]}.

diff --git a/src/win32/ejabberd.nsi b/src/win32/ejabberd.nsi
index 984d4be2e..fcc11e5d0 100644
--- a/src/win32/ejabberd.nsi
+++ b/src/win32/ejabberd.nsi
@@ -159,10 +159,10 @@ SectionIn 1 RO
     SetOutPath "$INSTDIR"
     File /r "${TESTDIR}\doc"
     File /r "${TESTDIR}\ebin"
-    File /r "${TESTDIR}\priv"
+    File /r "${TESTDIR}\msgs"
     File /r "${TESTDIR}\win32"
-    File "${TESTDIR}\libeay32.dll"
-    File "${TESTDIR}\ssleay32.dll"
+    File "${TESTDIR}\*.dll"
+    File "${TESTDIR}\inetrc"
     File /oname=ejabberd.cfg.example "${TESTDIR}\ejabberd.cfg"
     SetOverwrite off
     File "${TESTDIR}\ejabberd.cfg"
@@ -178,9 +178,8 @@ SectionIn 1 RO
     CreateDirectory "$0"
     CreateShortCut "$0\Start Ejabberd.lnk" "$ERLANG_PATH\bin\werl.exe" \
 	'-sname ejabberd -pa ebin \
-	-env EJABBERD_SO_PATH priv/lib -env EJABBERD_MSGS_PATH priv/msgs \
 	-env EJABBERD_LOG_PATH log/ejabberd.log \
-	-s ejabberd -ejabberd config \"ejabberd.cfg\" -mnesia dir \"spool\" \
+	-s ejabberd -kernel inetrc \"inetrc\" -mnesia dir \"spool\" \
 	-sasl sasl_error_logger {file,\"log/sasl.log\"}' \
 	$INSTDIR\win32\ejabberd.ico
     CreateShortCut "$0\Edit Config.lnk" "%SystemRoot%\system32\notepad.exe" \
@@ -214,8 +213,7 @@ SectionIn 1 RO
     nsExec::ExecToLog '"$ERLSRV" add ejabberd -stopaction "init:stop()." \
 	-onfail restart -workdir "$INSTDIR" \
 	-args "-s ejabberd -pa ebin \
-	-ejabberd config \\\"ejabberd.cfg\\\" \
-	-env EJABBERD_SO_PATH priv/lib -env EJABBERD_MSGS_PATH priv/msgs \
+	-kernel inetrc \\\"inetrc\\\" \
 	-env EJABBERD_LOG_PATH log/ejabberd.log \
 	-sasl sasl_error_logger {file,\\\"log/sasl.log\\\"} \
 	-mnesia dir \\\"spool\\\"" -d'
@@ -299,12 +297,13 @@ Section "Uninstall"
     skipservice:
     RMDir /r "$INSTDIR\doc"
     RMDir /r "$INSTDIR\ebin"
-    RMDir /r "$INSTDIR\priv"
+    RMDir /r "$INSTDIR\msgs"
     RMDir /r "$INSTDIR\win32"
     ;RMDir /r "$INSTDIR\src"
     RMDir /r "$INSTDIR\log"
-    Delete "$INSTDIR\libeay32.dll"
-    Delete "$INSTDIR\ssleay32.dll"
+    Delete "$INSTDIR\*.dll"
+    Delete "$INSTDIR\inetrc"
+    Delete "$INSTDIR\ejabberd.cfg.example"
     Delete "$INSTDIR\Uninstall.exe"
     RMDir "$INSTDIR"  
 
diff --git a/src/win32/inetrc b/src/win32/inetrc
new file mode 100644
index 000000000..49b18c2eb
--- /dev/null
+++ b/src/win32/inetrc
@@ -0,0 +1 @@
+{registry, win32}.