From 9d9a34e7f8f912891ef26150db3daea935f734eb Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sat, 28 Mar 2009 21:40:34 -0400 Subject: [PATCH] A few compile time conditional fixes. --- src/libpwmd.c | 2 +- src/pwmc.c | 2 ++ src/types.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libpwmd.c b/src/libpwmd.c index b772c3e5..ab975d65 100644 --- a/src/libpwmd.c +++ b/src/libpwmd.c @@ -1060,9 +1060,9 @@ static pwmd_async_t reset_async(pwm_t *pwm, int done) pwm->state = ASYNC_INIT; pwm->cmd = ASYNC_CMD_NONE; pwm->ntries = 0; -#ifdef WITH_PINENTRY pwm->is_open_cmd = 0; +#ifdef WITH_PINENTRY if (pwm->nb_fd != -1) { close(pwm->nb_fd); pwm->nb_fd = -1; diff --git a/src/pwmc.c b/src/pwmc.c index d950e129..2cc3f37e 100644 --- a/src/pwmc.c +++ b/src/pwmc.c @@ -379,6 +379,7 @@ int main(int argc, char *argv[]) } } +#ifdef WITH_TCP if (host && !get && (!known_hosts || !ident)) { pwmd_free(password); usage(argv[0], EXIT_FAILURE); @@ -388,6 +389,7 @@ int main(int argc, char *argv[]) pwmd_free(password); usage(argv[0], EXIT_FAILURE); } +#endif filename = argv[optind]; pwmd_init(); diff --git a/src/types.h b/src/types.h index 6c174879..1602e71d 100644 --- a/src/types.h +++ b/src/types.h @@ -75,11 +75,11 @@ struct pwm_s { assuan_context_t pctx; gpg_error_t pin_error; int nb_fd; /* for pwmd_open/save_async2(). */ + int pin_try; #endif int is_open_cmd; int use_pinentry; // this is for a local pinentry, not pwmd pinentry. int pinentry_tries; - int pin_try; int ntries; char *pinentry_path; char *pinentry_tty; -- 2.11.4.GIT