[Bug 1343] sntp illegal C does not compile on Solaris 7.

Windows VC9/VS2008:  use generic library name libeay32.lib
  instead of variants encoding build type to match what you
  get building OpenSSL from source.

bk: 4afc0fa7tBFI3Xrq1mAHctGB734g0g

diff --git a/ChangeLog b/ChangeLog
index 36d4c785ff0da3d35c5aa990631156d0a6dddd17..79b78a545812c4acac93aab07f774c99d97aa500 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1343] sntp illegal C does not compile on Solaris 7.
 (4.2.5p244-RC) 2009/11/12 Released by Harlan Stenn <stenn@ntp.org>
 * keygen.html updates from Dave Mills.
 * [Bug 1003] ntpdc unconfig command doesn't prompt for keyid.

diff --git a/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj b/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj
index cb0cff7fd05dae362307bc167960416c14629b10..d2a4dd2d55682395f8a1b1a178f3ae83eefb021c 100644 (file)
--- a/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj
+++ b/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj
@@ -77,7 +77,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\vc\libeay32MDd.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="..\bin\Debug\ntp-keygen.exe"
                                Version="0x0400"
                                LinkIncremental="1"
@@ -174,7 +174,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\vc\libeay32MD.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="..\bin\Release\ntp-keygen.exe"
                                Version="0x0400"
                                LinkIncremental="1"

diff --git a/ports/winnt/vs2008/ntpd/ntpd.vcproj b/ports/winnt/vs2008/ntpd/ntpd.vcproj
index 6d6f73e8500ca4783cdcfaba0c7b73a2a8882f1b..c9a4631dee8bff11b9a783118cdb0080a9305b99 100644 (file)
--- a/ports/winnt/vs2008/ntpd/ntpd.vcproj
+++ b/ports/winnt/vs2008/ntpd/ntpd.vcproj
@@ -79,7 +79,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib winmm.lib $(OPENSSL_LIB)\vc\libeay32MD.lib"
+                               AdditionalDependencies="ws2_32.lib winmm.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="..\bin\Release\ntpd.exe"
                                Version="0x0400"
                                LinkIncremental="1"
@@ -185,7 +185,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib winmm.lib $(OPENSSL_LIB)\vc\libeay32MDd.lib"
+                               AdditionalDependencies="ws2_32.lib winmm.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="..\bin\Debug\ntpd.exe"
                                Version="0x0400"
                                LinkIncremental="1"

diff --git a/ports/winnt/vs2008/ntpdate/ntpdate.vcproj b/ports/winnt/vs2008/ntpdate/ntpdate.vcproj
index 25013b5c61e7ea9a1ad84dff9b88da7173eef153..5025c67a93cbae4b52ef77f4445754bd8320b0af 100644 (file)
--- a/ports/winnt/vs2008/ntpdate/ntpdate.vcproj
+++ b/ports/winnt/vs2008/ntpdate/ntpdate.vcproj
@@ -74,7 +74,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\vc\libeay32MDd.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="..\bin\Debug\ntpdate.exe"
                                Version="0x0400"
                                LinkIncremental="1"
@@ -172,7 +172,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\vc\libeay32MD.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="..\bin\Release\ntpdate.exe"
                                Version="0x0400"
                                LinkIncremental="1"

diff --git a/ports/winnt/vs2008/ntpdc/ntpdc.vcproj b/ports/winnt/vs2008/ntpdc/ntpdc.vcproj
index 04b0e962b75baccc8563f3fc83dea67c8e247f42..332baf23cb19a2549d52e010349788eb1921c7ff 100644 (file)
--- a/ports/winnt/vs2008/ntpdc/ntpdc.vcproj
+++ b/ports/winnt/vs2008/ntpdc/ntpdc.vcproj
@@ -74,7 +74,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\vc\libeay32MDd.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="..\bin\Debug\ntpdc.exe"
                                Version="0x0400"
                                LinkIncremental="1"
@@ -171,7 +171,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\vc\libeay32MD.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="..\bin\Release\ntpdc.exe"
                                Version="0x0400"
                                LinkIncremental="1"

diff --git a/ports/winnt/vs2008/ntpq/ntpq.vcproj b/ports/winnt/vs2008/ntpq/ntpq.vcproj
index be005e72218ed88c282fed81d99634c513c7b018..dd2fe6da7cbc20ae6b5bb6afffb731ab91d734d0 100644 (file)
--- a/ports/winnt/vs2008/ntpq/ntpq.vcproj
+++ b/ports/winnt/vs2008/ntpq/ntpq.vcproj
@@ -73,7 +73,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\vc\libeay32MD.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="..\bin\Release\ntpq.exe"
                                Version="0x0400"
                                LinkIncremental="1"
@@ -171,7 +171,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\vc\libeay32MDd.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="..\bin\Debug\ntpq.exe"
                                Version="0x0400"
                                LinkIncremental="1"

diff --git a/sntp/log.c b/sntp/log.c
index 2fedd809625ff678b97c899a053885f47420c228..c6bfe222885fdbd714d75162cf77a65ef137ac20 100644 (file)
--- a/sntp/log.c
+++ b/sntp/log.c
@@ -50,21 +50,21 @@ void debug_msg(char *message) {
        }
 }
 
-void init_log(const char *logfile) {
-       log_file = fopen(logfile, "a");
-       
-       if(log_file == NULL) {
-               filelog = 0;
+void init_log(
+       const char *logfile
+       )
+{
+       char error_msg[80];
 
-               char error_msg[80];
+       log_file = fopen(logfile, "a"); 
+       if (log_file == NULL) {
+               filelog = 0;
 
                snprintf(error_msg, 80, "init_log(): Cannot open logfile %s", logfile);
-
                debug_msg(error_msg);
 
                return;
-       }
-       else {
+       } else {
                filelog = 1;
                init = 1;
                atexit(cleanup_log);

diff --git a/sntp/main.c b/sntp/main.c
index a9736427c0b825e28d76a1a0f3cd1f4097b2fc32..bec6e7360af213cc25e446f0b302bdc276f77e10 100644 (file)
--- a/sntp/main.c
+++ b/sntp/main.c
@@ -161,6 +161,7 @@ on_wire (
                struct addrinfo *host
                                        )
 {
+       char logmsg[32 + INET6_ADDRSTRLEN];
        char addr_buf[INET6_ADDRSTRLEN];
        register int try;
        SOCKET sock;
@@ -173,6 +174,7 @@ on_wire (
                double t21, t34, delta, offset;
                int error, rpktl, sw_case;
                char *hostname = NULL, *ts_str = NULL;
+               char *log_str;
                l_fp p_rec, p_xmt, p_ref, p_org, xmt, tmp, dst;
 
                memset(&r_pkt, 0, sizeof(r_pkt));
@@ -224,19 +226,17 @@ on_wire (
                                ref = (char *)&r_pkt.refid;
                                add_entry(hostname, ref);
 
-                               if(ENABLED_OPT(NORMALVERBOSE))
+                               if (ENABLED_OPT(NORMALVERBOSE))
                                        printf("sntp on_wire: Received KOD packet with code: %c%c%c%c from %s, demobilizing all connections\n", 
                                               ref[0], ref[1], ref[2], ref[3],
                                               hostname);
 
-                               char *log_str = (char *) emalloc(sizeof(char) * (INET6_ADDRSTRLEN + 72));
+                               log_str = emalloc(INET6_ADDRSTRLEN + 72);
                                snprintf(log_str, INET6_ADDRSTRLEN + 72, 
                                         "Received a KOD packet with code %c%c%c%c from %s, demobilizing all connections", 
                                         ref[0], ref[1], ref[2], ref[3],
                                         hostname);
-
                                log_msg(log_str, 2);
-
                                free(log_str);
                                break;
 
@@ -317,17 +317,14 @@ on_wire (
                }
        }
 
-       char logmsg[32 + INET6_ADDRSTRLEN];
        getnameinfo(host->ai_addr, host->ai_addrlen, addr_buf, sizeof(addr_buf), NULL, 0, NI_NUMERICHOST);
 
        snprintf(logmsg, sizeof(logmsg), "Received no useable packet from %s!", addr_buf);
+       log_msg(logmsg, 1);
 
        if (ENABLED_OPT(NORMALVERBOSE))
                printf("sntp on_wire: Received no useable packet from %s!\n", addr_buf);
 
-
-       log_msg(logmsg, 1);
-
        return -1;
 }
 

diff --git a/sntp/networking.c b/sntp/networking.c
index 3b762c1e384cabf75a14bba3c62eb30a9834dc05..f79bff1d968b147fe4742202695cfbba905e7880 100644 (file)
--- a/sntp/networking.c
+++ b/sntp/networking.c
@@ -106,18 +106,20 @@ sendpkt (
        int len
        )
 {
+       int cc;
+
 #ifdef DEBUG
        printf("sntp sendpkt: Packet data:\n");
        pkt_output(pkt, len, stdout);
 #endif
 
-       if(ENABLED_OPT(NORMALVERBOSE)) {
+       if (ENABLED_OPT(NORMALVERBOSE)) {
                getnameinfo(&dest->sa, SOCKLEN(dest), adr_buf, sizeof(adr_buf), NULL, 0, NI_NUMERICHOST);
 
                printf("sntp sendpkt: Sending packet to %s... ", adr_buf);
        }
 
-       int cc = sendto(rsock, (char *)pkt, len, 0, &dest->sa, SOCKLEN(dest));
+       cc = sendto(rsock, (void *)pkt, len, 0, &dest->sa, SOCKLEN(dest));
 
        if (cc == SOCKET_ERROR) {
 #ifdef DEBUG
@@ -127,11 +129,8 @@ sendpkt (
                if (errno != EWOULDBLOCK && errno != ENOBUFS) {
 
                }
-       }
-       else {
-               if(ENABLED_OPT(NORMALVERBOSE))
-                       printf("Packet sent.\n");
-       }
+       } else if (ENABLED_OPT(NORMALVERBOSE))
+               printf("Packet sent.\n");
 }
 
 /* Receive raw data */
@@ -465,10 +464,12 @@ recv_bcst_pkt (
        }
 
        if (STRATUM_PKT_UNSPEC == rpkt->stratum) {
+               char *ref_char;
+
                if (ENABLED_OPT(NORMALVERBOSE))
                        printf("sntp recv_bcst_pkt: Stratum unspecified, going to check for KOD (stratum: %i)\n", rpkt->stratum);
 
-               char *ref_char = (char *) &rpkt->refid;
+               ref_char = (char *) &rpkt->refid;
                
                /* If it's a KOD packet we'll just use the KOD information */
                if (ref_char[0] != 'X') {
@@ -512,13 +513,13 @@ recvpkt (
        char *rdata /* , done */;
 
        register int a;
-       int has_mac, is_authentic, orig_pkt_len;
+       int has_mac, is_authentic, pkt_len, orig_pkt_len;
 
 
        /* Much space, just to be sure */
        rdata = emalloc(sizeof(char) * 256);
 
-       int pkt_len = recvdata(rsock, &sender, rdata, 256);
+       pkt_len = recvdata(rsock, &sender, rdata, 256);
 
 #if 0  /* done uninitialized */
        if (!done) {
@@ -657,11 +658,13 @@ recvpkt (
 
        /* Stratum is unspecified (0) check what's going on */
        if (STRATUM_PKT_UNSPEC == rpkt->stratum) {
+               char *ref_char;
+
                if (ENABLED_OPT(NORMALVERBOSE))
                        printf("sntp recvpkt: Stratum unspecified, going to check for KOD (stratum: %i)\n", rpkt->stratum);
 
 
-               char *ref_char = (char *) &rpkt->refid;
+               ref_char = (char *) &rpkt->refid;
 
                if (ENABLED_OPT(NORMALVERBOSE)) 
                        printf("sntp recvpkt: Packet refid: %c%c%c%c\n", ref_char[0], ref_char[1], ref_char[2], ref_char[3]);