Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

diff --combined citadel/event_client.c
index f2c44f11bfac520956fb6655b6dad65698563c6f,f893548e421e85342ec5d37dd31f4560d940ea64..b5e54b9593047411e3780e60411c49ed2ed14ed8
--- 1/citadel/event_client.c
--- 2/citadel/event_client.c
+++ b/citadel/event_client.c
@@@ -2,7 -2,7 +2,7 @@@
   *
   * Copyright (c) 1998-2009 by the citadel.org team
   *
-  *  This program is free software; you can redistribute it and/or modify
+  *  This program is open source software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; either version 3 of the License, or
   *  (at your option) any later version.
@@@ -700,15 -700,9 +700,15 @@@ IO_postdns_callback(struct ev_loop *loo
        switch (IO->DNSQuery->PostDNS(IO))
        {
        case eAbort:
 -              IO->DNSFail(IO);
 +              switch (IO->DNSFail(IO)) {
 +              case eAbort:
 +                      ShutDownCLient(IO);
 +              default:
 +                      break;
 +                      
 +              }
        default:
 -          break;
 +              break;
        }
  }