浏览代码

PuTTY 0.73

Source commit: f9a543ae2503920497576c5e917a81ce90c1e2fa
Martin Prikryl 6 年之前
父节点
当前提交
addd95d8da

+ 1 - 1
source/putty/doc/plink.but

@@ -41,7 +41,7 @@ use Plink:
 
 \c Z:\sysosd>plink
 \c Plink: command-line connection utility
-\c Release 0.72
+\c Release 0.73
 \c Usage: plink [options] [user@]host [command]
 \c        ("host" can also be a PuTTY saved session name)
 \c Options:

+ 1 - 1
source/putty/doc/pscp.but

@@ -39,7 +39,7 @@ use PSCP:
 
 \c Z:\owendadmin>pscp
 \c PuTTY Secure Copy client
-\c Release 0.72
+\c Release 0.73
 \c Usage: pscp [options] [user@]host:source target
 \c        pscp [options] source [source...] [user@]host:target
 \c        pscp [options] -ls [user@]host:filespec

+ 2 - 2
source/putty/ssh2transport.c

@@ -314,8 +314,8 @@ static struct kexinit_algorithm *ssh2_kexinit_addalg(struct kexinit_algorithm
             list[i].name = name;
             return &list[i];
         }
-    assert(!"No space in KEXINIT list");
-    return NULL;
+
+    unreachable("Should never run out of space in KEXINIT list");
 }
 
 bool ssh2_common_filter_queue(PacketProtocolLayer *ppl)

+ 1 - 1
source/putty/sshcommon.c

@@ -980,7 +980,7 @@ bool ssh1_common_filter_queue(PacketProtocolLayer *ppl)
             ssh_remote_error(ppl->ssh,
                              "Remote side sent disconnect message:\n\"%.*s\"",
                              PTRLEN_PRINTF(msg));
-            pq_pop(ppl->in_pq);
+            /* don't try to pop the queue, because we've been freed! */
             return true;               /* indicate that we've been freed */
 
           case SSH1_MSG_DEBUG:

+ 1 - 2
source/putty/sshshare.c

@@ -1292,8 +1292,7 @@ void share_got_pkt_from_server(ssh_sharing_connstate *cs, int type,
         break;
 
       default:
-        assert(!"This packet type should never have come from ssh.c");
-        break;
+        unreachable("This packet type should never have come from ssh.c");
     }
 }
 

+ 6 - 35
source/putty/version.h

@@ -1,35 +1,6 @@
-/*
- * This header file provides the various versioning-related #defines
- * for a particular PuTTY build.
- *
- * When my automated build system does a full build, Buildscr
- * completely overwrites this file with information derived from the
- * circumstances and type of that build. The information _here_ is
- * default stuff used for local development runs of 'make'.
- */
-
-#define TEXTVER "Unidentified build"
-#define SSHVER "-Unidentified-Local-Build"
-#define BINARY_VERSION 0,0,0,0
-
-#ifndef SOURCE_COMMIT
-/*
- * git commit id from which this build was made. This is defined by
- * Buildscr for official builds - both source archives and prebuilt
- * binaries - in the course of overwriting this file as described
- * above. But we put it here under ifdef, so that it can also be
- * passed in on the command line for Unix local development builds,
- * which I treat specially because Unix developers - e.g. me - are
- * quite likely to run 'make install' straight out of their dev
- * directory so as to use the bleeding-edge code for day-to-day
- * running.
- *
- * Windows doesn't really need the same treatment, because the easiest
- * way to install a build properly on Windows is to run the installer,
- * and the easiest way to do that is to run Buildscr, which will
- * populate this field its own way. It's only the Unix automake build
- * where you might go straight from local 'make' to 'make install'
- * without going through Buildscr.
- */
-#define SOURCE_COMMIT "unavailable"
-#endif
+/* Generated by automated build script */
+#define RELEASE 0.73
+#define TEXTVER "Release 0.73"
+#define SSHVER "-Release-0.73"
+#define BINARY_VERSION 0,73,0,0
+#define SOURCE_COMMIT "745ed3ad3beaf52fc623827e770b3a068b238dd5"

+ 5 - 2
source/putty/windows/winnet.c

@@ -1140,7 +1140,6 @@ Socket *sk_newlistener(const char *srcaddr, int port, Plug *plug,
     char *errstr;
     NetSocket *ret;
     int retcode;
-    int on = 1;
 
     int address_family;
 
@@ -1197,7 +1196,11 @@ Socket *sk_newlistener(const char *srcaddr, int port, Plug *plug,
 
     ret->oobinline = false;
 
-    p_setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&on, sizeof(on));
+    {
+        BOOL on = true;
+        p_setsockopt(s, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
+                     (const char *)&on, sizeof(on));
+    }
 
 #ifndef NO_IPV6
         if (address_family == AF_INET6) {