From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Wed, 11 Jan 2012 20:16:33 +0000 (+0100)
Subject: Merge #1510
X-Git-Tag: trac2351_base~300
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47eecefe9805a080decaefa12509a361b9213677;p=thirdparty%2Fkea.git

Merge #1510
---

47eecefe9805a080decaefa12509a361b9213677
diff --cc src/bin/resolver/main.cc
index ef995c2b24,d563e08550..4834458881
--- a/src/bin/resolver/main.cc
+++ b/src/bin/resolver/main.cc
@@@ -41,11 -41,8 +41,10 @@@
  #include <cc/data.h>
  #include <config/ccsession.h>
  
 +#include <server_common/socket_request.h>
 +
  #include <xfr/xfrout_client.h>
  
- #include <auth/change_user.h>
  #include <auth/common.h>
  
  #include <resolver/spec_config.h>