From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Wed, 11 Nov 2009 10:19:07 +0000 (+0000)
Subject: Fix des key type issue in bosoprocs
X-Git-Tag: openafs-devel-1_5_67~62
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=420a544ecea96d5f72e5446f1f75add666b4f463

Fix des key type issue in bosoprocs

The call to afsconf_AddKey was using 'akey' rather than 'akey->data'.
As data is the first element of the akey structure, these are actually
identical, but the compiler sees it as a type error. Fix to use the
correct name, and remove the warning inhibition.

Change-Id: Id4775a836276ddd6f5ae105c298dcc3c68b92145
Reviewed-on: http://gerrit.openafs.org/810
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/README.WARNINGS b/README.WARNINGS
index 2c47034..c151e49 100644
--- a/README.WARNINGS
+++ b/README.WARNINGS
@@ -46,7 +46,6 @@ afsd/afsd.c          : deprecated    : daemon() marked as deprecated on Darwin
 	             : all           : call_syscall missing prototype
 auth/ktc.c           : all (ukernel) : call_syscall doesn't have a prototype
 bozo/bosserver.c     : deprecated    : daemon() marked as deprecated on Darwin
-bozo/bosoprocs.c     : all           : ExtendedCellInfo and des key types
 bozo/bos.c           : all           : DES key types & string consts 
 bozo/bos_util.c      : all           : DES key types
 bucoord/ubik_db_if.c : strict-proto  : Ubik_Call
diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in
index 71767ad..286389b 100644
--- a/src/bozo/Makefile.in
+++ b/src/bozo/Makefile.in
@@ -89,7 +89,6 @@ cronbnodeops.o: cronbnodeops.c ${INCLS}
 bnode.o: bnode.c ${INCLS}
 
 bosoprocs.o: bosoprocs.c ${INCLS}
-	$(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
 
 bos.o: bos.c ${INCLS} AFS_component_version_number.o
 	$(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
diff --git a/src/bozo/bosoprocs.c b/src/bozo/bosoprocs.c
index d6e6af3..9bd56a0 100644
--- a/src/bozo/bosoprocs.c
+++ b/src/bozo/bosoprocs.c
@@ -664,7 +664,7 @@ SBOZO_AddKey(struct rx_call *acall, afs_int32 an, struct bozo_key *akey)
     if (DoLogging)
 	bozo_Log("%s is executing AddKey\n", caller);
 
-    code = afsconf_AddKey(bozo_confdir, an, akey, 0);
+    code = afsconf_AddKey(bozo_confdir, an, akey->data, 0);
     if (code == AFSCONF_KEYINUSE)
 	code = BZKEYINUSE;	/* Unique code for afs rpc calls */
   fail: