From: Ezra Peisach <epeisach@mit.edu>
Date: Wed, 13 Mar 1996 18:11:13 +0000 (+0000)
Subject: 	* str_conv.c (krb5_timestamp_to_string): Handle statement not
X-Git-Tag: krb5-1.0-beta6~382
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1515a11c74437b8440298e77c32a380fedfd8677;p=krb5.git

	* str_conv.c (krb5_timestamp_to_string): Handle statement not
		reached warning.

	* ser_addr.c (krb5_address_internalize): Add magic numbers

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7620 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 38ce1cfce..11d59f7c8 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 11 11:15:26 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* str_conv.c (krb5_timestamp_to_string): Handle statement not
+		reached warning.
+
+	* ser_addr.c (krb5_address_internalize): Add magic numbers
+
 Thu Feb 29 11:49:38 1996  Theodore Y. Ts'o  <tytso@dcl>
 
 	* fwd_tgt.c (NEED_SOCKETS): Use NEED_SOCKETS instead of #including
diff --git a/src/lib/krb5/krb/ser_addr.c b/src/lib/krb5/krb/ser_addr.c
index 6e08393f2..a6a387747 100644
--- a/src/lib/krb5/krb/ser_addr.c
+++ b/src/lib/krb5/krb/ser_addr.c
@@ -162,6 +162,8 @@ krb5_address_internalize(kcontext, argp, buffer, lenremain)
 	    (address = (krb5_address *) malloc(sizeof(krb5_address)))) {
 	    memset(address, 0, sizeof(krb5_address));
 
+	    address->magic = KV5M_ADDRESS;
+
 	    /* Get the addrtype */
 	    (void) krb5_ser_unpack_int32(&ibuf, &bp, &remain);
 	    address->addrtype = (krb5_addrtype) ibuf;
diff --git a/src/lib/krb5/krb/str_conv.c b/src/lib/krb5/krb/str_conv.c
index 4190b03da..fea6d6b2f 100644
--- a/src/lib/krb5/krb/str_conv.c
+++ b/src/lib/krb5/krb/str_conv.c
@@ -584,8 +584,8 @@ krb5_timestamp_to_string(timestamp, buffer, buflen)
 	buffer[strlen(buffer)-1] = '\0';
 	return(0);
     }
-#endif	/* HAVE_STRFTIME */
     return(ENOMEM);
+#endif	/* HAVE_STRFTIME */
 }
 
 krb5_error_code