From: Wilfried Goesgens <dothebart@citadel.org>
Date: Thu, 22 Dec 2011 20:17:50 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v8.11~285
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=7b6191e9787496d0a3157637414210832e68117b;hp=-c

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

7b6191e9787496d0a3157637414210832e68117b
diff --combined citadel/event_client.c
index f2c44f11b,f893548e4..b5e54b959
--- a/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;
  	}
  }