/* -*-c-*-
*
- * $Id: passphrase.c,v 1.3 2000/12/06 20:33:27 mdw Exp $
+ * $Id$
*
* Reading of passphrases (Unix-specific)
*
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: passphrase.c,v $
- * Revision 1.3 2000/12/06 20:33:27 mdw
- * Make flags be macros rather than enumerations, to ensure that they're
- * unsigned.
- *
- * Revision 1.2 2000/06/17 11:49:37 mdw
- * New pixie protocol allowing application to request passphrases and send
- * them to the pixie.
- *
- * Revision 1.1 1999/12/22 15:58:20 mdw
- * Portable interface to reading passphrases.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include <errno.h>
/*----- 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
char b[1024];
DRESET(&d);
dstr_putf(&d, "Verify passphrase %s: ", tag);
- if (pixie_getpass(d.buf, b, sizeof(b)) ||
- strcmp(b, buf) != 0) {
+ if (pixie_getpass(d.buf, b, sizeof(b)) || strcmp(b, buf) != 0) {
memset(b, 0, sizeof(b));
goto fail;
}