diff --git a/0.73_My_PuTTY/ssh2userauth.c b/0.73_My_PuTTY/ssh2userauth.c index b51d49c..d216585 100644 --- a/0.73_My_PuTTY/ssh2userauth.c +++ b/0.73_My_PuTTY/ssh2userauth.c @@ -22,7 +22,6 @@ #include "kitty.h" void SetSSHConnected( int flag ); char bufpass[1024]=""; -extern int is_backend_connected ; #endif struct ssh2_userauth_state { @@ -248,7 +247,7 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl) PktIn *pktin; #ifdef MOD_RECONNECT -is_backend_connected = 1 ; + SetSSHConnected(0); #endif ssh2_userauth_filter_queue(s); /* no matter why we were called */ @@ -891,7 +890,6 @@ is_backend_connected = 1 ; s->publickey_comment), false); #ifdef MOD_PERSO - //SetSSHConnected(1); if( strlen(ManagePassPhrase(NULL))>0 ) { char *p = ManagePassPhrase(NULL) ; bufchain bc; diff --git a/0.73_My_PuTTY/version.h b/0.73_My_PuTTY/version.h index ba5c06a..f43c811 100644 --- a/0.73_My_PuTTY/version.h +++ b/0.73_My_PuTTY/version.h @@ -1,5 +1,5 @@ #define RELEASE 0.73 #define TEXTVER "Release 0.73" #define SSHVER "-Release-0.73" -#define BINARY_VERSION 0,73,2,3 +#define BINARY_VERSION 0,73,2,4 #define SOURCE_COMMIT "unavailable" diff --git a/0.73_My_PuTTY/windows/MAKEFILE.MINGW b/0.73_My_PuTTY/windows/MAKEFILE.MINGW index 1e53992..5ad35bf 100644 --- a/0.73_My_PuTTY/windows/MAKEFILE.MINGW +++ b/0.73_My_PuTTY/windows/MAKEFILE.MINGW @@ -2133,21 +2133,21 @@ cross: make -e TOOLPATH=/usr/bin/i686-w64-mingw32- -f MAKEFILE.MINGW portable cp putty.exe putty_nocompress.exe upx --best --compress-icons=2 --compress-exports=0 putty.exe putty_portable.exe putty_nocompress.exe - mv putty.exe /build/kitty.exe - mv putty_portable.exe /build/kitty_portable.exe - mv putty_nocompress.exe /build/kitty_nocompress.exe - mv plink.exe /build/klink.exe - mv pscp.exe /build/kscp.exe - mv psftp.exe /build/ksftp.exe - mv pageant.exe /build/kageant.exe - mv puttygen.exe /build/kittygen.exe + mv putty.exe /builds/kitty.exe + mv putty_portable.exe /builds/kitty_portable.exe + mv putty_nocompress.exe /builds/kitty_nocompress.exe + mv plink.exe /builds/klink.exe + mv pscp.exe /builds/kscp.exe + mv psftp.exe /builds/ksftp.exe + mv pageant.exe /builds/kageant.exe + mv puttygen.exe /builds/kittygen.exe rm *.o cross64: sed -i 's#^typedef enum _WTS_VIRTUAL_CLASS #// typedef enum _WTS_VIRTUAL_CLASS #' window.c make -e TOOLPATH=/usr/bin/x86_64-w64-mingw32- -f MAKEFILE.MINGW putty.exe || /usr/bin/x86_64-w64-mingw32-gcc -o kitty64.exe *.o ../../base64/base64_64.a ../../bcrypt/bcrypt_64.a ../../blocnote/notepad_64.a ../../jpeg/libjpeg_64.a ../../md5/MD5check_64.a ../../mini/mini_64.a ../../regex/libregex_64.a -ladvapi32 -lcomdlg32 -lgdi32 -limm32 -lpsapi -lole32 -lshell32 -luser32 -lwsock32 -lwtsapi32 -mwindows upx --best --compress-icons=2 --compress-exports=0 kitty64.exe - mv kitty64.exe /build/kitty64.exe + mv kitty64.exe /builds/kitty64.exe 9bis: putty.exe putty_portable.exe plink.exe pscp.exe psftp.exe pageant.exe puttygen.exe diff --git a/0.73_My_PuTTY/windows/version_minor.txt b/0.73_My_PuTTY/windows/version_minor.txt index 00750ed..b8626c4 100644 --- a/0.73_My_PuTTY/windows/version_minor.txt +++ b/0.73_My_PuTTY/windows/version_minor.txt @@ -1 +1 @@ -3 +4 diff --git a/0.73_My_PuTTY/windows/window.c b/0.73_My_PuTTY/windows/window.c index a8c3cb5..9a0871c 100644 --- a/0.73_My_PuTTY/windows/window.c +++ b/0.73_My_PuTTY/windows/window.c @@ -1551,7 +1551,7 @@ TrayIcone.hWnd = hwnd ; } #endif // Lancement du timer auto-command pour les connexions non SSH - if(conf_get_int(conf,CONF_protocol) != PROT_SSH) is_backend_connected = 1 ; + if(conf_get_int(conf,CONF_protocol) != PROT_SSH) { is_backend_connected = 1 ; } SetTimer(hwnd, TIMER_INIT, init_delay, NULL) ; if( IniFileFlag == SAVEMODE_REG ) { @@ -3207,7 +3207,7 @@ else if((UINT_PTR)wParam == TIMER_INIT) { // Initialisation // On charge automatiquement au démarrage (-edit) un fichier dans l'editeur connecté if( !PuttyFlag ) if( LoadFile!=NULL ) { RunPuttyEd( hwnd, LoadFile ) ; free( LoadFile ) ; LoadFile = NULL ; } - + if( (conf_get_int(conf,CONF_protocol) == PROT_SSH) && (!is_backend_connected) ) break ; // On sort si en SSH on n'est pas connecte // Lancement d'une (ou plusieurs separees par \\n) commande(s) automatique(s) a l'initialisation