imported ckdaily 20110706 (9.0.301 prerelease)

diff --git a/ck_ssl.c b/ck_ssl.c
index 5f5e1fa..428fb7c 100644 (file)
--- a/ck_ssl.c
+++ b/ck_ssl.c
@@ -2457,7 +2457,7 @@ ssl_get_dNSName(ssl) SSL * ssl;
             if (gen->type == GEN_DNS) {
                 if (!gen->d.ia5 || !gen->d.ia5->length)
                  break;
-                if (strlen(gen->d.ia5->data) != gen->d.ia5->length) {
+                if (strlen((char *)gen->d.ia5->data) != gen->d.ia5->length) {
                     /* Ignoring IA5String containing null character */
                     continue;
                 }
@@ -2770,7 +2770,7 @@ tls_get_SAN_objs(SSL * ssl, int type)
             if ((gen->type | V_ASN1_CONTEXT_SPECIFIC) == (type | V_ASN1_CONTEXT_SPECIFIC)) {
                 if (!gen->d.ia5 || !gen->d.ia5->length)
                  break;
-                if (strlen(gen->d.ia5->data) != gen->d.ia5->length) {
+                if (strlen((char *)gen->d.ia5->data) != gen->d.ia5->length) {
                     /* Ignoring IA5String containing null character */
                     continue;
                 }

diff --git a/ckc299.txt b/ckc299.txt
index f7239f2..10de5d5 100644 (file)
--- a/ckc299.txt
+++ b/ckc299.txt
@@ -7710,7 +7710,7 @@ SSLLIB.  makefile, 18 Jun 2011.
 More important he knew how to force gcc to load the right header files for
 OpenSSL 1.0.0d (by using '-isystem' rather than '-I').  Previously it was
 using the 0.9.8r header files but linking with the 1.0.0d libraries.  This
-is not in the sources, it's done in the 'make' command, e.g.:
+is not in the sources or makefile; it's done when giving the 'make' command:
 
   export PATH=/usr/bin:$PATH
   export SSLINC=-isystem/usr/include
@@ -7735,7 +7735,8 @@ transfer the gzipped C-Kermit tarball.  Kermit to the rescue.  19 Jun 2011.
 Transferred the tarball over serial ports to SCO OSR5.0.5 at 38.4Kbps, the
 highest speed supported, 12 minutes, no errors, 3300cps.  Unpack, make
 sco32v505udk, OK.  Also built the TCP/IP version and it almost made an
-outbound connection, but only once.  19 Jun 2011.
+outbound connection, but only once (not a Kermit program but something with
+the TCP/IP stack).  19 Jun 2011.
 
 Ditto for Solaris 2.6/i386, except 57.6Kbps, 4K-byte packets, no problem.
 Solaris 8/i386, ditto.  19 Jun 2011.
@@ -7767,8 +7768,8 @@ SCO OpenServer 5.0.7  i386   32   sco32v507net     2246792  With TCP/IP
 Checked current code on RHEL4, found that my GSSAPI-lib finding makefile
 target didn't look in enough places; added some more.  makefile, 21 Jun 2011.
 
-Got reports back on HPUX from Peter Eichhorn, almost all good on HP-UX 8, 9,
-10, and 11.  21 Jun 2011.
+Got reports back on HPUX from Peter Eichhorn, almost all good on HP-UX 7, 8,
+9, 10, and 11.  21-22 Jun 2011.
 
 Got access to Debian 5.0 and 7-to-be ("Wheezy/Sid").  Regular 'make linux' is
 OK in Debian 5, but in 7 can't find crypt, res_search, or dn_expand; had
@@ -7783,16 +7784,33 @@ linux+krb5+krb4', which failed because of missing DES functions.  Tried
 'make linux+krb5+krb4 KFLAGS=-UCK_DES', but that fails too, even though it
 doesn't fail for Kerberos 5 alone, so probably some Krb4 code is making
 unguarded calls to the DES routines.  What is really needed is a way to
-completely strip all DES references from any given build.  21 Jun 2011.
+completely strip all DES references from any given build, code and makefile,
+a big deal.  21 Jun 2011.
 
------------------------------------
-To check:
+Fixed some typos in COPYING.TXT (noticed by Ian Beckwith).  24 Jun 2011.
 
-after logging out from "ssh jezebel":
-(/home/fdc/) C-Kermit>ssh jezebel
- Closing connection
-Sorry, network type not supported
-(/home/fdc/) C-Kermit> # This happens in Linux but not Solaris
+Got access to perhaps the last living 4.3BSD VAX system.  It doesn't have
+SEEK_CUR so I had to #ifdef out the \fpicture() function.  Aside from that,
+no problems.  ckuus4.c, 24 Jun 2011.
+
+I had been wanting the S-Expression (ROUND x) to allow a second argument n,
+which, if given, tells where the rounding should occur.  If n is positive,
+the number is rounded to n decimal places.  If zero, it is rounded to the
+nearest integet.  If positive, the number is rounded to the nearest power of
+10; e.g. -2 means "to the nearest hundred".  If ROUND is used as before,
+with one argument, it works as before.  ckclib.c, ckuus3.c, 25 Jun 2011.
+
+From Arthur Marsh, a few more directories to test for libresolv in Linux.
+makefile, 26 Jun 2011.
+
+From Martin Vorlaender, a fix for the VMS file-transfer display and
+statistics, a place where a file length wasn't being cast to CK_OFF_T
+in zchki().  ckvfio.c, 28 Jun 2011.
+
+Updated version to 9.0.300 and removed the Beta designation.
+ckcmai.c, makefile, 28 Jun 2011.
+
+--- C-Kermit 9.0.300 ---
 
 ---------------------------------
 ***************************

diff --git a/ckcmai.c b/ckcmai.c
index 6c31421..d5725e3 100644 (file)
--- a/ckcmai.c
+++ b/ckcmai.c
@@ -1,5 +1,5 @@
-#define EDITDATE  "30 Jun 2011"                /* Last edit date dd mmm yyyy */
-#define EDITNDATE "20110630"           /* Keep them in sync */
+#define EDITDATE  "6 Jul 2011"         /* Last edit date dd mmm yyyy */
+#define EDITNDATE "20110706"           /* Keep them in sync */
 /* Tue Jun 28 16:54:15 2011 */
 
 /* ckcmai.c - Main program for C-Kermit plus some miscellaneous functions */
@@ -40,8 +40,8 @@ char * ck_cryear = "2011";            /* C-Kermit copyright year */
 
 #ifndef BETATEST
 #ifndef OS2                             /* UNIX, VMS, etc... (i.e. C-Kermit) */
-char *ck_s_test = "";                  /* "Dev","Alpha","Beta","RC", or "" */
-char *ck_s_tver = "";                  /* Test version number or "" */
+char *ck_s_test = "Beta";              /* "Dev","Alpha","Beta","RC", or "" */
+char *ck_s_tver = "01";                        /* Test version number or "" */
 #else  /* OS2 */
 char *ck_s_test = "";                  /* (i.e. K95) */
 char *ck_s_tver = "";
@@ -64,7 +64,7 @@ char *ck_s_date = EDITDATE;           /* See top */
 char *buildid = EDITNDATE;             /* See top */
 
 #ifdef UNIX
-static char sccsid[] = "@(#)C-Kermit 9.0.300";
+static char sccsid[] = "@(#)C-Kermit 9.0.301";
 #endif /* UNIX */
 
 /*
@@ -78,8 +78,8 @@ static char sccsid[] = "@(#)C-Kermit 9.0.300";
   for future releases.
 */
 
-char *ck_s_ver = "9.0.300";             /* C-Kermit version string */
-long  ck_l_ver =  900300L;              /* C-Kermit version number */
+char *ck_s_ver = "9.0.301";             /* C-Kermit version string */
+long  ck_l_ver =  900301L;              /* C-Kermit version number */
 
 #ifdef OS2
 char *ck_s_xver = "3.0.0";             /* Product-specific version string */

diff --git a/ckcnet.h b/ckcnet.h
index edb390e..040bc74 100644 (file)
--- a/ckcnet.h
+++ b/ckcnet.h
@@ -1187,6 +1187,21 @@ typedef char * caddr_t; /* core address type */
 #endif /* UNIX */
 #endif /* TCPSOCKET */
 
+#ifndef NOINADDRX                    /* 301 - Needed for Solaris 10 and 11 */
+#ifdef SOLARIS
+#define NOINADDRX
+#ifdef INADDR_NONE
+#undef INADDR_NONE
+#endif /* INADDR_NONE */
+#endif /* SOLARIS */
+#endif /* NOINADDRX */
+
+#ifdef NOINADDRX
+#ifdef INADDRX
+#undef INADDRX
+#endif /* INADDRX */
+#endif /* NOINADDRX */
+
 #ifdef TCPSOCKET
 #ifndef NOHADDRLIST
 #ifndef HADDRLIST