From 27907fcb58972ce792e87616555b78b07f3fbbf0 Mon Sep 17 00:00:00 2001
From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Fri, 31 Jul 2009 19:44:06 +0000
Subject: [PATCH] update year, remove dead 'socket-owner' code from 3.1.7.1

git-svn-id: svn://svn.powerdns.com/pdns/tags/pdns-3.1.7.1@1392 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---
 pdns/pdns_recursor.cc | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 980dc3b9c..043e4ab1e 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1,6 +1,6 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2003 - 2008  PowerDNS.COM BV
+    Copyright (C) 2003 - 2009  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License version 2 
@@ -1670,7 +1670,7 @@ int serviceMain(int argc, char*argv[])
       L<<Logger::Error<<"Unknown logging facility "<<::arg().asNum("logging-facility") <<endl;
   }
 
-  L<<Logger::Warning<<"PowerDNS recursor "<<VERSION<<" (C) 2001-2008 PowerDNS.COM BV ("<<__DATE__", "__TIME__;
+  L<<Logger::Warning<<"PowerDNS recursor "<<VERSION<<" (C) 2001-2009 PowerDNS.COM BV ("<<__DATE__", "__TIME__;
 #ifdef __GNUC__
   L<<", gcc "__VERSION__;
 #endif // add other compilers here
@@ -1985,11 +1985,6 @@ int main(int argc, char **argv)
     ::arg().set("logging-facility","Facility to log messages as. 0 corresponds to local0")="";
 #endif
     ::arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;
-#ifndef WIN32
-    ::arg().set("socket-owner","Owner of socket")="";
-    ::arg().set("socket-group","Group of socket")="";
-    ::arg().set("socket-mode", "Permissions for socket")="";
-#endif
     
     ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
     ::arg().set("delegation-only","Which domains we only accept delegations from")="";
-- 
2.40.0