From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Wed, 28 Dec 2011 12:17:39 +0000 (+0100)
Subject: [1510] Remove the -u flag from resolver
X-Git-Tag: trac2351_base~300^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c80cfde85d88b2d8846197075ff22eed2bca306;p=thirdparty%2Fkea.git

[1510] Remove the -u flag from resolver
---

diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am
index 3f5f04952b..faa166f63d 100644
--- a/src/bin/resolver/Makefile.am
+++ b/src/bin/resolver/Makefile.am
@@ -49,7 +49,6 @@ pkglibexec_PROGRAMS = b10-resolver
 b10_resolver_SOURCES = resolver.cc resolver.h
 b10_resolver_SOURCES += resolver_log.cc resolver_log.h
 b10_resolver_SOURCES += response_scrubber.cc response_scrubber.h
-b10_resolver_SOURCES += $(top_builddir)/src/bin/auth/change_user.h
 b10_resolver_SOURCES += $(top_builddir)/src/bin/auth/common.h
 b10_resolver_SOURCES += main.cc
 
@@ -70,7 +69,6 @@ b10_resolver_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/cache/libcache.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/resolve/libresolve.la
-b10_resolver_LDADD += $(top_builddir)/src/bin/auth/change_user.o
 b10_resolver_LDFLAGS = -pthread
 
 # TODO: config.h.in is wrong because doesn't honor pkgdatadir
diff --git a/src/bin/resolver/b10-resolver.xml b/src/bin/resolver/b10-resolver.xml
index 75cced71d1..d8f5c459f1 100644
--- a/src/bin/resolver/b10-resolver.xml
+++ b/src/bin/resolver/b10-resolver.xml
@@ -44,7 +44,6 @@
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>b10-resolver</command>
-      <arg><option>-u <replaceable>username</replaceable></option></arg>
       <arg><option>-v</option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -85,20 +84,6 @@
 
     <variablelist>
 
-      <varlistentry>
-        <term><option>-u <replaceable>username</replaceable></option></term>
-        <listitem>
-	  <para>
-	    The user name of the <command>b10-resolver</command> daemon.
-	    If specified, the daemon changes the process owner to the
-	    specified user.
-	    The <replaceable>username</replaceable> must be either a
-	    valid numeric user ID or a valid user name.
-	    By default the daemon runs as the user who invokes it.
-	  </para>
-        </listitem>
-      </varlistentry>
-
 <!-- TODO: this needs to be fixed as -v on command line
 should imply stdout or stderr output also -->
 <!-- TODO: can this -v be overidden by configuration or bindctl? -->
diff --git a/src/bin/resolver/main.cc b/src/bin/resolver/main.cc
index 79146da928..d563e08550 100644
--- a/src/bin/resolver/main.cc
+++ b/src/bin/resolver/main.cc
@@ -43,7 +43,6 @@
 
 #include <xfr/xfrout_client.h>
 
-#include <auth/change_user.h>
 #include <auth/common.h>
 
 #include <resolver/spec_config.h>
@@ -93,7 +92,6 @@ my_command_handler(const string& command, ConstElementPtr args) {
 void
 usage() {
     cerr << "Usage:  b10-resolver [-u user] [-v]" << endl;
-    cerr << "\t-u: change process UID to the specified user" << endl;
     cerr << "\t-v: verbose output" << endl;
     exit(1);
 }
@@ -103,13 +101,9 @@ int
 main(int argc, char* argv[]) {
     bool verbose = false;
     int ch;
-    const char* uid = NULL;
 
     while ((ch = getopt(argc, argv, "u:v")) != -1) {
         switch (ch) {
-        case 'u':
-            uid = optarg;
-            break;
         case 'v':
             verbose = true;
             break;
@@ -211,11 +205,6 @@ main(int argc, char* argv[]) {
                                              my_command_handler);
         LOG_DEBUG(resolver_logger, RESOLVER_DBG_INIT, RESOLVER_CONFIG_CHANNEL);
 
-        // FIXME: This does not belong here, but inside Boss
-        if (uid != NULL) {
-            changeUser(uid);
-        }
-
         resolver->setConfigSession(config_session);
         // Install all initial configurations.  If loading configuration
         // fails, it will be logged, but we start the server anyway, giving