/* -*-c-*-
*
- * $Id: passphrase.c,v 1.6 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
*
* Reading of passphrases (Unix-specific)
*
/*----- Main code ---------------------------------------------------------*/
-/* --- @pconn@ --- *
+/* --- @passphrase_connect@ ---
*
- * Arguments: ---
+ * Arguments: @const char *sock@ = socket name to connect to, or null for
+ * default
*
* Returns: Zero if OK, nonzero if it failed
*
* Use: Attempts to connect to the passphrase pixie.
*/
-static int pconn(void)
+int passphrase_connect(const char *sock)
{
if (fd != -1)
- return (0);
- if (flags & f_fail)
- return (-1);
- if ((fd = pixie_open(0)) < 0) {
+ close(fd);
+ if ((fd = pixie_open(sock)) < 0) {
flags |= f_fail;
return (-1);
}
+ flags &= ~f_fail;
return (0);
}
+static int pconn(void)
+{
+ if (fd != -1)
+ return (0);
+ if (flags & f_fail)
+ return (-1);
+ return (passphrase_connect(0));
+}
+
/* --- @passphrase_read@ --- *
*
* Arguments: @const char *tag@ = pointer to passphrase tag string