From 375676baa53b8683ebfff3d727a2e19caf38ed1b Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Thu, 26 Mar 2009 21:51:29 -0400 Subject: [PATCH] Renamed pwmd_tcp_connect() and pwmd_tcp_connect_async() to pwmd_ssh_connect() and pwmd_ssh_connect_async(). --- configure.ac | 4 ++-- src/libpwmd.c | 4 ++-- src/libpwmd.h.in | 10 +++++----- src/pwmc.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 53ad6f98..9d360427 100644 --- a/configure.ac +++ b/configure.ac @@ -51,8 +51,8 @@ AM_PATH_GPG_ERROR(,, AC_MSG_ERROR([Missing or incomplete libgpg-error installati AC_CHECK_PTH(, yes, yes, no, have_libpth=yes, have_libpth=no) AM_CONDITIONAL([WITH_LIBPTH], [test "x$have_libpth" = "xyes"]) -AC_ARG_ENABLE(tcp, AC_HELP_STRING([--disable-tcp], - [Disable TCP (ssh) support.]), WITH_TCP=no, +AC_ARG_ENABLE(ssh, AC_HELP_STRING([--disable-ssh], + [Disable SSH support.]), WITH_TCP=no, WITH_TCP=$enableval) if test "x$WITH_TCP" = "xyes"; then diff --git a/src/libpwmd.c b/src/libpwmd.c index cab680a4..915d2d13 100644 --- a/src/libpwmd.c +++ b/src/libpwmd.c @@ -522,7 +522,7 @@ static gpg_error_t _do_pwmd_tcp_connect_async(pwm_t *pwm, const char *host, return 0; } -gpg_error_t pwmd_tcp_connect_async(pwm_t *pwm, const char *host, int port, +gpg_error_t pwmd_ssh_connect_async(pwm_t *pwm, const char *host, int port, const char *identity, const char *user, const char *known_hosts) { return _do_pwmd_tcp_connect_async(pwm, host, port, identity, user, @@ -763,7 +763,7 @@ fail: return rc; } -gpg_error_t pwmd_tcp_connect(pwm_t *pwm, const char *host, int port, +gpg_error_t pwmd_ssh_connect(pwm_t *pwm, const char *host, int port, const char *identity, const char *user, const char *known_hosts) { return _do_pwmd_tcp_connect(pwm, host, port, identity, user, known_hosts, 0); diff --git a/src/libpwmd.h.in b/src/libpwmd.h.in index e0fc4229..e1c1b8d9 100644 --- a/src/libpwmd.h.in +++ b/src/libpwmd.h.in @@ -239,13 +239,13 @@ gpg_error_t pwmd_connect(pwm_t *pwm, const char *socket_path) __attribute__ ((wa * an error in which case 'error' is set to an error code which may be * described by pwmd_strerror(). */ -gpg_error_t pwmd_tcp_connect(pwm_t *pwm, const char *hostname, int port, const char *identity, const char *user, const char *known_hosts) __attribute__ ((warn_unused_result)); +gpg_error_t pwmd_ssh_connect(pwm_t *pwm, const char *hostname, int port, const char *identity, const char *user, const char *known_hosts) __attribute__ ((warn_unused_result)); -/* Like pwmd_tcp_connect() but this function wont block while doing DNS +/* Like pwmd_ssh_connect() but this function wont block while doing DNS * lookups and connecting. You should call pwmd_process() only when this * function succeeds (see pwmd_process() for more information). */ -gpg_error_t pwmd_tcp_connect_async(pwm_t *pwm, const char *hostname, int port, +gpg_error_t pwmd_ssh_connect_async(pwm_t *pwm, const char *hostname, int port, const char *identity, const char *user, const char *known_hosts) __attribute__ ((warn_unused_result)); /* Retrieve the SSH server SHA1 host key. The result must be freed with @@ -260,7 +260,7 @@ gpg_error_t pwmd_get_hostkey_async(pwm_t *pwm, const char *hostname, int port) _ * pwmd_process(). Returns 0 on success or an error code. * * Note that this FD is the assuan context FD and not set during the TCP - * connection phase when used with pwmd_tcp_connect_async() or + * connection phase when used with pwmd_ssh_connect_async() or * pwmd_get_hostkey_async(). You must wait until pwmd_process() returns * ASYNC_DONE (then check for an error) and then call this function. */ @@ -329,7 +329,7 @@ gpg_error_t pwmd_open_async(pwm_t *pwm, const char *filename) __attribute__ ((wa ; /* - * When the asynchronous commands pwmd_tcp_connect_async(), pwmd_open_async() + * When the asynchronous commands pwmd_ssh_connect_async(), pwmd_open_async() * or pwmd_save_async() succeed (return 0 or non-NULL), this function * should be called until ASYNC_DONE is returned. It will return ASYNC_PROCESS * when the command is still running. After ASYNC_DONE is returned, any error diff --git a/src/pwmc.c b/src/pwmc.c index e415db39..5153a043 100644 --- a/src/pwmc.c +++ b/src/pwmc.c @@ -359,7 +359,7 @@ int main(int argc, char *argv[]) exit(EXIT_SUCCESS); } - error = pwmd_tcp_connect_async(pwm, host, port, ident, username, known_hosts); + error = pwmd_ssh_connect_async(pwm, host, port, ident, username, known_hosts); if (error) goto done; @@ -389,7 +389,7 @@ int main(int argc, char *argv[]) exit(EXIT_SUCCESS); } - error = pwmd_tcp_connect(pwm, host, port, ident, username, known_hosts); + error = pwmd_ssh_connect(pwm, host, port, ident, username, known_hosts); if (error) goto done; -- 2.11.4.GIT