From 9dd8d7f8171614a9efda14f6392651b8c276aa04 Mon Sep 17 00:00:00 2001
From: Marcus Watts <mdw@umich.edu>
Date: Fri, 9 Feb 2007 00:57:39 +0000
Subject: [PATCH] auth-cleanup-20070208

FIXES 53208

remove unneeded includes of auth.h
---
 src/afsd/afsd.c              |  1 -
 src/aklog/aklog_main.c       |  1 -
 src/bozo/bos.c               |  1 -
 src/bozo/bosserver.c         |  2 +-
 src/budb/database.c          |  1 -
 src/budb/db_alloc.c          |  1 -
 src/budb/db_hash.c           |  1 -
 src/budb/db_lock.c           |  1 -
 src/budb/db_text.c           |  1 -
 src/budb/dbs_dump.c          |  1 -
 src/budb/server.c            |  1 -
 src/butc/tcmain.c            |  1 -
 src/butc/tcprocs.c           |  1 -
 src/butc/tcudbprocs.c        |  1 -
 src/butc/test.c              |  1 -
 src/butc/test_budb.c         |  1 -
 src/finale/translate_et.c    |  1 -
 src/kauth/klog.c             |  1 -
 src/kauth/manyklog.c         |  1 -
 src/kauth/test/multiklog.c   |  1 -
 src/libadmin/vos/vsprocs.h   |  1 -
 src/ptserver/ptuser.c        |  2 --
 src/tests/create-stat.c      |  1 -
 src/tests/dumpscan.h         |  1 -
 src/tests/fs_lib.c           |  1 -
 src/tviced/serialize_state.c |  1 -
 src/tviced/state_analyzer.c  |  1 -
 src/ubik/uinit.c             |  1 -
 src/uss/uss_vol.c            |  1 -
 src/venus/fs.c               |  1 -
 src/venus/gcpags.c           |  1 -
 src/venus/twiddle.c          |  1 -
 src/venus/whatfid.c          |  1 -
 src/viced/afsfileprocs.c     |  1 -
 src/viced/viced.c            |  1 -
 src/vlserver/sascnvldb.c     |  1 -
 src/vlserver/vlclient.c      |  1 -
 src/volser/volmain.c         |  1 -
 src/volser/volprocs.c        |  1 -
 src/volser/voltrans.c        |  1 -
 src/volser/vos.c             |  2 --
 src/volser/vsprocs.c         |  1 -
 src/volser/vsutils.c         | 10 ----------
 43 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c
index b4e401c..5db5625 100644
--- a/src/afsd/afsd.c
+++ b/src/afsd/afsd.c
@@ -133,7 +133,6 @@ RCSID
 #include <netinet/in.h>
 #include <afs/afs_args.h>
 #include <afs/cellconfig.h>
-#include <afs/auth.h>
 #include <ctype.h>
 #include <afs/afssyscalls.h>
 #include <afs/afsutil.h>
diff --git a/src/aklog/aklog_main.c b/src/aklog/aklog_main.c
index 0200fc0..36bd970 100644
--- a/src/aklog/aklog_main.c
+++ b/src/aklog/aklog_main.c
@@ -66,7 +66,6 @@ u_long ntohl(u_long x)
 #ifdef WINDOWS
 
 #include <afs/auth.h>
-#include <rx/rxkad.h>
 #include <afs/dirpath.h>
 
 #else /* !WINDOWS */
diff --git a/src/bozo/bos.c b/src/bozo/bos.c
index cca66c0..6b9bb43 100644
--- a/src/bozo/bos.c
+++ b/src/bozo/bos.c
@@ -39,7 +39,6 @@ RCSID
 #include <sys/stat.h>
 #include <rx/xdr.h>
 #include <afs/auth.h>
-#include <rx/rxkad.h>
 #include <afs/cellconfig.h>
 #include <stdio.h>
 #include <afs/cmd.h>
diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
index 6ac6e05..ca2f4a6 100644
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -37,7 +37,7 @@ RCSID
 #include <rx/rx_globals.h>
 #include "bosint.h"
 #include "bnode.h"
-#include <afs/auth.h>
+#include <rx/rxkad.h>
 #include <afs/keys.h>
 #include <afs/ktime.h>
 #include <afs/afsutil.h>
diff --git a/src/budb/database.c b/src/budb/database.c
index aa6216a..42c4f43 100644
--- a/src/budb/database.c
+++ b/src/budb/database.c
@@ -21,7 +21,6 @@ RCSID
 #include <sys/types.h>
 #include <afs/stds.h>
 #include <ubik.h>
-#include <afs/auth.h>
 #include <afs/bubasics.h>
 #include "budb_errs.h"
 #include "database.h"
diff --git a/src/budb/db_alloc.c b/src/budb/db_alloc.c
index cbdb796..fbed0a6 100644
--- a/src/budb/db_alloc.c
+++ b/src/budb/db_alloc.c
@@ -28,7 +28,6 @@ RCSID
 #include <sys/types.h>
 #include <afs/stds.h>
 #include <ubik.h>
-#include <afs/auth.h>
 #include <afs/bubasics.h>
 #include "budb_errs.h"
 #include "database.h"
diff --git a/src/budb/db_hash.c b/src/budb/db_hash.c
index 3ebdd7f..16a0636 100644
--- a/src/budb/db_hash.c
+++ b/src/budb/db_hash.c
@@ -28,7 +28,6 @@ RCSID
 #include <sys/types.h>
 #include <afs/stds.h>
 #include <ubik.h>
-#include <afs/auth.h>
 #include <afs/bubasics.h>
 #include "budb_errs.h"
 #include "database.h"
diff --git a/src/budb/db_lock.c b/src/budb/db_lock.c
index d4a6d1a..949f5f9 100644
--- a/src/budb/db_lock.c
+++ b/src/budb/db_lock.c
@@ -22,7 +22,6 @@ RCSID
 #endif
 #include <afs/afsutil.h>
 #include <ubik.h>
-#include <afs/auth.h>
 #include <afs/bubasics.h>
 #include "budb_errs.h"
 #include "database.h"
diff --git a/src/budb/db_text.c b/src/budb/db_text.c
index 0627cc7..8876612 100644
--- a/src/budb/db_text.c
+++ b/src/budb/db_text.c
@@ -31,7 +31,6 @@ RCSID
 #endif
 #include <sys/types.h>
 #include <ubik.h>
-#include <afs/auth.h>
 #include <afs/bubasics.h>
 #include "budb_errs.h"
 #include "database.h"
diff --git a/src/budb/dbs_dump.c b/src/budb/dbs_dump.c
index f345383..9d189c2 100644
--- a/src/budb/dbs_dump.c
+++ b/src/budb/dbs_dump.c
@@ -36,7 +36,6 @@ RCSID
 #include <string.h>
 #include <des.h>
 #include <afs/cellconfig.h>
-#include <afs/auth.h>
 #include <errno.h>
 #include "budb.h"
 #include "budb_errs.h"
diff --git a/src/budb/server.c b/src/budb/server.c
index d6d7fb6..b33f963 100644
--- a/src/budb/server.c
+++ b/src/budb/server.c
@@ -45,7 +45,6 @@ RCSID
 #include <rx/rxkad.h>
 #include <rx/rx_globals.h>
 #include <afs/cellconfig.h>
-#include <afs/auth.h>
 #include <afs/bubasics.h>
 #include <afs/afsutil.h>
 #include <afs/com_err.h>
diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c
index 7a6cdea..1754243 100644
--- a/src/butc/tcmain.c
+++ b/src/butc/tcmain.c
@@ -40,7 +40,6 @@ RCSID
 #include <afs/afsutil.h>
 #include <rx/rx.h>
 #include <rx/rx_globals.h>
-#include <afs/auth.h>
 #include <rx/rxkad.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c
index d005e6a..89b01ba 100644
--- a/src/butc/tcprocs.c
+++ b/src/butc/tcprocs.c
@@ -34,7 +34,6 @@ RCSID
 #include <afs/nfs.h>
 #include <lwp.h>
 #include <lock.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
 #include <ubik.h>
diff --git a/src/butc/tcudbprocs.c b/src/butc/tcudbprocs.c
index 7511694..4e0a754 100644
--- a/src/butc/tcudbprocs.c
+++ b/src/butc/tcudbprocs.c
@@ -35,7 +35,6 @@ RCSID
 #include <afs/nfs.h>
 #include <lwp.h>
 #include <lock.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
 #include <ubik.h>
diff --git a/src/butc/test.c b/src/butc/test.c
index 2360449..f61c66b 100644
--- a/src/butc/test.c
+++ b/src/butc/test.c
@@ -22,7 +22,6 @@
 #include <rx/rx_globals.h>
 #include <afs/nfs.h>
 #include <afs/vlserver.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
 #include <ubik.h>
diff --git a/src/butc/test_budb.c b/src/butc/test_budb.c
index baa6af3..dfc09c7 100644
--- a/src/butc/test_budb.c
+++ b/src/butc/test_budb.c
@@ -16,7 +16,6 @@
 RCSID
     ("$Header$");
 
-#include <afs/auth.h>
 #include <afs/budb_client.h>
 #include <afs/budb.h>
 #include <rx/rx_globals.h>
diff --git a/src/finale/translate_et.c b/src/finale/translate_et.c
index 260a035..d048a74 100644
--- a/src/finale/translate_et.c
+++ b/src/finale/translate_et.c
@@ -16,7 +16,6 @@ RCSID
 #include <afs/com_err.h>
 #include <rx/rxkad.h>
 #include <afs/kautils.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
 #include <afs/vlserver.h>
diff --git a/src/kauth/klog.c b/src/kauth/klog.c
index 66bed78..def9647 100644
--- a/src/kauth/klog.c
+++ b/src/kauth/klog.c
@@ -33,7 +33,6 @@ RCSID
 #include <stdio.h>
 #include <pwd.h>
 #include <afs/com_err.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
 #include "kauth.h"
diff --git a/src/kauth/manyklog.c b/src/kauth/manyklog.c
index 9b4a110..f2522e5 100644
--- a/src/kauth/manyklog.c
+++ b/src/kauth/manyklog.c
@@ -26,7 +26,6 @@ RCSID
 #include <stdio.h>
 #include <pwd.h>
 #include <afs/com_err.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
 #include "kauth.h"
diff --git a/src/kauth/test/multiklog.c b/src/kauth/test/multiklog.c
index 1b57fde..592e8e5 100644
--- a/src/kauth/test/multiklog.c
+++ b/src/kauth/test/multiklog.c
@@ -30,7 +30,6 @@ RCSID
 #include <stdio.h>
 #include <pwd.h>
 #include <afs/com_err.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
 #include "kauth.h"
diff --git a/src/libadmin/vos/vsprocs.h b/src/libadmin/vos/vsprocs.h
index 1781e51..ab30e9e 100644
--- a/src/libadmin/vos/vsprocs.h
+++ b/src/libadmin/vos/vsprocs.h
@@ -26,7 +26,6 @@
 #include <rx/rx.h>
 #include <afs/vlserver.h>
 #include <afs/nfs.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
 #include <ubik.h>
diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c
index 7f68647..39b1ece 100644
--- a/src/ptserver/ptuser.c
+++ b/src/ptserver/ptuser.c
@@ -24,7 +24,6 @@ RCSID
 #include "afs/stds.h"
 #include "rx/rx.h"
 #include "rx/xdr.h"
-#include "rx/rxkad.h"
 #include "afs/auth.h"
 #include "afs/cellconfig.h"
 #include "afs/afsutil.h"
@@ -50,7 +49,6 @@ RCSID
 #endif
 #include <rx/rx.h>
 #include <rx/xdr.h>
-#include <rx/rxkad.h>
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/afsutil.h>
diff --git a/src/tests/create-stat.c b/src/tests/create-stat.c
index f3f2d9c..7e0f7d0 100644
--- a/src/tests/create-stat.c
+++ b/src/tests/create-stat.c
@@ -44,7 +44,6 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <afs/afsint.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
 
diff --git a/src/tests/dumpscan.h b/src/tests/dumpscan.h
index 86a55f9..b3e077b 100644
--- a/src/tests/dumpscan.h
+++ b/src/tests/dumpscan.h
@@ -40,7 +40,6 @@
 #include <afs/ihandle.h>
 #include <afs/vnode.h>
 #include <afs/cmd.h>
-#include <afs/auth.h>
 #include <afs/bnode.h>
 #include <afs/cellconfig.h>
 #include <afs/kautils.h>
diff --git a/src/tests/fs_lib.c b/src/tests/fs_lib.c
index c6df92c..8361729 100644
--- a/src/tests/fs_lib.c
+++ b/src/tests/fs_lib.c
@@ -49,7 +49,6 @@
 #include <afs/vice.h>
 #include <afs/venus.h>
 #include <afs/afsint.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
 
diff --git a/src/tviced/serialize_state.c b/src/tviced/serialize_state.c
index 4095410..f89ef0f 100644
--- a/src/tviced/serialize_state.c
+++ b/src/tviced/serialize_state.c
@@ -53,7 +53,6 @@ RCSID
 #include <afs/acl.h>
 #include <afs/ptclient.h>
 #include <afs/prs_fs.h>
-#include <afs/auth.h>
 #include <afs/afsutil.h>
 #include <rx/rx.h>
 #include <afs/cellconfig.h>
diff --git a/src/tviced/state_analyzer.c b/src/tviced/state_analyzer.c
index ae8c3ff..f9cb8be 100644
--- a/src/tviced/state_analyzer.c
+++ b/src/tviced/state_analyzer.c
@@ -53,7 +53,6 @@ RCSID
 #include <afs/acl.h>
 #include <afs/ptclient.h>
 #include <afs/prs_fs.h>
-#include <afs/auth.h>
 #include <afs/afsutil.h>
 #include <rx/rx.h>
 #include <afs/cellconfig.h>
diff --git a/src/ubik/uinit.c b/src/ubik/uinit.c
index 76e66fa..23f4401 100644
--- a/src/ubik/uinit.c
+++ b/src/ubik/uinit.c
@@ -48,7 +48,6 @@ RCSID
 #include <ubik.h>
 #include <afs/afsint.h>
 #include <afs/cmd.h>
-#include <rx/rxkad.h>
 
 /*
   Get the appropriate type of ubik client structure out from the system.
diff --git a/src/uss/uss_vol.c b/src/uss/uss_vol.c
index 59d5c3b..e71b740 100644
--- a/src/uss/uss_vol.c
+++ b/src/uss/uss_vol.c
@@ -41,7 +41,6 @@ RCSID
 #include <afs/vlserver.h>
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
-#include <rx/rxkad.h>
 #include <rx/rx_globals.h>
 #include <afs/volser.h>
 #include <afs/volint.h>
diff --git a/src/venus/fs.c b/src/venus/fs.c
index 349d108..96d7bb1 100644
--- a/src/venus/fs.c
+++ b/src/venus/fs.c
@@ -42,7 +42,6 @@ RCSID
 #undef VICE
 #include "afs/prs_fs.h"
 #include <afs/afsint.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <ubik.h>
 #include <rx/rxkad.h>
diff --git a/src/venus/gcpags.c b/src/venus/gcpags.c
index a861433..4486ffd 100644
--- a/src/venus/gcpags.c
+++ b/src/venus/gcpags.c
@@ -31,7 +31,6 @@ RCSID
 #undef VICE
 #include "afs/prs_fs.h"
 #include <afs/afsint.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
 #include <strings.h>
diff --git a/src/venus/twiddle.c b/src/venus/twiddle.c
index dcaaf75..3657f58 100644
--- a/src/venus/twiddle.c
+++ b/src/venus/twiddle.c
@@ -31,7 +31,6 @@ RCSID
 #undef VICE
 #include "afs/prs_fs.h"
 #include <afs/afsint.h>
-#include <afs/auth.h>>
 #include <errno.h
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
diff --git a/src/venus/whatfid.c b/src/venus/whatfid.c
index da2a7ef..beef331 100644
--- a/src/venus/whatfid.c
+++ b/src/venus/whatfid.c
@@ -30,7 +30,6 @@ RCSID
 #include <afs/venus.h>
 #include "afs/prs_fs.h"
 #include <afs/afsint.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
 #include <strings.h>
diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index 3339853..abb2eb6 100644
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -106,7 +106,6 @@ RCSID
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
 
-#include <afs/auth.h>
 #include <signal.h>
 #include <afs/partition.h>
 #include "viced_prototypes.h"
diff --git a/src/viced/viced.c b/src/viced/viced.c
index 3c400bb..45a7c9c 100644
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -77,7 +77,6 @@ RCSID
 #include <afs/acl.h>
 #include <afs/prs_fs.h>
 #include <rx/rx.h>
-#include <rx/rxkad.h>
 #include <afs/keys.h>
 #include <afs/afs_args.h>
 #include <afs/vlserver.h>
diff --git a/src/vlserver/sascnvldb.c b/src/vlserver/sascnvldb.c
index a0802ef..956f3a3 100644
--- a/src/vlserver/sascnvldb.c
+++ b/src/vlserver/sascnvldb.c
@@ -28,7 +28,6 @@ RCSID
 #undef VICE
 #include "afs/prs_fs.h"
 #include <afs/afsint.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <ubik.h>
 #endif
diff --git a/src/vlserver/vlclient.c b/src/vlserver/vlclient.c
index 2671730..1408ae9 100644
--- a/src/vlserver/vlclient.c
+++ b/src/vlserver/vlclient.c
@@ -52,7 +52,6 @@ RCSID
 #include <rx/rx.h>
 #include <rx/rx_globals.h>
 #include <rx/rxkad.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
 #include <afs/cmd.h>
diff --git a/src/volser/volmain.c b/src/volser/volmain.c
index f30ae9c..78902cf 100644
--- a/src/volser/volmain.c
+++ b/src/volser/volmain.c
@@ -55,7 +55,6 @@ RCSID
 #include <rx/rx.h>
 #include <rx/rx_globals.h>
 #include <afs/auth.h>
-#include <rx/rxkad.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
 #include <ubik.h>
diff --git a/src/volser/volprocs.c b/src/volser/volprocs.c
index 0142415..9b5f158 100644
--- a/src/volser/volprocs.c
+++ b/src/volser/volprocs.c
@@ -49,7 +49,6 @@ RCSID
 #include <afs/nfs.h>
 #include <lwp.h>
 #include <lock.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
 #include <ubik.h>
diff --git a/src/volser/voltrans.c b/src/volser/voltrans.c
index 8a137bc..b6bad29 100644
--- a/src/volser/voltrans.c
+++ b/src/volser/voltrans.c
@@ -50,7 +50,6 @@ RCSID
 #include <afs/nfs.h>
 #include <lwp.h>
 #include <lock.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
 #include <rx/rx.h>
diff --git a/src/volser/vos.c b/src/volser/vos.c
index f425bfc..8fa83e1 100644
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -46,7 +46,6 @@ RCSID
 #include <rx/rx_globals.h>
 #include <afs/nfs.h>
 #include <afs/vlserver.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
 #include <afs/afsutil.h>
@@ -54,7 +53,6 @@ RCSID
 #include <afs/afsint.h>
 #include <afs/cmd.h>
 #include <afs/usd.h>
-#include <rx/rxkad.h>
 #include "volser.h"
 #include "volint.h"
 #include "lockdata.h"
diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c
index 9064b35..5e5a38e 100644
--- a/src/volser/vsprocs.c
+++ b/src/volser/vsprocs.c
@@ -41,7 +41,6 @@ RCSID
 #include <rx/rx.h>
 #include <afs/vlserver.h>
 #include <afs/nfs.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
 #include <ubik.h>
diff --git a/src/volser/vsutils.c b/src/volser/vsutils.c
index 6cec711..1aebfcc 100644
--- a/src/volser/vsutils.c
+++ b/src/volser/vsutils.c
@@ -43,7 +43,6 @@ RCSID
 #include <rx/rx_globals.h>
 #include <afs/nfs.h>
 #include <afs/vlserver.h>
-#include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
 #include <ubik.h>
@@ -407,15 +406,6 @@ vsu_ClientInit(noAuthFlag, confDir, cellName, sauth, uclientp, secproc)
      char *confDir;
      afs_int32 sauth;
 {
-    afs_int32 code, scIndex, i;
-    struct afsconf_cell info;
-    struct afsconf_dir *tdir;
-    struct ktc_principal sname;
-    struct ktc_token ttoken;
-    struct rx_securityClass *sc;
-    static struct rx_connection *serverconns[VLDB_MAXSERVERS];
-    char cellstr[64];
-
     return ugen_ClientInit(noAuthFlag, confDir, cellName, sauth, uclientp, 
 			   secproc, "vsu_ClientInit", vsu_rxkad_level,
 			   VLDB_MAXSERVERS, AFSCONF_VLDBSERVICE, 90,
-- 
1.9.4