From 5e13191bf1009db9c62943e8c78a70e5b9c312c7 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sun, 19 Apr 2009 18:30:57 -0400 Subject: [PATCH] Renamed socket:// to local://. --- doc/libpwmd.3 | 16 ++++++++-------- doc/pwmc.1.in | 4 ++-- src/libpwmd.c | 6 +++--- src/libpwmd.h.in | 12 ++++++------ src/pwmc.c | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/doc/libpwmd.3 b/doc/libpwmd.3 index e778de8b..639afba4 100644 --- a/doc/libpwmd.3 +++ b/doc/libpwmd.3 @@ -1,4 +1,4 @@ -.TH "libpwmd.h" 3 "17 Apr 2009" "Version 6.0.0" "libpwmd" \" -*- nroff -*- +.TH "libpwmd.h" 3 "19 Apr 2009" "Version 6.0.0" "libpwmd" \" -*- nroff -*- .ad l .nh .SH NAME @@ -188,7 +188,7 @@ The following example will list the element tree of the data file specified in t .RI "enum \fBpwmd_ip_version_t\fP { \fBPWMD_IP_ANY\fP, \fBPWMD_IPV4\fP, \fBPWMD_IPV6\fP }" .br .ti -1c -.RI "enum \fBpwmd_socket_t\fP { \fBPWMD_SOCKET_UDS\fP, \fBPWMD_SOCKET_SSH\fP }" +.RI "enum \fBpwmd_socket_t\fP { \fBPWMD_SOCKET_LOCAL\fP, \fBPWMD_SOCKET_SSH\fP }" .br .ti -1c .RI "enum \fBpwmd_pinentry_t\fP { \fBPWMD_PINENTRY_OPEN\fP, \fBPWMD_PINENTRY_OPEN_FAILED\fP, \fBPWMD_PINENTRY_SAVE\fP, \fBPWMD_PINENTRY_SAVE_CONFIRM\fP, \fBPWMD_PINENTRY_DEFAULT\fP, \fBPWMD_PINENTRY_CLOSE\fP }" @@ -602,8 +602,8 @@ For use with \fBpwmd_socket_type()\fP. \fBEnumerator: \fP .in +1c .TP -\fB\fIPWMD_SOCKET_UDS \fP\fP -A UNIX domain socket. +\fB\fIPWMD_SOCKET_LOCAL \fP\fP +A local domain socket. .TP \fB\fIPWMD_SOCKET_SSH \fP\fP An SSH connection over a TCP socket. @@ -745,7 +745,7 @@ Establish a connection by parsing a URL. This allows for connecting to a pwmd server by parsing the given URL string. Whether the connection is to a remote or local server depends on the contents: .PP .nf - socket://[path/to/local/socket] + local://[path/to/local/socket] or @@ -754,7 +754,7 @@ This allows for connecting to a pwmd server by parsing the given URL string. Whe .fi .PP .PP -The parameters in square brackets are optional and if not specified then defaults will be used. If neither socket specification is matched, the \fIurl\fP is assumed to be a socket://. +The parameters in square brackets are optional and if not specified then defaults will be used. If neither socket specification is matched, the \fIurl\fP is assumed to be a local://. .PP \fBParameters:\fP .RS 4 @@ -786,7 +786,7 @@ Establish a connection by parsing a URL (asynchronously). This allows for connecting to a pwmd server by parsing the given URL string. Whether the connection is to a remote or local server depends on the contents: .PP .nf - socket://[path/to/local/socket] + local://[path/to/local/socket] or @@ -795,7 +795,7 @@ This allows for connecting to a pwmd server by parsing the given URL string. Whe .fi .PP .PP -The parameters in square brackets are optional and if not specified then defaults will be used. If neither socket specification is matched, the \fIurl\fP is assumed to be a socket://. +The parameters in square brackets are optional and if not specified then defaults will be used. If neither socket specification is matched, the \fIurl\fP is assumed to be a local://. .PP \fBpwmd_process()\fP should be called until the command completes. .PP diff --git a/doc/pwmc.1.in b/doc/pwmc.1.in index d8ea61f2..9260ca1a 100644 --- a/doc/pwmc.1.in +++ b/doc/pwmc.1.in @@ -42,7 +42,7 @@ See .TP .I "\--socket " -Connect to the specified local UNIX domain socket. The default is +Connect to the specified local domain socket. The default is \fB~/.pwmd/socket\fR. .TP @@ -229,7 +229,7 @@ command line option: The .BR socat (1) command can be replaced with any utility that can read from stdin and write -to a unix domain socket, and vice-versa. +to a local domain socket, and vice-versa. .SH PINENTRY diff --git a/src/libpwmd.c b/src/libpwmd.c index e9d24f4e..71550ba8 100644 --- a/src/libpwmd.c +++ b/src/libpwmd.c @@ -186,7 +186,7 @@ static gpg_error_t _pwmd_connect_url(pwm_t *pwm, const char *url, int async) if (!pwm) return GPG_ERR_INV_ARG; - if (!p || !strncmp(p, "socket://", 9)) { + if (!p || !strncmp(p, "local://", 9)) { if (p) p += 9; @@ -1231,9 +1231,9 @@ gpg_error_t pwmd_socket_type(pwm_t *pwm, pwmd_socket_t *result) return GPG_ERR_INV_STATE; #ifdef WITH_TCP - *result = pwm->tcp_conn ? PWMD_SOCKET_SSH : PWMD_SOCKET_UDS; + *result = pwm->tcp_conn ? PWMD_SOCKET_SSH : PWMD_SOCKET_LOCAL; #else - *result = PWMD_SOCKET_UDS; + *result = PWMD_SOCKET_LOCAL; #endif return 0; } diff --git a/src/libpwmd.h.in b/src/libpwmd.h.in index 7f960141..d89d9147 100644 --- a/src/libpwmd.h.in +++ b/src/libpwmd.h.in @@ -249,8 +249,8 @@ typedef struct { * For use with \ref pwmd_socket_type(). */ typedef enum { - /*! A UNIX domain socket. */ - PWMD_SOCKET_UDS, + /*! A local domain socket. */ + PWMD_SOCKET_LOCAL, /*! An SSH connection over a TCP socket. */ PWMD_SOCKET_SSH @@ -548,7 +548,7 @@ gpg_error_t pwmd_ssh_connect_async(pwm_t *pwm, const char *host, int port, * string. Whether the connection is to a remote or local server depends on * the contents: * \code - * socket://[path/to/local/socket] + * local://[path/to/local/socket] * * or * @@ -557,7 +557,7 @@ gpg_error_t pwmd_ssh_connect_async(pwm_t *pwm, const char *host, int port, * * The parameters in square brackets are optional and if not specified then * defaults will be used. If neither socket specification is matched, the - * \a url is assumed to be a socket://. + * \a url is assumed to be a local://. * * \param pwm A handle. * \param url The string to parse. @@ -575,7 +575,7 @@ gpg_error_t pwmd_connect_url(pwm_t *pwm, const char *url) * string. Whether the connection is to a remote or local server depends on * the contents: * \code - * socket://[path/to/local/socket] + * local://[path/to/local/socket] * * or * @@ -584,7 +584,7 @@ gpg_error_t pwmd_connect_url(pwm_t *pwm, const char *url) * * The parameters in square brackets are optional and if not specified then * defaults will be used. If neither socket specification is matched, the - * \a url is assumed to be a socket://. + * \a url is assumed to be a local://. * * \process * diff --git a/src/pwmc.c b/src/pwmc.c index ec93da06..0d1be4ea 100644 --- a/src/pwmc.c +++ b/src/pwmc.c @@ -159,7 +159,7 @@ static void usage(const char *pn, int status) fprintf(status == EXIT_FAILURE ? stderr : stdout, N_( "\n" "A url string (specified with --url) may be in the form of:\n" - " socket://[path/to/socket]\n" + " local://[path/to/socket]\n" #ifdef WITH_TCP " ssh[46]://[username@]hostname[:port],identity,known_hosts\n" #endif -- 2.11.4.GIT