diff --git a/Recipe b/Recipe index 69d8431f..bd622c09 100644 --- a/Recipe +++ b/Recipe @@ -303,9 +303,10 @@ puttygen : [U] cmdgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version pscp : [U] pscp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC psftp : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC -pageant : [U] uxpgnt pageant sshrsa sshpubk sshdes sshbn sshmd5 version - + tree234 misc sshaes sshsha sshdss sshsh256 sshsh512 sshecc - + conf uxsignal nocproxy nogss be_none x11fwd ux_x11 UXMISC LIBS +pageant : [U] uxpgnt uxagentc pageant sshrsa sshpubk sshdes sshbn sshmd5 + + version tree234 misc sshaes sshsha sshdss sshsh256 sshsh512 sshecc + + conf uxsignal nocproxy nogss be_none x11fwd ux_x11 uxcons + + UXMISC LIBS PuTTY : [MX] osxmain OSXTERM OSXMISC CHARSET U_BE_ALL NONSSH UXSSH + ux_x11 uxpty uxsignal testback putty.icns info.plist diff --git a/unix/uxpgnt.c b/unix/uxpgnt.c index 01f3c317..04a5857e 100644 --- a/unix/uxpgnt.c +++ b/unix/uxpgnt.c @@ -93,7 +93,6 @@ void uxsel_input_remove(int id) { } /* * More stubs. */ -void logevent(void *frontend, const char *string) {} void random_save_seed(void) {} void random_destroy_seed(void) {} void noise_ultralight(unsigned long data) {} @@ -102,8 +101,7 @@ int platform_default_i(const char *name, int def) { return def; } FontSpec *platform_default_fontspec(const char *name) { return fontspec_new(""); } Filename *platform_default_filename(const char *name) { return filename_from_str(""); } char *x_get_default(const char *key) { return NULL; } -void old_keyfile_warning(void) {} -void timer_change_notify(unsigned long next) {} +void log_eventlog(void *handle, const char *event) {} /* * Short description of parameters. @@ -131,10 +129,6 @@ void keylist_update(void) const char *const appname = "Pageant"; -char *platform_get_x_display(void) { - return dupstr(getenv("DISPLAY")); -} - static int time_to_die = FALSE; /* Stub functions to permit linking against x11fwd.c. These never get @@ -281,6 +275,10 @@ const char *display = NULL; void run_client(void) { + if (!agent_exists()) { + fprintf(stderr, "pageant: no agent running to talk to\n"); + exit(1); + } fprintf(stderr, "NYI\n"); exit(1); }