gnupg/util (ChangeLog http.c srv.h)

[cvs user dshaw]

    Date: Wednesday, December 29, 2004 @ 01:58:05
  Author: dshaw
    Path: /cvs/gnupg/gnupg/util

Modified: ChangeLog http.c srv.h

Better implementation for the SRV check.  We don't need to actually check
all the header files individually since the SRV test compile uses them
together.


-----------+
 ChangeLog |    6 ++++++
 http.c    |    1 +
 srv.h     |    6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)


Index: gnupg/util/ChangeLog
diff -u gnupg/util/ChangeLog:1.173 gnupg/util/ChangeLog:1.174
--- gnupg/util/ChangeLog:1.173	Mon Dec 20 09:55:03 2004
+++ gnupg/util/ChangeLog	Wed Dec 29 01:58:05 2004
@@ -1,3 +1,9 @@
+2004-12-28  David Shaw  <dshaw at jabberwocky.com>
+
+	* srv.h: Better implementation for the SRV check.  We don't need
+	to actually check all the header files individually since the SRV
+	test compile uses them together.
+
 2004-12-20  Werner Koch  <wk at g10code.com>
 
 	* strgutil.c (handle_iconv_error): Turn diagnostics into warnings
Index: gnupg/util/http.c
diff -u gnupg/util/http.c:1.29 gnupg/util/http.c:1.30
--- gnupg/util/http.c:1.29	Fri Dec  3 21:23:12 2004
+++ gnupg/util/http.c	Wed Dec 29 01:58:05 2004
@@ -826,6 +826,7 @@
       srvlist=m_alloc_clear(sizeof(struct srventry));
       srvlist->port=port;
       strncpy(srvlist->target,server,MAXDNAME);
+      srvlist->target[MAXDNAME-1]='\0';
       srvcount=1;
     }
 
Index: gnupg/util/srv.h
diff -u gnupg/util/srv.h:1.6 gnupg/util/srv.h:1.7
--- gnupg/util/srv.h:1.6	Thu Dec 16 19:36:42 2004
+++ gnupg/util/srv.h	Wed Dec 29 01:58:05 2004
@@ -21,15 +21,15 @@
 #ifndef _SRV_H_
 #define _SRV_H_
 
+#ifdef USE_DNS_SRV
 #ifdef _WIN32
 #include <windows.h>
 #else
 #include <netinet/in.h>
-#ifdef HAVE_ARPA_NAMESER_H
 #include <arpa/nameser.h>
-#endif
 #include <resolv.h>
-#endif
+#endif /* !_WIN32 */
+#endif /* USE_DNS_SRV */
 #include "types.h"
 
 #ifndef MAXDNAME