From e99a14fb6fd4b193c2b6a3e3ca61d1b26a6d96f9 Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Mon, 24 Jun 2013 20:22:37 -0400
Subject: [PATCH] Add configure option --with-pwmd-socket.

To specify the default connecting socket.
---
 configure.ac  | 16 ++++++++++++++++
 src/libpwmd.c |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/configure.ac b/configure.ac
index 6ed7bfa5..d62c3d8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,15 @@ if test "x$WITH_GNUTLS" = "xyes"; then
 fi
 AM_CONDITIONAL(WITH_GNUTLS, [test "x$WITH_GNUTLS" = "xyes"])
 
+# Default pwmd socket.
+AC_ARG_WITH(pwmd_socket, AC_HELP_STRING([--with-pwmd-socket=PATH],
+	      [Default pwmd socket (~/.pwmd/socket)]),
+	      pwmd_socket="$withval", pwmd_socket=)
+if test x"$pwmd_socket" != "x"; then
+   AC_DEFINE_UNQUOTED(DEFAULT_PWMD_SOCKET, ["$pwmd_socket"],
+                      [Default pwmd socket (~/.pwmd/socket).])
+fi
+
 dnl Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
@@ -263,6 +272,13 @@ echo "    Ssh: $WITH_SSH"
 echo "    GnuTLS: $WITH_GNUTLS"
 echo "    Local pinentry: $WITH_PINENTRY"
 echo "    Pinentry location: $pinentry"
+
+if test x"$pwmd_socket" != "x"; then
+echo "    Default pwmd socket: $pwmd_socket"
+else
+echo "    Default pwmd socket: ~/.pwmd/socket"
+fi
+
 echo "    Local passphrase quality checking: $WITH_QUALITY"
 echo "    Crack dictionary: $crackdict"
 echo "    Memory debug: ${ac_cv_sys_mem_debug}"
diff --git a/src/libpwmd.c b/src/libpwmd.c
index f423249f..99535507 100644
--- a/src/libpwmd.c
+++ b/src/libpwmd.c
@@ -402,6 +402,10 @@ pwmd_connect (pwm_t * pwm, const char *url, ...)
     {
       if (p)
 	p += 7;
+#ifdef DEFAULT_PWMD_SOCKET
+      else
+	p = DEFAULT_PWMD_SOCKET;
+#endif
       rc = connect_uds (pwm, p);
     }
   else if (!strncmp (p, "ssh://", 6) || !strncmp (p, "ssh6://", 7) ||
-- 
2.11.4.GIT