* 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

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 13994b1e8e1863070c8e5a15723c4d49f5e77711..93f5bfda94459beeb6103aa14970072e12397698 100644 (file)
--- 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 35abf2e90326ebd658eb0ddd5b2f56ff4bcd716b..135007df0de3c3ea59bbd0c1eb1fe48ff3d871bb 100644 (file)
--- 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 e3b05cc270a1dd309670f531ea55964d007cc9f8..105799139e8f4df5ae10c277a122c2a17a6539d4 100644 (file)
--- 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 07347b90555ff287a67be4cd07273167366c0804..7d4ee01ce85c4f11f9c931db8d69ceb864fa79de 100644 (file)
--- 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 a7fd9b4568da0d8e27120558fd58e8d70751d4e5..2a1f3bc056c1b01437dbfab3467aa16797e0b785 100644 (file)
--- 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) {