* 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 38ce1cfce083a9c464ab7971c7f234ee7e732f21..11d59f7c8d06a2093f0397263e48766f5c891be1 100644 (file)
--- 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 6e08393f20780721ea19ded8252b096285e8bc44..a6a3877472f7796776f9f4fb2e67ef068fc35ddf 100644 (file)
--- 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 4190b03da477aab88433044c38ea6fa154dd5f1d..fea6d6b2f73b9f447d761cce5a1198c03eae1ba4 100644 (file)
--- 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