Merge branch 'master' of ssh+git://git-g/pub/repo.git/Baltisot

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/MailServer.cc b/lib/MailServer.cc
index 0f5194c..c0e3607 100644
--- a/lib/MailServer.cc
+++ b/lib/MailServer.cc
@@ -51,7 +51,7 @@ class ProcessSMTPRequest : public Task {
 
 static Regex single_dot("^\\.$"), dotted_line("^\\..+$");
 
-int ProcessSMTPRequest::Do() {
+int ProcessSMTPRequest::Do() throw (GeneralException) {
     String l, cmd;
     Buffer * out;
 
diff --git a/lib/dblib.lua b/lib/dblib.lua
index 5466334..85fc15a 100644
--- a/lib/dblib.lua
+++ b/lib/dblib.lua
@@ -678,7 +678,7 @@ _luadb = {
         end
         
         if r ~= 0 and db._.conn:ErrNO() == 2006 then -- disconnected
-            db._.conn = db:opendb()
+            db._.conn = luadb:opendb(db)._.conn
             r = db._.conn:Query(str)
         end