portability fixes backported from change 2987

diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c
index e427f9732d7cf1724bead0223b83c5ef5a613f1b..3b3efca52850440c933540c192bbb40d34d92f20 100644 (file)
--- a/lib/dns/spnego.c
+++ b/lib/dns/spnego.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: spnego.c,v 1.8.118.5 2011/03/28 03:46:43 marka Exp $ */
+/* $Id: spnego.c,v 1.8.118.6 2011/03/28 05:10:04 marka Exp $ */
 
 /*! \file
  * \brief
@@ -172,6 +172,8 @@
 /* asn1_err.h */
 /* Generated from ../../../lib/asn1/asn1_err.et */
 
+#ifndef ERROR_TABLE_BASE_asn1
+/* these may be brought in already via gssapi_krb5.h */
 typedef enum asn1_error_number {
        ASN1_BAD_TIMEFORMAT = 1859794432,
        ASN1_MISSING_FIELD = 1859794433,
@@ -186,6 +188,7 @@ typedef enum asn1_error_number {
 } asn1_error_number;
 
 #define ERROR_TABLE_BASE_asn1 1859794432
+#endif
 
 #define __asn1_common_definitions__
 
@@ -409,7 +412,7 @@ code_NegTokenArg(OM_uint32 * minor_status,
 {
        OM_uint32 ret;
        u_char *buf;
-       size_t buf_size, buf_len;
+       size_t buf_size, buf_len = 0;
 
        buf_size = 1024;
        buf = malloc(buf_size);