Ulf Härnhammar fixed a format string (printf style) problem in the Negotiate

code. It should however not be the cause of any troubles. He also fixed a
few similar problems in the HTTP test server code.

diff --git a/CHANGES b/CHANGES
index cde84d33ef8519ef4b8f7c86258984d6871003da..084b6c527e1507cfae9d9a9e03559787270023a1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
                                   Changelog
 
+Daniel (18 February 2006)
+- Ulf Härnhammar fixed a format string (printf style) problem in the Negotiate
+  code. It should however not be the cause of any troubles. He also fixed a
+  few similar problems in the HTTP test server code.
+
 Daniel (17 February 2006)
 - Shmulik Regev provided a fix for the DNS cache when using short life times,
   as previously it could be holding on to old cached entries longer than

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4b73a2f60071a1a07758c59b94e64272ef93b749..521502b45df77fff3ca1ee1aca1937713b837d0c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -21,6 +21,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o minor format string mistake in the GSS/Negotiate code
  o cached DNS entries could remain in the cache too long
  o improved GnuTLS check in configure
  o re-used FTP connections when the second request didn't do a transfer
@@ -63,6 +64,6 @@ advice from friends like these:
  Dov Murik, Jean Jacques Drouin, Andres Garcia, Yang Tse, Gisle Vanem, Dan
  Fandrich, Alexander Lazic, Michael Jahn, Andrew Benham, Bryan Henderson,
  David Shaw, Jon Turner, Duane Cathey, Michal Marek, Philippe Vaucher, Kent
- Boortz, Karl Moerder, Shmulik Regev
+ Boortz, Karl Moerder, Shmulik Regev, Ulf Härnhammar
  
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c
index f859a8beefc500f109430552dc226d62ddba4e4a..f407d50904f094c26abac9c471c0dec4286ed0c7 100644 (file)
--- a/lib/http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -111,7 +111,7 @@ log_gss_error(struct connectdata *conn, OM_uint32 error_status, char *prefix)
     gss_release_buffer(&min_stat, &status_string);
   } while (!GSS_ERROR(maj_stat) && msg_ctx != 0);
 
-  infof(conn->data, buf);
+  infof(conn->data, "%s", buf);
 }
 
 int Curl_input_negotiate(struct connectdata *conn, char *header)

diff --git a/tests/server/sws.c b/tests/server/sws.c
index b1904b4d36539b5324360ed59e5ad882b74748db..4b6735cce3ab843bb171eae152b59495365fffbc 100644 (file)
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -219,7 +219,7 @@ int ProcessRequest(struct httprequest *req)
       else
         sprintf(logbuf, "Got a *HUGE* request HTTP/%d.%d",
                 prot_major, prot_minor);
-      logmsg(logbuf);
+      logmsg("%s", logbuf);
 
       if(!strncmp("/verifiedserver", ptr, 15)) {
         logmsg("Are-we-friendly question received");
@@ -251,7 +251,7 @@ int ProcessRequest(struct httprequest *req)
       sprintf(logbuf, "Requested test number %ld part %ld",
               req->testno, req->partno);
 
-      logmsg(logbuf);
+      logmsg("%s", logbuf);
 
       filename = test2file(req->testno);
 
@@ -294,7 +294,7 @@ int ProcessRequest(struct httprequest *req)
                 doc, &prot_major, &prot_minor) == 3) {
         sprintf(logbuf, "Receiced a CONNECT %s HTTP/%d.%d request",
                 doc, prot_major, prot_minor);
-        logmsg(logbuf);
+        logmsg("%s", logbuf);
 
         if(prot_major*10+prot_minor == 10)
           req->open = FALSE; /* HTTP 1.0 closes connection by default */