Remove kauth from libuafs

[openafs.git] / src / libuafs / Makefile.common.in

diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in
index e264e9d..4124226 100644 (file)
--- a/src/libuafs/Makefile.common.in
+++ b/src/libuafs/Makefile.common.in
@@ -101,12 +101,12 @@ linktest: UAFS/$(LIBUAFS)
                $(LDFLAGS_roken) $(LDFLAGS_hcrypto) -o linktest \
                ${srcdir}/linktest.c $(COMMON_INCLUDE) -DUKERNEL \
                UAFS/$(LIBUAFS) ${TOP_LIBDIR}/libcmd.a \
-               ${TOP_LIBDIR}/libafsutil.a \
+               ${TOP_LIBDIR}/libafsutil.a $(TOP_LIBDIR)/libopr.a \
                $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) $(TEST_LIBS) $(XLIBS)
 
-CRULE1=        $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
-CRULE2=        $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) $(WEBOPTS) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
-CRULEPIC=$(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) $(SHLIB_CFLAGS) -c $?
+CRULE1=        $(RUN_CC) $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
+CRULE2=        $(RUN_CC) $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) $(WEBOPTS) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
+CRULEPIC=$(RUN_CC) $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) $(SHLIB_CFLAGS) -c $?
 
 UAFSOBJ = \
        $(UOBJ)/afs_atomlist.o \
@@ -201,6 +201,9 @@ UAFSOBJ = \
        $(UOBJ)/rx_stats.o \
        $(UOBJ)/rx_packet.o \
        $(UOBJ)/rx_conncache.o \
+       $(UOBJ)/rx_call.o \
+       $(UOBJ)/rx_conn.o \
+       $(UOBJ)/rx_peer.o \
        $(UOBJ)/xdr_rx.o \
        $(UOBJ)/Kvldbint.cs.o \
        $(UOBJ)/Kvldbint.xdr.o \
@@ -213,36 +216,11 @@ UAFSOBJ = \
        $(UOBJ)/casestrcpy.o \
        $(UOBJ)/dirpath.o \
        $(UOBJ)/fileutil.o \
-       $(UOBJ)/netutils.o \
-       $(UOBJ)/et_name.o \
-       $(UOBJ)/com_err.o \
-       $(UOBJ)/error_msg.o \
-       $(UOBJ)/uerrors.o \
-       $(UOBJ)/kaerrors.o \
-       $(UOBJ)/ktc_errors.o \
-       $(UOBJ)/rxkad_errs.o \
-       $(UOBJ)/authclient.o \
-       $(UOBJ)/authcon.o \
+       $(UOBJ)/netrestrict.o \
        $(UOBJ)/cellconfig.o \
        $(UOBJ)/keys.o \
-       $(UOBJ)/client.o \
-       $(UOBJ)/acfg_errors.o \
-       $(UOBJ)/kaaux.o \
-       $(UOBJ)/kalocalcell.o \
-       $(UOBJ)/kauth.cs.o \
-       $(UOBJ)/kauth.xdr.o \
+       $(UOBJ)/realms.o \
        $(UOBJ)/ktc.o \
-       $(UOBJ)/ptint.cs.o \
-       $(UOBJ)/ptint.xdr.o \
-       $(UOBJ)/ptuser.o \
-       $(UOBJ)/pterror.o \
-       $(UOBJ)/ticket.o \
-       $(UOBJ)/katoken.o \
-       $(UOBJ)/ubik_int.cs.o \
-       $(UOBJ)/ubik_int.xdr.o \
-       $(UOBJ)/ubikclient.o \
-       $(UOBJ)/user.o \
-       $(UOBJ)/hostparse.o \
        $(UOBJ)/Krxstat.ss.o \
        $(UOBJ)/Krxstat.xdr.o \
        $(UOBJ)/rxstat.o \
@@ -346,6 +324,9 @@ PICUAFSOBJ = \
        $(PICOBJ)/rx_stats.o \
        $(PICOBJ)/rx_packet.o \
        $(PICOBJ)/rx_conncache.o \
+       $(PICOBJ)/rx_call.o \
+       $(PICOBJ)/rx_conn.o \
+       $(PICOBJ)/rx_peer.o \
        $(PICOBJ)/xdr_rx.o \
        $(PICOBJ)/Kvldbint.cs.o \
        $(PICOBJ)/Kvldbint.xdr.o \
@@ -358,36 +339,11 @@ PICUAFSOBJ = \
        $(PICOBJ)/casestrcpy.o \
        $(PICOBJ)/dirpath.o \
        $(PICOBJ)/fileutil.o \
-       $(PICOBJ)/netutils.o \
-       $(PICOBJ)/et_name.o \
-       $(PICOBJ)/com_err.o \
-       $(PICOBJ)/error_msg.o \
-       $(PICOBJ)/uerrors.o \
-       $(PICOBJ)/kaerrors.o \
-       $(PICOBJ)/ktc_errors.o \
-       $(PICOBJ)/rxkad_errs.o \
-       $(PICOBJ)/authclient.o \
-       $(PICOBJ)/authcon.o \
+       $(PICOBJ)/netrestrict.o \
        $(PICOBJ)/cellconfig.o \
        $(PICOBJ)/keys.o \
-       $(PICOBJ)/client.o \
-       $(PICOBJ)/acfg_errors.o \
-       $(PICOBJ)/kaaux.o \
-       $(PICOBJ)/kalocalcell.o \
-       $(PICOBJ)/kauth.cs.o \
-       $(PICOBJ)/kauth.xdr.o \
+       $(PICOBJ)/realms.o \
        $(PICOBJ)/ktc.o \
-       $(PICOBJ)/ptint.cs.o \
-       $(PICOBJ)/ptint.xdr.o \
-       $(PICOBJ)/ptuser.o \
-       $(PICOBJ)/pterror.o \
-       $(PICOBJ)/ticket.o \
-       $(PICOBJ)/katoken.o \
-       $(PICOBJ)/ubik_int.cs.o \
-       $(PICOBJ)/ubik_int.xdr.o \
-       $(PICOBJ)/ubikclient.o \
-       $(PICOBJ)/user.o \
-       $(PICOBJ)/hostparse.o \
        $(PICOBJ)/Krxstat.ss.o \
        $(PICOBJ)/Krxstat.xdr.o \
        $(PICOBJ)/rxstat.o \
@@ -491,6 +447,9 @@ AFSWEBOBJ = \
        $(WEBOBJ)/rx_stats.o \
        $(WEBOBJ)/rx_packet.o \
        $(WEBOBJ)/rx_conncache.o \
+       $(WEBOBJ)/rx_call.o \
+       $(WEBOBJ)/rx_conn.o \
+       $(WEBOBJ)/rx_peer.o \
        $(WEBOBJ)/xdr_rx.o \
        $(WEBOBJ)/Kvldbint.cs.o \
        $(WEBOBJ)/Kvldbint.xdr.o \
@@ -503,37 +462,12 @@ AFSWEBOBJ = \
        $(WEBOBJ)/casestrcpy.o \
        $(WEBOBJ)/dirpath.o \
        $(WEBOBJ)/fileutil.o \
-       $(WEBOBJ)/netutils.o \
-       $(WEBOBJ)/et_name.o \
-       $(WEBOBJ)/com_err.o \
-       $(WEBOBJ)/error_msg.o \
-       $(WEBOBJ)/uerrors.o \
-       $(WEBOBJ)/kaerrors.o \
-       $(WEBOBJ)/ktc_errors.o \
-       $(WEBOBJ)/rxkad_errs.o \
-       $(WEBOBJ)/authclient.o \
-       $(WEBOBJ)/authcon.o \
+       $(WEBOBJ)/netrestrict.o \
        $(WEBOBJ)/cellconfig.o \
-       $(WEBOBJ)/client.o \
        $(WEBOBJ)/keys.o \
-       $(WEBOBJ)/acfg_errors.o \
-       $(WEBOBJ)/kaaux.o \
-       $(WEBOBJ)/kalocalcell.o \
-       $(WEBOBJ)/kauth.cs.o \
-       $(WEBOBJ)/kauth.xdr.o \
+       $(WEBOBJ)/realms.o \
        $(WEBOBJ)/ktc.o \
-       $(WEBOBJ)/ptint.cs.o \
-       $(WEBOBJ)/ptint.xdr.o \
-       $(WEBOBJ)/ptuser.o \
-       $(WEBOBJ)/pterror.o \
        $(WEBOBJ)/securehash.o \
-       $(WEBOBJ)/ticket.o \
-       $(WEBOBJ)/katoken.o \
-       $(WEBOBJ)/ubik_int.cs.o \
-       $(WEBOBJ)/ubik_int.xdr.o \
-       $(WEBOBJ)/ubikclient.o \
-       $(WEBOBJ)/user.o \
-       $(WEBOBJ)/hostparse.o \
        $(WEBOBJ)/nsafs.o \
        $(WEBOBJ)/Krxstat.ss.o \
        $(WEBOBJ)/Krxstat.xdr.o \
@@ -630,6 +564,9 @@ AFSWEBOBJKRB = \
        $(WEBOBJ)/rx_stats.o \
        $(WEBOBJ)/rx_packet.o \
        $(WEBOBJ)/rx_conncache.o \
+       $(WEBOBJ)/rx_call.o \
+       $(WEBOBJ)/rx_conn.o \
+       $(WEBOBJ)/rx_peer.o \
        $(WEBOBJ)/xdr_rx.o \
        $(WEBOBJ)/Kvldbint.cs.o \
        $(WEBOBJ)/Kvldbint.xdr.o \
@@ -642,36 +579,12 @@ AFSWEBOBJKRB = \
        $(WEBOBJ)/casestrcpy.o \
        $(WEBOBJ)/dirpath.o \
        $(WEBOBJ)/fileutil.o \
-       $(WEBOBJ)/netutils.o \
-       $(WEBOBJ)/et_name.o \
-       $(WEBOBJ)/com_err.o \
-       $(WEBOBJ)/error_msg.o \
-       $(WEBOBJ)/uerrors.o \
-       $(WEBOBJ)/kaerrors.o \
-       $(WEBOBJ)/ktc_errors.o \
-       $(WEBOBJ)/rxkad_errs.o \
-       $(WEBOBJ)/authclient.o \
-       $(WEBOBJ)/authcon.o \
+       $(WEBOBJ)/netrestrict.o \
        $(WEBOBJ)/cellconfig.o \
-       $(WEBOBJ)/client.o \
        $(WEBOBJ)/keys.o \
-       $(WEBOBJ)/acfg_errors.o \
-       $(WEBOBJ)/kaaux.o \
-       $(WEBOBJ)/kalocalcell.o \
-       $(WEBOBJ)/kauth.cs.o \
-       $(WEBOBJ)/kauth.xdr.o \
+       $(WEBOBJ)/realms.o \
        $(WEBOBJ)/ktc.krb.o \
-       $(WEBOBJ)/ptint.cs.o \
-       $(WEBOBJ)/ptint.xdr.o \
-       $(WEBOBJ)/ptuser.o \
-       $(WEBOBJ)/pterror.o \
        $(WEBOBJ)/securehash.o \
-       $(WEBOBJ)/ticket.o \
-       $(WEBOBJ)/katoken.o \
-       $(WEBOBJ)/ubik_int.cs.o \
-       $(WEBOBJ)/ubik_int.xdr.o \
-       $(WEBOBJ)/ubikclient.o \
-       $(WEBOBJ)/user.o \
        $(WEBOBJ)/nsafs.o \
        $(WEBOBJ)/Krxstat.ss.o \
        $(WEBOBJ)/Krxstat.xdr.o \
@@ -773,6 +686,9 @@ JUAFSOBJ = \
        $(JUAFS)/rx_stats.o \
        $(JUAFS)/rx_packet.o \
        $(JUAFS)/rx_conncache.o \
+       $(JUAFS)/rx_call.o \
+       $(JUAFS)/rx_conn.o \
+       $(JUAFS)/rx_peer.o \
        $(JUAFS)/xdr_rx.o \
        $(JUAFS)/Kvldbint.cs.o \
        $(JUAFS)/Kvldbint.xdr.o \
@@ -785,36 +701,11 @@ JUAFSOBJ = \
        $(JUAFS)/casestrcpy.o \
        $(JUAFS)/dirpath.o \
        $(JUAFS)/fileutil.o \
-       $(JUAFS)/netutils.o \
-       $(JUAFS)/et_name.o \
-       $(JUAFS)/com_err.o \
-       $(JUAFS)/error_msg.o \
-       $(JUAFS)/uerrors.o \
-       $(JUAFS)/kaerrors.o \
-       $(JUAFS)/ktc_errors.o \
-       $(JUAFS)/rxkad_errs.o \
-       $(JUAFS)/authclient.o \
-       $(JUAFS)/authcon.o \
+       $(JUAFS)/netrestrict.o \
        $(JUAFS)/cellconfig.o \
        $(JUAFS)/keys.o \
-       $(JUAFS)/client.o \
-       $(JUAFS)/acfg_errors.o \
-       $(JUAFS)/kaaux.o \
-       $(JUAFS)/kalocalcell.o \
-       $(JUAFS)/kauth.cs.o \
-       $(JUAFS)/kauth.xdr.o \
+       $(JUAFS)/realms.o \
        $(JUAFS)/ktc.o \
-       $(JUAFS)/ptint.cs.o \
-       $(JUAFS)/ptint.xdr.o \
-       $(JUAFS)/ptuser.o \
-       $(JUAFS)/pterror.o \
-       $(JUAFS)/ticket.o \
-       $(JUAFS)/katoken.o \
-       $(JUAFS)/ubik_int.cs.o \
-       $(JUAFS)/ubik_int.xdr.o \
-       $(JUAFS)/ubikclient.o \
-       $(JUAFS)/user.o \
-       $(JUAFS)/hostparse.o \
        $(JUAFS)/Krxstat.ss.o \
        $(JUAFS)/Krxstat.xdr.o \
        $(JUAFS)/rxstat.o \
@@ -974,6 +865,12 @@ $(UOBJ)/rx_packet.o: $(TOP_SRC_RX)/rx_packet.c
        $(CRULE1)
 $(UOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
        $(CRULE1)
+$(UOBJ)/rx_call.o: $(TOP_SRCDIR)/rx/rx_call.c
+       $(CRULE1)
+$(UOBJ)/rx_conn.o: $(TOP_SRCDIR)/rx/rx_conn.c
+       $(CRULE1)
+$(UOBJ)/rx_peer.o: $(TOP_SRCDIR)/rx/rx_peer.c
+       $(CRULE1)
 $(UOBJ)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
        $(CRULE1)
 $(UOBJ)/xdr_int32.o: $(TOP_SRC_RX)/xdr_int32.c
@@ -1042,71 +939,19 @@ $(UOBJ)/osi_vfsops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vfsops.c
        $(CRULE1) -DAFS_NONFSTRANS
 $(UOBJ)/ktc.o:         $(TOP_SRCDIR)/auth/ktc.c
        $(CRULE1) @CFLAGS_NOERROR@
-$(UOBJ)/ticket.o: $(TOP_SRCDIR)/rxkad/ticket.c
-       $(CRULE1)
-$(UOBJ)/rxkad_server.o: $(TOP_SRCDIR)/rxkad/rxkad_server.c
-       $(CRULE1)
-$(UOBJ)/ptint.cs.o: $(TOP_OBJDIR)/src/ptserver/ptint.cs.c
-       $(CRULE1)
-$(UOBJ)/ptint.xdr.o: $(TOP_OBJDIR)/src/ptserver/ptint.xdr.c
-       $(CRULE1)
-$(UOBJ)/ptuser.o: $(TOP_SRCDIR)/ptserver/ptuser.c
-       $(CRULE1)
-$(UOBJ)/pterror.o: $(TOP_OBJDIR)/src/ptserver/pterror.c
-       $(CRULE1)
-$(UOBJ)/ubikclient.o: $(TOP_SRCDIR)/ubik/ubikclient.c
-       $(CRULE1)
-$(UOBJ)/ubik_int.cs.o: $(TOP_OBJDIR)/src/ubik/ubik_int.cs.c
-       $(CRULE1)
-$(UOBJ)/ubik_int.xdr.o: $(TOP_OBJDIR)/src/ubik/ubik_int.xdr.c
-       $(CRULE1)
-$(UOBJ)/authclient.o: $(TOP_SRCDIR)/kauth/authclient.c
-       $(CRULE1)
-$(UOBJ)/kalocalcell.o: $(TOP_SRCDIR)/kauth/kalocalcell.c
-       $(CRULE1)
-$(UOBJ)/client.o: $(TOP_SRCDIR)/kauth/client.c
-       $(CRULE1)
-$(UOBJ)/user.o: $(TOP_SRCDIR)/kauth/user.c
-       $(CRULE1)
-$(UOBJ)/hostparse.o: $(TOP_SRCDIR)/util/hostparse.c
-       $(CRULE1)
-$(UOBJ)/katoken.o: $(TOP_SRCDIR)/kauth/katoken.c
-       $(CRULE1)
-$(UOBJ)/acfg_errors.o: $(TOP_OBJDIR)/src/auth/acfg_errors.c
-       $(CRULE1)
-$(UOBJ)/kaaux.o: $(TOP_SRCDIR)/kauth/kaaux.c
-       $(CRULE1)
-$(UOBJ)/authcon.o: $(TOP_SRCDIR)/auth/authcon.c
-       $(CRULE1)
 $(UOBJ)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c
        $(CRULE1)
 $(UOBJ)/keys.o: $(TOP_SRCDIR)/auth/keys.c
        $(CRULE1)
 $(UOBJ)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
        $(CRULE1)
+$(UOBJ)/realms.o: $(TOP_SRCDIR)/auth/realms.c
+       $(CRULE1)
 $(UOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
        $(CRULE1)
 $(UOBJ)/fileutil.o: $(TOP_SRCDIR)/util/fileutil.c
        $(CRULE1)
-$(UOBJ)/netutils.o: $(TOP_SRCDIR)/util/netutils.c
-       $(CRULE1)
-$(UOBJ)/et_name.o: $(TOP_SRCDIR)/comerr/et_name.c
-       $(CRULE1)
-$(UOBJ)/com_err.o: $(TOP_SRCDIR)/comerr/com_err.c
-       $(CRULE1)
-$(UOBJ)/error_msg.o: $(TOP_SRCDIR)/comerr/error_msg.c
-       $(CRULE1)
-$(UOBJ)/uerrors.o: $(TOP_OBJDIR)/src/ubik/uerrors.c
-       $(CRULE1)
-$(UOBJ)/kaerrors.o: $(TOP_OBJDIR)/src/kauth/kaerrors.c
-       $(CRULE1)
-$(UOBJ)/ktc_errors.o: $(TOP_OBJDIR)/src/auth/ktc_errors.c
-       $(CRULE1)
-$(UOBJ)/rxkad_errs.o: $(TOP_OBJDIR)/src/rxkad/rxkad_errs.c
-       $(CRULE1)
-$(UOBJ)/kauth.cs.o: $(TOP_OBJDIR)/src/kauth/kauth.cs.c
-       $(CRULE1)
-$(UOBJ)/kauth.xdr.o: $(TOP_OBJDIR)/src/kauth/kauth.xdr.c
+$(UOBJ)/netrestrict.o: $(TOP_SRCDIR)/auth/netrestrict.c
        $(CRULE1)
 $(UOBJ)/rxstat.o: $(TOP_SRC_RXSTAT)/rxstat.c
        $(CRULE1)
@@ -1271,6 +1116,12 @@ $(PICOBJ)/rx_packet.o: $(TOP_SRC_RX)/rx_packet.c
        $(CRULEPIC)
 $(PICOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
        $(CRULEPIC)
+$(PICOBJ)/rx_call.o: $(TOP_SRCDIR)/rx/rx_call.c
+       $(CRULEPIC)
+$(PICOBJ)/rx_conn.o: $(TOP_SRCDIR)/rx/rx_conn.c
+       $(CRULEPIC)
+$(PICOBJ)/rx_peer.o: $(TOP_SRCDIR)/rx/rx_peer.c
+       $(CRULEPIC)
 $(PICOBJ)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
        $(CRULEPIC)
 $(PICOBJ)/xdr_int32.o: $(TOP_SRC_RX)/xdr_int32.c
@@ -1339,71 +1190,19 @@ $(PICOBJ)/osi_vfsops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vfsops.c
        $(CRULEPIC) -DAFS_NONFSTRANS
 $(PICOBJ)/ktc.o:       $(TOP_SRCDIR)/auth/ktc.c
        $(CRULEPIC) @CFLAGS_NOERROR@
-$(PICOBJ)/ticket.o: $(TOP_SRCDIR)/rxkad/ticket.c
-       $(CRULEPIC)
-$(PICOBJ)/rxkad_server.o: $(TOP_SRCDIR)/rxkad/rxkad_server.c
-       $(CRULEPIC)
-$(PICOBJ)/ptint.cs.o: $(TOP_OBJDIR)/src/ptserver/ptint.cs.c
-       $(CRULEPIC)
-$(PICOBJ)/ptint.xdr.o: $(TOP_OBJDIR)/src/ptserver/ptint.xdr.c
-       $(CRULEPIC)
-$(PICOBJ)/ptuser.o: $(TOP_SRCDIR)/ptserver/ptuser.c
-       $(CRULEPIC)
-$(PICOBJ)/pterror.o: $(TOP_OBJDIR)/src/ptserver/pterror.c
-       $(CRULEPIC)
-$(PICOBJ)/ubikclient.o: $(TOP_SRCDIR)/ubik/ubikclient.c
-       $(CRULEPIC)
-$(PICOBJ)/ubik_int.cs.o: $(TOP_OBJDIR)/src/ubik/ubik_int.cs.c
-       $(CRULEPIC)
-$(PICOBJ)/ubik_int.xdr.o: $(TOP_OBJDIR)/src/ubik/ubik_int.xdr.c
-       $(CRULEPIC)
-$(PICOBJ)/authclient.o: $(TOP_SRCDIR)/kauth/authclient.c
-       $(CRULEPIC)
-$(PICOBJ)/kalocalcell.o: $(TOP_SRCDIR)/kauth/kalocalcell.c
-       $(CRULEPIC)
-$(PICOBJ)/client.o: $(TOP_SRCDIR)/kauth/client.c
-       $(CRULEPIC)
-$(PICOBJ)/user.o: $(TOP_SRCDIR)/kauth/user.c
-       $(CRULEPIC)
-$(PICOBJ)/hostparse.o: $(TOP_SRCDIR)/util/hostparse.c
-       $(CRULEPIC)
-$(PICOBJ)/katoken.o: $(TOP_SRCDIR)/kauth/katoken.c
-       $(CRULEPIC)
-$(PICOBJ)/acfg_errors.o: $(TOP_OBJDIR)/src/auth/acfg_errors.c
-       $(CRULEPIC)
-$(PICOBJ)/kaaux.o: $(TOP_SRCDIR)/kauth/kaaux.c
-       $(CRULEPIC)
-$(PICOBJ)/authcon.o: $(TOP_SRCDIR)/auth/authcon.c
-       $(CRULEPIC)
 $(PICOBJ)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c
        $(CRULEPIC)
 $(PICOBJ)/keys.o: $(TOP_SRCDIR)/auth/keys.c
        $(CRULEPIC)
 $(PICOBJ)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
        $(CRULEPIC)
+$(PICOBJ)/realms.o: $(TOP_SRCDIR)/auth/realms.c
+       $(CRULEPIC)
 $(PICOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
        $(CRULEPIC)
 $(PICOBJ)/fileutil.o: $(TOP_SRCDIR)/util/fileutil.c
        $(CRULEPIC)
-$(PICOBJ)/netutils.o: $(TOP_SRCDIR)/util/netutils.c
-       $(CRULEPIC)
-$(PICOBJ)/et_name.o: $(TOP_SRCDIR)/comerr/et_name.c
-       $(CRULEPIC)
-$(PICOBJ)/com_err.o: $(TOP_SRCDIR)/comerr/com_err.c
-       $(CRULEPIC)
-$(PICOBJ)/error_msg.o: $(TOP_SRCDIR)/comerr/error_msg.c
-       $(CRULEPIC)
-$(PICOBJ)/uerrors.o: $(TOP_OBJDIR)/src/ubik/uerrors.c
-       $(CRULEPIC)
-$(PICOBJ)/kaerrors.o: $(TOP_OBJDIR)/src/kauth/kaerrors.c
-       $(CRULEPIC)
-$(PICOBJ)/ktc_errors.o: $(TOP_OBJDIR)/src/auth/ktc_errors.c
-       $(CRULEPIC)
-$(PICOBJ)/rxkad_errs.o: $(TOP_OBJDIR)/src/rxkad/rxkad_errs.c
-       $(CRULEPIC)
-$(PICOBJ)/kauth.cs.o: $(TOP_OBJDIR)/src/kauth/kauth.cs.c
-       $(CRULEPIC)
-$(PICOBJ)/kauth.xdr.o: $(TOP_OBJDIR)/src/kauth/kauth.xdr.c
+$(PICOBJ)/netrestrict.o: $(TOP_SRCDIR)/auth/netrestrict.c
        $(CRULEPIC)
 $(PICOBJ)/rxstat.o: $(TOP_SRC_RXSTAT)/rxstat.c
        $(CRULEPIC)
@@ -1570,6 +1369,12 @@ $(WEBOBJ)/rx_packet.o: $(TOP_SRC_RX)/rx_packet.c
        $(CRULE2)
 $(WEBOBJ)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
        $(CRULE2)
+$(WEBOBJ)/rx_call.o: $(TOP_SRCDIR)/rx_rx_call.c
+       $(CRULE2)
+$(WEBOBJ)/rx_conn.o: $(TOP_SRCDIR)/rx/rx_conn.c
+       $(CRULE2)
+$(WEBOBJ)/rx_peer.o: $(TOP_SRCDIR)/rx/rx_peer.c
+       $(CRULE2)
 $(WEBOBJ)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
        $(CRULE2)
 $(WEBOBJ)/afs_usrops.o: $(TOP_SRC_AFS)/UKERNEL/afs_usrops.c
@@ -1641,72 +1446,20 @@ $(WEBOBJ)/securehash.o: $(TOP_SRCDIR)/afsweb/securehash.c
        $(CRULE2)
 $(WEBOBJ)/nsafs.o: $(TOP_SRCDIR)/afsweb/nsafs.c
        $(CRULE2)
-$(WEBOBJ)/ticket.o: $(TOP_SRCDIR)/rxkad/ticket.c
-       $(CRULE2)
-$(WEBOBJ)/rxkad_server.o: $(TOP_SRCDIR)/rxkad/rxkad_server.c
-       $(CRULE2)
-$(WEBOBJ)/ptint.cs.o: $(TOP_OBJDIR)/src/ptserver/ptint.cs.c
-       $(CRULE2)
-$(WEBOBJ)/ptint.xdr.o: $(TOP_OBJDIR)/src/ptserver/ptint.xdr.c
-       $(CRULE2)
-$(WEBOBJ)/ptuser.o: $(TOP_SRCDIR)/ptserver/ptuser.c
-       $(CRULE2)
-$(WEBOBJ)/pterror.o: $(TOP_OBJDIR)/src/ptserver/pterror.c
-       $(CRULE2)
-$(WEBOBJ)/ubikclient.o: $(TOP_SRCDIR)/ubik/ubikclient.c
-       $(CRULE2)
-$(WEBOBJ)/ubik_int.cs.o: $(TOP_OBJDIR)/src/ubik/ubik_int.cs.c
-       $(CRULE2)
-$(WEBOBJ)/ubik_int.xdr.o: $(TOP_OBJDIR)/src/ubik/ubik_int.xdr.c
-       $(CRULE2)
-$(WEBOBJ)/authclient.o: $(TOP_SRCDIR)/kauth/authclient.c
-       $(CRULE2)
-$(WEBOBJ)/kalocalcell.o: $(TOP_SRCDIR)/kauth/kalocalcell.c
-       $(CRULE2)
-$(WEBOBJ)/client.o: $(TOP_SRCDIR)/kauth/client.c
-       $(CRULE2)
-$(WEBOBJ)/user.o: $(TOP_SRCDIR)/kauth/user.c
-       $(CRULE2)
-$(WEBOBJ)/hostparse.o: $(TOP_SRCDIR)/util/hostparse.c
-       $(CRULE2)
-$(WEBOBJ)/katoken.o: $(TOP_SRCDIR)/kauth/katoken.c
-       $(CRULE2)
-$(WEBOBJ)/acfg_errors.o: $(TOP_OBJDIR)/src/auth/acfg_errors.c
-       $(CRULE2)
-$(WEBOBJ)/kaaux.o: $(TOP_SRCDIR)/kauth/kaaux.c
-       $(CRULE2)
-$(WEBOBJ)/kauth.cs.o: $(TOP_OBJDIR)/src/kauth/kauth.cs.c
-       $(CRULE2)
-$(WEBOBJ)/kauth.xdr.o: $(TOP_OBJDIR)/src/kauth/kauth.xdr.c
-       $(CRULE2)
-$(WEBOBJ)/authcon.o: $(TOP_SRCDIR)/auth/authcon.c
-       $(CRULE2)
 $(WEBOBJ)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c
        $(CRULE2)
 $(WEBOBJ)/keys.o: $(TOP_SRCDIR)/auth/keys.c
        $(CRULE2)
 $(WEBOBJ)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
        $(CRULE1)
+$(WEBOBJ)/realms.o: $(TOP_SRCDIR)/auth/realms.c
+       $(CRULE2)
 $(WEBOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
        $(CRULE1)
 $(WEBOBJ)/fileutil.o: $(TOP_SRCDIR)/util/fileutil.c
        $(CRULE1)
-$(WEBOBJ)/netutils.o: $(TOP_SRCDIR)/util/netutils.c
+$(WEBOBJ)/netrestrict.o: $(TOP_SRCDIR)/auth/netrestrict.c
        $(CRULE1)
-$(WEBOBJ)/et_name.o: $(TOP_SRCDIR)/comerr/et_name.c
-       $(CRULE2)
-$(WEBOBJ)/com_err.o: $(TOP_SRCDIR)/comerr/com_err.c
-       $(CRULE2)
-$(WEBOBJ)/error_msg.o: $(TOP_SRCDIR)/comerr/error_msg.c
-       $(CRULE2)
-$(WEBOBJ)/uerrors.o: $(TOP_OBJDIR)/src/ubik/uerrors.c
-       $(CRULE2)
-$(WEBOBJ)/kaerrors.o: $(TOP_OBJDIR)/src/kauth/kaerrors.c
-       $(CRULE2)
-$(WEBOBJ)/ktc_errors.o: $(TOP_OBJDIR)/src/auth/ktc_errors.c
-       $(CRULE2)
-$(WEBOBJ)/rxkad_errs.o: $(TOP_OBJDIR)/src/rxkad/rxkad_errs.c
-       $(CRULE2)
 $(WEBOBJ)/rxstat.o: $(TOP_SRC_RXSTAT)/rxstat.c
        $(CRULE2)
 $(WEBOBJ)/Krxstat.ss.o: $(TOP_OBJ_RXSTAT)/Krxstat.ss.c
@@ -1873,6 +1626,12 @@ $(JUAFS)/rx_packet.o: $(TOP_SRC_RX)/rx_packet.c
        $(CRULE1)
 $(JUAFS)/rx_conncache.o: $(TOP_SRCDIR)/rx/rx_conncache.c
        $(CRULE1)
+$(JUAFS)/rx_call.o: $(TOP_SRC_RX)/rx_call.c
+       $(CRULE1)
+$(JUAFS)/rx_conn.o: $(TOP_SRC_RX)/rx_conn.c
+       $(CRULE1)
+$(JUAFS)/rx_peer.o: $(TOP_SRC_RX)/rx_peer.c
+       $(CRULE1)
 $(JUAFS)/xdr_rx.o: $(TOP_SRC_RX)/xdr_rx.c
        $(CRULE1)
 $(JUAFS)/xdr_int64.o: $(TOP_SRC_RX)/xdr_int64.c
@@ -1937,71 +1696,19 @@ $(JUAFS)/osi_vfsops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vfsops.c
        $(CRULE1) -DAFS_NONFSTRANS
 $(JUAFS)/ktc.o:        $(TOP_SRCDIR)/auth/ktc.c
        $(CRULE1) @CFLAGS_NOERROR@
-$(JUAFS)/ticket.o: $(TOP_SRCDIR)/rxkad/ticket.c
-       $(CRULE1)
-$(JUAFS)/rxkad_server.o: $(TOP_SRCDIR)/rxkad/rxkad_server.c
-       $(CRULE1)
-$(JUAFS)/ptint.cs.o: $(TOP_OBJDIR)/src/ptserver/ptint.cs.c
-       $(CRULE1)
-$(JUAFS)/ptint.xdr.o: $(TOP_OBJDIR)/src/ptserver/ptint.xdr.c
-       $(CRULE1)
-$(JUAFS)/ptuser.o: $(TOP_SRCDIR)/ptserver/ptuser.c
-       $(CRULE1)
-$(JUAFS)/pterror.o: $(TOP_OBJDIR)/src/ptserver/pterror.c
-       $(CRULE1)
-$(JUAFS)/ubikclient.o: $(TOP_SRCDIR)/ubik/ubikclient.c
-       $(CRULE1)
-$(JUAFS)/ubik_int.cs.o: $(TOP_OBJDIR)/src/ubik/ubik_int.cs.c
-       $(CRULE1)
-$(JUAFS)/ubik_int.xdr.o: $(TOP_OBJDIR)/src/ubik/ubik_int.xdr.c
-       $(CRULE1)
-$(JUAFS)/authclient.o: $(TOP_SRCDIR)/kauth/authclient.c
-       $(CRULE1)
-$(JUAFS)/kalocalcell.o: $(TOP_SRCDIR)/kauth/kalocalcell.c
-       $(CRULE1)
-$(JUAFS)/client.o: $(TOP_SRCDIR)/kauth/client.c
-       $(CRULE1)
-$(JUAFS)/user.o: $(TOP_SRCDIR)/kauth/user.c
-       $(CRULE1)
-$(JUAFS)/hostparse.o: $(TOP_SRCDIR)/util/hostparse.c
-       $(CRULE1)
-$(JUAFS)/katoken.o: $(TOP_SRCDIR)/kauth/katoken.c
-       $(CRULE1)
-$(JUAFS)/acfg_errors.o: $(TOP_OBJDIR)/src/auth/acfg_errors.c
-       $(CRULE1)
-$(JUAFS)/kaaux.o: $(TOP_SRCDIR)/kauth/kaaux.c
-       $(CRULE1)
-$(JUAFS)/authcon.o: $(TOP_SRCDIR)/auth/authcon.c
-       $(CRULE1)
 $(JUAFS)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c
        $(CRULE1)
 $(JUAFS)/keys.o: $(TOP_SRCDIR)/auth/keys.c
        $(CRULE1)
 $(JUAFS)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c
        $(CRULE1)
+$(JUAFS)/realms.o: $(TOP_SRCDIR)/auth/realms.c
+       $(CRULE1)
 $(JUAFS)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c
        $(CRULE1)
 $(JUAFS)/fileutil.o: $(TOP_SRCDIR)/util/fileutil.c
        $(CRULE1)
-$(JUAFS)/netutils.o: $(TOP_SRCDIR)/util/netutils.c
-       $(CRULE1)
-$(JUAFS)/et_name.o: $(TOP_SRCDIR)/comerr/et_name.c
-       $(CRULE1)
-$(JUAFS)/com_err.o: $(TOP_SRCDIR)/comerr/com_err.c
-       $(CRULE1)
-$(JUAFS)/error_msg.o: $(TOP_SRCDIR)/comerr/error_msg.c
-       $(CRULE1)
-$(JUAFS)/uerrors.o: $(TOP_OBJDIR)/src/ubik/uerrors.c
-       $(CRULE1)
-$(JUAFS)/kaerrors.o: $(TOP_OBJDIR)/src/kauth/kaerrors.c
-       $(CRULE1)
-$(JUAFS)/ktc_errors.o: $(TOP_OBJDIR)/src/auth/ktc_errors.c
-       $(CRULE1)
-$(JUAFS)/rxkad_errs.o: $(TOP_OBJDIR)/src/rxkad/rxkad_errs.c
-       $(CRULE1)
-$(JUAFS)/kauth.cs.o: $(TOP_OBJDIR)/src/kauth/kauth.cs.c
-       $(CRULE1)
-$(JUAFS)/kauth.xdr.o: $(TOP_OBJDIR)/src/kauth/kauth.xdr.c
+$(JUAFS)/netrestrict.o: $(TOP_SRCDIR)/auth/netrestrict.c
        $(CRULE1)
 $(JUAFS)/rxstat.o: $(TOP_SRC_RXSTAT)/rxstat.c
        $(CRULE1)
@@ -2033,14 +1740,16 @@ $(PERLUAFS)/ukernel.so: $(PERLUAFS)/ukernel_swig_perl.o UAFS.pic/libuafs_pic.a
                $(SWIG_PERL_LDFLAGS) $(LDFLAGS) \
                $(PERLUAFS)/ukernel_swig_perl.o \
                UAFS.pic/libuafs_pic.a ${TOP_LIBDIR}/libcmd_pic.a \
-               ${TOP_LIBDIR}/libafsutil_pic.a $(LDFLAGS_roken) \
-               $(LDFLAGS_hcrypto) $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) \
+               ${TOP_LIBDIR}/libafsutil_pic.a \
+               $(TOP_LIBDIR)/libopr_pic.a \
+               $(LDFLAGS_roken) $(LDFLAGS_hcrypto) $(LIB_hcrypto) \
+               $(LIB_roken) $(LIB_crypt) \
                $(XLIBS)
 
 clean:
        -$(RM) -rf UAFS* JUAFS* AFSWEB* PERLUAFS nsapi afsd afs afsint config rx
        -$(RM) -rf h
-       -$(RM) linktest $(AFS_OS_CLEAN)
+       -$(RM) -f linktest $(AFS_OS_CLEAN)
 
 install: UAFS/$(LIBUAFS) JUAFS/$(LIBJUAFS) UAFS.pic/libuafs_pic.a \
                @LIBUAFS_BUILD_PERL@
@@ -2072,7 +1781,7 @@ dest: $(TOP_INCDIR)/afs/param.h $(TOP_INCDIR)/afs/stds.h \
                ${DEST}/root.perf/include/afs/afs_sysnames.h
        ${INSTALL_DATA} $(TOP_INCDIR)/afs/afs_stats.h \
                ${DEST}/root.perf/include/afs/afs_stats.h
-       ${INSTALL_DATA} $(TOP_SRCDIR)/afs/sysincludes.h \
+       ${INSTALL_DATA} $(TOP_SRCDIR)/afs/UKERNEL/sysincludes.h \
                ${DEST}/root.perf/include/afs/sysincludes.h
        ${INSTALL_DATA} $(TOP_SRCDIR)/afs/UKERNEL/afs_usrops.h \
                ${DEST}/root.perf/include/afs/afs_usrops.h
@@ -2101,11 +1810,13 @@ JUAFS:
 AFSWEB:
        mkdir -p $@
 
-setup_common:
-       -$(RM) -f nsapi afsd
+h: $(TOP_SRC_AFS)/*.c $(TOP_SRC_VNOPS)/*.c $(TOP_SRC_RX)/*.c
        -$(RM) -rf h
-       @TOP_SRCDIR@/libuafs/make_h_tree.pl $(TOP_SRC_AFS) $(TOP_SRC_VNOPS) \
+       @TOP_SRCDIR@/libuafs/make_h_tree $(TOP_SRC_AFS) $(TOP_SRC_VNOPS) \
                $(TOP_SRC_RX)
+
+setup_common: h
+       -$(RM) -f nsapi afsd
        -ln -s $(TOP_SRCDIR)/afsd afsd
        -ln -s $(NS_INCL) nsapi
 
@@ -2141,7 +1852,7 @@ UAFS.pic/libuafs_pic.a: setup_picuafs
 
 JUAFS/$(LIBJUAFS): setup_juafs
        cd JUAFS && \
-       $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS && \
+       $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=&& \
        $(RANLIB) $(LIBJUAFS)
 
 AFSWEB/$(LIBAFSWEB): setup_nsafs