Merge branch 'upstream'

ckdaily snapshot from 20110706
snapshot ships with ckc299.txt instead of ckc300, removed.

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/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