From 38e7635fc7ce672619b8e146a4d834b16ba269cc Mon Sep 17 00:00:00 2001
From: Peter Hamilton <peter.allen.hamilton@gmail.com>
Date: Thu, 1 Dec 2016 11:41:57 -0500
Subject: [PATCH] Fixes configuration settings override by default script
 values

This change fixes a bug with parameter handling when invoking
the server's main routine. The default values provided for the
parameters would override any configuration file settings if
the main routine was used to run the server. To fix this, the
default values were removed, requiring the user to explicitly
specify parameter values if they want them to override the
configuration settings. The parameter doc strings have been
updated to match these changes.

Fixes #217
---
 kmip/services/server/server.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/kmip/services/server/server.py b/kmip/services/server/server.py
index 6cf11d3..04ffab5 100644
--- a/kmip/services/server/server.py
+++ b/kmip/services/server/server.py
@@ -367,12 +367,12 @@ def build_argument_parser():
         "--hostname",
         action="store",
         type="str",
-        default="127.0.0.1",
+        default=None,
         dest="hostname",
         help=(
             "The host address the server will be bound to. A string "
             "representing either a hostname in Internet domain notation or "
-            "an IPv4 address. Defaults to '127.0.0.1'."
+            "an IPv4 address. Defaults to None."
         ),
     )
     parser.add_option(
@@ -380,12 +380,12 @@ def build_argument_parser():
         "--port",
         action="store",
         type="int",
-        default=5696,
+        default=None,
         dest="port",
         help=(
             "The port number the server will be bound to. An integer "
             "representing a port number. Recommended to be 5696 according to "
-            "the KMIP specification. Defaults to 5696."
+            "the KMIP specification. Defaults to None."
         ),
     )
     parser.add_option(
@@ -429,11 +429,12 @@ def build_argument_parser():
         "--auth_suite",
         action="store",
         type="str",
-        default="Basic",
+        default=None,
         dest="auth_suite",
         help=(
             "A string representing the type of authentication suite to use "
-            "when establishing TLS connections. Defaults to 'Basic'."
+            "when establishing TLS connections. Options include 'Basic' and "
+            "'TLS1.2'. Defaults to None."
         ),
     )
     parser.add_option(