version.h file uses WIN32_FIXME and ssh.exe client shows build & date

version.h file retains non win32 original code as it should; feature
added for win32 for ssh.exe to show build and date like sshd.exe rather
than a fixed date we had inserted before in version.h file.
This commit is contained in:
quamrulmina 2015-10-31 17:47:41 -05:00
parent e918f7c731
commit 6c4fc9c4c5
2 changed files with 10 additions and 1 deletions

5
ssh.c
View File

@ -865,8 +865,13 @@ main(int ac, char **av)
} }
break; break;
case 'V': case 'V':
#ifndef WIN32_FIXME
fprintf(stderr, "%s, %s\n", fprintf(stderr, "%s, %s\n",
SSH_RELEASE, SSH_RELEASE,
#else
fprintf(stderr, "%s %s, %s\n",
SSH_RELEASE, __DATE__ " " __TIME__ ,
#endif
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL
SSLeay_version(SSLEAY_VERSION) SSLeay_version(SSLEAY_VERSION)
#else #else

View File

@ -2,5 +2,9 @@
#define SSH_VERSION "OpenSSH_7.1" #define SSH_VERSION "OpenSSH_7.1"
#define SSH_PORTABLE "p1 Microsoft Pragma Win32 port Oct 7 2015" #ifndef WIN32_FIXME
#define SSH_PORTABLE "p1"
#else
#define SSH_PORTABLE "p1 Microsoft Win32 port"
#endif
#define SSH_RELEASE SSH_VERSION SSH_PORTABLE #define SSH_RELEASE SSH_VERSION SSH_PORTABLE