From: Ezra Peisach <epeisach@mit.edu>
Date: Mon, 18 Jun 2001 14:10:36 +0000 (+0000)
Subject: 	* auth_gssapi.c (auth_gssapi_create): Cast const gss_OID to
X-Git-Tag: krb5-1.3-alpha1~1406
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9523badfed4cd5235b083189b91b298ab1dfba83;p=krb5.git

	* auth_gssapi.c (auth_gssapi_create): Cast const gss_OID to
	gss_OID for gssapi functions.

	* xdr.c (xdr_u_int, xdr_int32, xdr_u_int32): If enumerated
	operation is not XDR_ENCODE, XDR_DECODE or XDR_FREE - return FALSE
	instead falling off end of function.

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

diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog
index c2761bf74..4b18e7750 100644
--- a/src/lib/rpc/ChangeLog
+++ b/src/lib/rpc/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-18  Ezra Peisach  <epeisach@mit.edu>
+
+	* auth_gssapi.c (auth_gssapi_create): Cast const gss_OID to
+	gss_OID for gssapi functions.
+
+	* xdr.c (xdr_u_int, xdr_int32, xdr_u_int32): If enumerated
+	operation is not XDR_ENCODE, XDR_DECODE or XDR_FREE - return FALSE
+	instead falling off end of function.
+
 2001-06-08  Ezra Peisach  <epeisach@mit.edu>
 
 	* auth_gssapi.h: Rename prototypes from _svcauth_set_log_XXX_func to 
diff --git a/src/lib/rpc/auth_gssapi.c b/src/lib/rpc/auth_gssapi.c
index 49d8846ee..2a4bcb245 100644
--- a/src/lib/rpc/auth_gssapi.c
+++ b/src/lib/rpc/auth_gssapi.c
@@ -219,7 +219,7 @@ try_new_version:
       */
      if (call_arg.version < 4 && (mech_type == gss_mech_krb5 ||
 				  mech_type == GSS_C_NULL_OID))
-	  mech_type = gss_mech_krb5_old;
+	  mech_type = (gss_OID) gss_mech_krb5_old;
 #endif
 
      if (!bindings_failed && call_arg.version >= 3) {
diff --git a/src/lib/rpc/xdr.c b/src/lib/rpc/xdr.c
index 755c0dc41..084d838e6 100644
--- a/src/lib/rpc/xdr.c
+++ b/src/lib/rpc/xdr.c
@@ -156,6 +156,8 @@ xdr_u_int(xdrs, up)
 	} else {
 		return (xdr_short(xdrs, (short *)up));
 	}
+	/*NOTREACHED*/
+	return(FALSE);
 #endif
 }
 
@@ -515,6 +517,7 @@ xdr_int32(xdrs, ip)
   case XDR_FREE:
     return (TRUE);    
   }
+  return(FALSE);
 }
 
 bool_t
@@ -538,6 +541,7 @@ xdr_u_int32(xdrs, up)
   case XDR_FREE:
     return (TRUE);    
   }
+  return(FALSE);
 }
 
 /*