From: Tom Yu <tlyu@mit.edu>
Date: Fri, 7 Aug 1998 15:44:33 +0000 (+0000)
Subject: 	* rd_safe.c (krb_rd_safe): Fix up call to quad_cksum()
X-Git-Tag: krb5-1.1-beta1~600
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2da84eea273527e7f361196da054ae611ea256b5;p=krb5.git

	* rd_safe.c (krb_rd_safe): Fix up call to quad_cksum()

	* mk_safe.c (krb_mk_safe): Fix up call to quad_cksum().

	* tf_util.c (tf_init): Add call to getuid() to initialize me.

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

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index e260fd598..0134656df 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,11 @@
+Fri Aug  7 11:04:03 1998  Tom Yu  <tlyu@mit.edu>
+
+	* rd_safe.c (krb_rd_safe): Fix up call to quad_cksum().
+
+	* mk_safe.c (krb_mk_safe): Fix up call to quad_cksum().
+
+	* tf_util.c (tf_init): Add call to getuid() to initialize me.
+
 Thu Jul  9 19:35:01 1998  Matthew D Hancher  <mdh@mit.edu>
 
 	* tf_util.c (tf_init): Fixed a potential race condition in the opening 
diff --git a/src/lib/krb4/mk_safe.c b/src/lib/krb4/mk_safe.c
index a20a2257c..b0dbd17e4 100644
--- a/src/lib/krb4/mk_safe.c
+++ b/src/lib/krb4/mk_safe.c
@@ -143,7 +143,7 @@ krb_mk_safe(in,out,length,key,sender,receiver)
 #else /* Do encryption */
     /* calculate the checksum of length, timestamps, and input data */
     cksum = quad_cksum(q, (unsigned KRB4_32 *)big_cksum,
-		       p-q, 2, (C_Block *)&key);
+		       p-q, 2, (C_Block *)key);
 #endif /* NOENCRYPTION */
     DEB (("\ncksum = %u",cksum));
 
diff --git a/src/lib/krb4/rd_safe.c b/src/lib/krb4/rd_safe.c
index 20407677b..52fdf3ab1 100644
--- a/src/lib/krb4/rd_safe.c
+++ b/src/lib/krb4/rd_safe.c
@@ -182,7 +182,7 @@ krb_rd_safe protocol err sizeof(u_long) != sizeof(struct in_addr)");
 #else /* Do encryption */
     /* calculate the checksum of the length, timestamps, and
      * input data, on the sending byte order !! */
-    quad_cksum(q,calc_cksum,p-q,2,(C_Block *)&key);
+    quad_cksum(q,calc_cksum,p-q,2,(C_Block *)key);
 #endif /* NOENCRYPTION */
 
     DEB (("\n0: calc %l big %lx\n1: calc %lx big %lx\n2: calc %lx big %lx\n3: calc %lx big %lx\n",
diff --git a/src/lib/krb4/tf_util.c b/src/lib/krb4/tf_util.c
index 79884f3a0..b3eb0b43a 100644
--- a/src/lib/krb4/tf_util.c
+++ b/src/lib/krb4/tf_util.c
@@ -190,6 +190,8 @@ int tf_init(tf_name, rw)
     int shmid;
 #endif
 
+    me = getuid();
+
     switch (rw) {
     case R_TKT_FIL:
 	wflag = 0;