From cfedcd9049232705bef9fff69d9607b0c935b696 Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Tue, 6 Sep 2016 22:24:46 -0400
Subject: [PATCH] Fix --debug.

Need to parse command line options before setting debugging stuff.
---
 src/pwmd.c | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/pwmd.c b/src/pwmd.c
index 40e0b1b5..7b1eda47 100644
--- a/src/pwmd.c
+++ b/src/pwmd.c
@@ -1911,21 +1911,6 @@ main (int argc, char *argv[])
   textdomain ("pwmd");
 #endif
 
-  if (setup_crypto ())
-    exit (EXIT_FAILURE);
-
-#ifdef WITH_GNUTLS
-  tls_level = tls_level == -1 ? 1 : tls_level;
-  gnutls_global_set_log_level (tls_level);
-  tls_fd = -1;
-  tls6_fd = -1;
-#endif
-  xmlMemSetup (xfree, xmalloc, xrealloc, str_dup);
-  xmlInitMemory ();
-  xmlInitGlobals ();
-  xmlInitParser ();
-  xmlXPathInit ();
-
   while ((opt = getopt_long (argc, argv, optstring, longopts, &optindex))
 	 != -1)
     {
@@ -2051,6 +2036,32 @@ main (int argc, char *argv[])
       exit (EXIT_SUCCESS);
     }
 
+  if (gpgme_level != -1)
+    {
+      char s[2] = { gpgme_level + '0', 0 };
+
+      if (getenv ("GPGME_DEBUG"))
+        log_write (_ ("Overriding GPGME_DEBUG environment with level %u!"),
+                   gpgme_level);
+
+      gpgme_set_global_flag ("debug", s);
+    }
+
+  if (setup_crypto ())
+    exit (EXIT_FAILURE);
+
+#ifdef WITH_GNUTLS
+  tls_level = tls_level == -1 ? 1 : tls_level;
+  gnutls_global_set_log_level (tls_level);
+  tls_fd = -1;
+  tls6_fd = -1;
+#endif
+  xmlMemSetup (xfree, xmalloc, xrealloc, str_dup);
+  xmlInitMemory ();
+  xmlInitGlobals ();
+  xmlInitParser ();
+  xmlXPathInit ();
+
   if (!homedir)
 #ifdef PWMD_HOMEDIR
     homedir = str_dup(PWMD_HOMEDIR);
@@ -2091,17 +2102,6 @@ main (int argc, char *argv[])
   if (mkdir (datadir, 0700) == -1 && errno != EEXIST)
     err (EXIT_FAILURE, "%s", datadir);
 
-  if (gpgme_level != -1)
-    {
-      char s[2] = { gpgme_level + '0', 0 };
-
-      if (getenv ("GPGME_DEBUG"))
-        log_write (_ ("Overriding GPGME_DEBUG environment with level %u!"),
-                   gpgme_level);
-
-      gpgme_set_global_flag ("debug", s);
-    }
-
   rc = gpgme_set_engine_info (GPGME_PROTOCOL_OpenPGP, NULL, datadir);
   xfree (datadir);
 
-- 
2.11.4.GIT