From a48ae505688b196e804e2af0edce6e812fb499b3 Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Thu, 4 May 1995 14:51:18 +0000
Subject: [PATCH] 	* put_svc_key.c (put_svc_key): remove spurious & in
 front of fkey 		(it's a char[] and takint address of it is redundant)

	* recvauth.c (krb_recvauth): remove spurious & in front of
		reference to kdata->session

	* rd_req.c (krb_rd_req): remove spurious & in front of reference
		to ad->session

	* g_in_tkt.c(decrypt_tkt): remove spurious & in front of reference
		to key (it is a C_Block and taking address of it is
		redundant)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5719 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/lib/krb4/ChangeLog     | 13 +++++++++++++
 src/lib/krb4/g_in_tkt.c    |  2 +-
 src/lib/krb4/put_svc_key.c |  2 +-
 src/lib/krb4/rd_req.c      |  2 +-
 src/lib/krb4/recvauth.c    |  2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 13994b1e8..93f5bfda9 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,5 +1,18 @@
 Thu May  4 10:03:22 1995  Tom Yu  (tlyu@dragons-lair)
 
+	* put_svc_key.c (put_svc_key): remove spurious & in front of fkey
+		(it's a char[] and takint address of it is redundant)
+
+	* recvauth.c (krb_recvauth): remove spurious & in front of
+		reference to kdata->session
+
+	* rd_req.c (krb_rd_req): remove spurious & in front of reference
+		to ad->session
+
+	* g_in_tkt.c(decrypt_tkt): remove spurious & in front of reference
+		to key (it is a C_Block and taking address of it is
+		redundant)
+
 	* Makefile.in: new includes target to install krb_err.h in
 		$(BUILDTOP)/include; includes depends on krb_err.h.
 		Previously, it was attempting to install a header that had
diff --git a/src/lib/krb4/g_in_tkt.c b/src/lib/krb4/g_in_tkt.c
index 35abf2e90..135007df0 100644
--- a/src/lib/krb4/g_in_tkt.c
+++ b/src/lib/krb4/g_in_tkt.c
@@ -66,7 +66,7 @@ decrypt_tkt(user, instance, realm, arg, key_proc, cipp)
 #ifndef NOENCRYPTION
     key_sched(key,key_s);
     pcbc_encrypt((C_Block *)cip->dat,(C_Block *)cip->dat,
-		 (long) cip->length,key_s,(C_Block *)&key,0);
+		 (long) cip->length,key_s,(C_Block *)key,0);
 #endif /* !NOENCRYPTION */
     /* Get rid of all traces of key */
     memset((char *)key, 0,sizeof(key));
diff --git a/src/lib/krb4/put_svc_key.c b/src/lib/krb4/put_svc_key.c
index e3b05cc27..105799139 100644
--- a/src/lib/krb4/put_svc_key.c
+++ b/src/lib/krb4/put_svc_key.c
@@ -82,7 +82,7 @@ put_svc_key(sfile,name,inst,realm,newvno,key)
                         close(fd);
                         return KFAILURE;
                 }
-                if (read(fd,&fkey,KEYSZ) != KEYSZ) {
+                if (read(fd,fkey,KEYSZ) != KEYSZ) {
                         close(fd);
                         return KFAILURE;
                 }
diff --git a/src/lib/krb4/rd_req.c b/src/lib/krb4/rd_req.c
index 07347b905..7d4ee01ce 100644
--- a/src/lib/krb4/rd_req.c
+++ b/src/lib/krb4/rd_req.c
@@ -266,7 +266,7 @@ krb_rd_req(authent,service,instance,from_addr,ad,fn)
 #endif
     key_sched(ad->session,seskey_sched);
     pcbc_encrypt((C_Block *)req_id->dat,(C_Block *)req_id->dat,
-                 (long) req_id->length, seskey_sched,&ad->session,DES_DECRYPT);
+                 (long) req_id->length, seskey_sched,ad->session,DES_DECRYPT);
 #ifdef KRB_CRYPT_DEBUG
     if (krb_ap_req_debug) log("Done.");
 #endif
diff --git a/src/lib/krb4/recvauth.c b/src/lib/krb4/recvauth.c
index a7fd9b456..2a1f3bc05 100644
--- a/src/lib/krb4/recvauth.c
+++ b/src/lib/krb4/recvauth.c
@@ -252,7 +252,7 @@ char *version;			 /* version string (filled in) */
 			       tmp_buf,
 			       (unsigned KRB4_32) sizeof(cksum),
 			       schedule,
-			       &kdata->session,
+			       kdata->session,
 			       laddr,
 			       faddr);
 	if (priv_len < 0) {
-- 
2.26.2