merge of '5fdf69ca60d1683cdd9f4c2595134bed26394834'

     and '6b61c50f4cf888bea302ac8fcf5dbb573b443251'

--HG--
extra : convert_revision : b1dd3b94e60a07a176dba2b035ac79968595990a

1 files changed, 1 insertions, 0 deletions

diff --git a/auth.h b/auth.h
index 7e83247..661265a 100644
--- a/auth.h
+++ b/auth.h
@@ -52,6 +52,7 @@ void cli_pubkeyfail();
 void cli_auth_password();
 int cli_auth_pubkey();
 void cli_auth_interactive();
+char* getpass_or_cancel(char* prompt);
 
 
 #define MAX_USERNAME_LEN 25 /* arbitrary for the moment */