Deorbit the netscape plugin
authorBenjamin Kaduk <kaduk@mit.edu>
Sat, 20 Sep 2014 01:45:31 +0000 (21:45 -0400)
committerD Brashear <shadow@your-file-system.com>
Wed, 8 Oct 2014 14:50:49 +0000 (10:50 -0400)
Netscape hasn't been a thing since 2008.

We would only try to build it if someone manually ran 'webinstall'
in src/libuafs, and there is no documentation telling anyone to do so.

It's dead, Jim.

Change-Id: I7486ca33da7ff19f23f0d9f54f5fb4e7e3232540
Reviewed-on: http://gerrit.openafs.org/11470
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: D Brashear <shadow@your-file-system.com>
Tested-by: D Brashear <shadow@your-file-system.com>

17 files changed:
src/afs/UKERNEL/afs_usrops.c
src/afs/UKERNEL/sysincludes.h
src/libuafs/.gitignore
src/libuafs/Makefile.common.in
src/libuafs/MakefileProto.AIX.in
src/libuafs/MakefileProto.DARWIN.in
src/libuafs/MakefileProto.DFBSD.in
src/libuafs/MakefileProto.DUX.in
src/libuafs/MakefileProto.FBSD.in
src/libuafs/MakefileProto.HPUX.in
src/libuafs/MakefileProto.IRIX.in
src/libuafs/MakefileProto.LINUX.in
src/libuafs/MakefileProto.NBSD.in
src/libuafs/MakefileProto.OBSD.in
src/libuafs/MakefileProto.SOLARIS.in
src/libuafs/mapfile [deleted file]
src/libuafs/nsafslib.exp [deleted file]

index 8bd8433..009d27a 100644 (file)
@@ -94,16 +94,12 @@ afs_lock_t afs_ftf;
 afs_lock_t osi_flplock;
 afs_lock_t osi_fsplock;
 
-#ifndef NETSCAPE_NSAPI
-
 /*
  * Mutex and condition variable used to implement sleep
  */
 pthread_mutex_t usr_sleep_mutex;
 pthread_cond_t usr_sleep_cond;
 
-#endif /* !NETSCAPE_NSAPI */
-
 int call_syscall(long, long, long, long, long, long);
 int fork_syscall(long, long, long, long, long, long);
 
@@ -1054,14 +1050,12 @@ osi_Init(void)
     afs_global_procp->p_ppid = (pid_t) 1;
     afs_global_procp->p_ucred = afs_global_ucredp;
 
-#ifndef NETSCAPE_NSAPI
     /*
      * Initialize the mutex and condition variable used to implement
      * time sleeps.
      */
     pthread_mutex_init(&usr_sleep_mutex, NULL);
     pthread_cond_init(&usr_sleep_cond, NULL);
-#endif /* !NETSCAPE_NSAPI */
 
     /*
      * Initialize the hash table used for sleep/wakeup
@@ -1386,13 +1380,8 @@ struct syscallThreadArgs {
     long param4;
 };
 
-#ifdef NETSCAPE_NSAPI
-void
-syscallThread(void *argp)
-#else /* NETSCAPE_NSAPI */
 void *
 syscallThread(void *argp)
-#endif                         /* NETSCAPE_NSAPI */
 {
     int i;
     struct usr_ucred *crp;
index 38904cc..bca0ceb 100644 (file)
@@ -173,16 +173,8 @@ typedef unsigned int fsblkcnt_t;
 
 #include  <sys/stat.h>         /* afs_usrops.h uses struct stat in prototypes */
 
-#ifdef NETSCAPE_NSAPI
-
-#include  <nsapi.h>
-
-#else /* NETSCAPE_NSAPI */
-
 #include  <pthread.h>
 
-#endif /* NETSCAPE_NSAPI */
-
 #ifdef AFS_USR_UNDEF_KERNEL_ENV
 #undef AFS_USR_UNDEF_KERNEL_ENV
 #define KERNEL 1
@@ -848,91 +840,6 @@ static_inline void panic(const char *format, ...)
 #define abort()                        assert(0)
 #define usr_assert(A)          assert(A)
 
-#ifdef NETSCAPE_NSAPI
-
-/*
- * All CONDVARs created with the same CRITICAL end up being the
- * same CONDVAR, not a new one. If we want to use more than
- * one usr_cond_t with the same usr_mutex_t, then we need a CRITICAL
- * for each CONDVAR, otherwise we cannot know which thread we are
- * waking when we do the signal.
- */
-typedef struct {
-    int waiters;
-    CRITICAL lock;
-    CONDVAR cond;
-} usr_cond_t;
-
-#define usr_mutex_t            CRITICAL
-#define usr_thread_t           SYS_THREAD
-#define usr_key_t              int
-
-#define usr_mutex_init(A)      (*(A)=crit_init(), 0)
-#define usr_mutex_destroy(A)   (crit_terminate(*(A)), 0)
-#define usr_mutex_lock(A)      crit_enter(*(A))
-#define usr_mutex_trylock(A)   (crit_enter(*(A)),1)
-#define usr_mutex_unlock(A)    crit_exit(*(A))
-
-#define usr_cond_init(A)       \
-     ((A)->waiters = 0,                \
-      (A)->lock = crit_init(), \
-      (A)->cond = condvar_init((A)->lock), 0)
-
-#define usr_cond_destroy(A)    \
-    (condvar_terminate((A)->cond), \
-     crit_terminate((A)->lock), 0)
-
-#define usr_cond_signal(A)     \
-{                              \
-    crit_enter((A)->lock);     \
-    if ((A)->waiters != 0) {   \
-      condvar_notify((A)->cond);\
-      (A)->waiters -= 1;       \
-    }                          \
-    crit_exit((A)->lock);      \
-}
-
-#define usr_cond_broadcast(A)  \
-{                              \
-   crit_enter((A)->lock);      \
-   while ((A)->waiters != 0) { \
-     condvar_notify((A)->cond);        \
-     (A)->waiters -= 1;                \
-   }                           \
-   crit_exit((A)->lock);       \
-}
-
-#define usr_cond_wait(A,B)     \
-    (crit_enter((A)->lock),    \
-     crit_exit(*(B)),          \
-     (A)->waiters += 1,                \
-     condvar_wait((A)->cond),  \
-     crit_exit((A)->lock),     \
-     crit_enter(*(B)), 0)
-
-#define usr_thread_create(A,B,C) \
-    ((*(A)=systhread_start(SYSTHREAD_DEFAULT_PRIORITY, \
-                          0,B,C))==SYS_THREAD_ERROR)
-#define usr_thread_detach(A)   0
-#define usr_keycreate(A,B)     (*(A)=systhread_newkey(),0)
-#define usr_setspecific(A,B)   (systhread_setdata(A,B),0)
-#define usr_getspecific(A,B)   (*(B)=systhread_getdata(A),0)
-#define usr_thread_self()      systhread_current()
-#ifdef AFS_USR_SUN5_ENV
-#define usr_thread_sleep(A) \
-    poll(0, 0, (A)->tv_sec*1000+(A)->tv_nsec/1000000)
-#else /* AFS_USR_SUN5_ENV */
-#define usr_thread_sleep(A) \
-    systhread_sleep((A)->tv_sec*1000+(A)->tv_nsec/1000000)
-#endif /* AFS_USR_SUN5_ENV */
-
-#define uprintf                        printf
-
-#define usr_getpid()           (int)(usr_thread_self())
-
-#define ISAFS_GLOCK() (usr_thread_self() ==  afs_global_owner)
-
-#else /* NETSCAPE_NSAPI */
 
 /*
  * Mutex and condition variable used to implement sleep
@@ -996,8 +903,6 @@ extern pthread_cond_t usr_sleep_cond;
 #endif
 #define ISAFS_GLOCK() (usr_thread_self() == afs_global_owner)
 
-#endif /* NETSCAPE_NSAPI */
-
 #define copyin(A,B,C)          (memcpy((void *)B,(void *)A,C), 0)
 #define copyout(A,B,C)         (memcpy((void *)B,(void *)A,C), 0)
 #define copyinstr(A,B,C,D)     (strncpy(B,A,C),(*D)=strlen(B), 0)
index f0178c4..33b4281 100644 (file)
@@ -20,7 +20,6 @@
 /net
 /netinet
 /nfs
-/nsapi
 /rpc
 /rx
 /sys
index 4124226..6524039 100644 (file)
@@ -13,13 +13,11 @@ INCLUDE=  -I. -I${ISYSROOT}/usr/include -I${TOP_OBJDIR}/src/config
 UOBJ   =../UAFS
 PICOBJ  =../UAFS.pic
 JUAFS  =../JUAFS
-WEBOBJ=../AFSWEB
 PERLUAFS = PERLUAFS
 AFS    =../afs
 RX     =../rx
 AFSINT=../afsint
 LIB    =../lib
-NS_INCL =SRC/../afsweb/netscape_includes
 SWIG_PERL_CFLAGS = -fPIC `perl -MExtUtils::Embed -e ccopts`
 SWIG_PERL_LDFLAGS = -fPIC `perl -MExtUtils::Embed -e ldopts`
 SWIG = @SWIG@
@@ -65,12 +63,6 @@ COMMON_INCLUDE = -I. -I.. -I../nfs \
 all: ${TOP_LIBDIR}/$(LIBJUAFS) ${TOP_LIBDIR}/$(LIBUAFS) \
        ${TOP_LIBDIR}/libuafs_pic.a linktest @LIBUAFS_BUILD_PERL@
 
-${TOP_LIBDIR}/$(LIBAFSWEB): AFSWEB/$(LIBAFSWEB)
-       ${INSTALL_DATA} $? $@
-
-${TOP_LIBDIR}/$(LIBAFSWEBKRB): AFSWEB/$(LIBAFSWEBKRB)
-       ${INSTALL_DATA} $? $@
-
 ${TOP_LIBDIR}/$(LIBUAFS): UAFS/$(LIBUAFS)
        ${INSTALL_DATA} $? $@
 
@@ -92,10 +84,6 @@ ${TOP_LIBDIR}/perl/AFS/ukernel.pm: setup_perllib PERLUAFS/ukernel.pm
 
 LIBUAFS_BUILD_PERL: ${TOP_LIBDIR}/perl/ukernel.so ${TOP_LIBDIR}/perl/AFS/ukernel.pm
 
-webinstall: all \
-       ${TOP_LIBDIR}/$(LIBAFSWEB) \
-       ${TOP_LIBDIR}/$(LIBAFSWEBKRB) 
-
 linktest: UAFS/$(LIBUAFS)
        $(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) \
                $(LDFLAGS_roken) $(LDFLAGS_hcrypto) -o linktest \
@@ -105,7 +93,6 @@ linktest: UAFS/$(LIBUAFS)
                $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) $(TEST_LIBS) $(XLIBS)
 
 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 = \
@@ -354,246 +341,6 @@ PICUAFSOBJ = \
        $(PICOBJ)/xdr_mem.o \
        $(PICOBJ)/xdr_len.o
 
-AFSWEBOBJ = \
-       $(WEBOBJ)/afs_atomlist.o \
-       $(WEBOBJ)/afs_lhash.o \
-       $(WEBOBJ)/afs_analyze.o \
-       $(WEBOBJ)/afs_error.o \
-       $(WEBOBJ)/afs_axscache.o \
-       $(WEBOBJ)/afs_buffer.o \
-       $(WEBOBJ)/afs_bypasscache.o \
-       $(WEBOBJ)/afs_callback.o \
-       $(WEBOBJ)/afs_cbqueue.o \
-       $(WEBOBJ)/afs_cell.o \
-       $(WEBOBJ)/afs_chunk.o \
-       $(WEBOBJ)/afs_conn.o \
-       $(WEBOBJ)/afs_daemons.o \
-       $(WEBOBJ)/afs_dcache.o \
-       $(WEBOBJ)/afs_dir.o \
-       $(WEBOBJ)/afs_disconnected.o \
-       $(WEBOBJ)/afs_dynroot.o \
-       $(WEBOBJ)/afs_icl.o \
-       $(WEBOBJ)/afs_init.o \
-       $(WEBOBJ)/afs_lock.o \
-       $(WEBOBJ)/afs_mariner.o \
-       $(WEBOBJ)/afs_memcache.o \
-       $(WEBOBJ)/afs_fetchstore.o \
-       $(WEBOBJ)/afs_osidnlc.o \
-       $(WEBOBJ)/afs_osi_pag.o \
-       $(WEBOBJ)/afs_segments.o \
-       $(WEBOBJ)/afs_server.o \
-       $(WEBOBJ)/afs_stat.o \
-       $(WEBOBJ)/afs_syscall.o \
-       $(WEBOBJ)/afs_tokens.o \
-       $(WEBOBJ)/afs_user.o \
-       $(WEBOBJ)/afs_util.o \
-       $(WEBOBJ)/afs_vcache.o \
-       $(WEBOBJ)/afs_warn.o \
-       $(WEBOBJ)/afs_osi_uio.o \
-       $(WEBOBJ)/afs_vnop_access.o \
-       $(WEBOBJ)/afs_vnop_attrs.o \
-       $(WEBOBJ)/afs_vnop_create.o \
-       $(WEBOBJ)/afs_vnop_dirops.o \
-       $(WEBOBJ)/afs_vnop_fid.o \
-       $(WEBOBJ)/afs_vnop_flock.o \
-       $(WEBOBJ)/afs_vnop_link.o \
-       $(WEBOBJ)/afs_vnop_lookup.o \
-       $(WEBOBJ)/afs_vnop_open.o \
-       $(WEBOBJ)/afs_vnop_read.o \
-       $(WEBOBJ)/afs_vnop_readdir.o \
-       $(WEBOBJ)/afs_vnop_remove.o \
-       $(WEBOBJ)/afs_vnop_rename.o \
-       $(WEBOBJ)/afs_vnop_strategy.o \
-       $(WEBOBJ)/afs_vnop_symlink.o \
-       $(WEBOBJ)/afs_vnop_write.o \
-       $(WEBOBJ)/afs_volume.o \
-       $(WEBOBJ)/afs_call.o \
-       $(WEBOBJ)/afs_pioctl.o \
-       $(WEBOBJ)/osi_vfsops.o \
-       $(WEBOBJ)/afs_usrops.o \
-       $(WEBOBJ)/afsd.o \
-       $(WEBOBJ)/afsd_uafs.o \
-       $(WEBOBJ)/xdr.o \
-       $(WEBOBJ)/xdr_afsuuid.o \
-       $(WEBOBJ)/xdr_update.o \
-       $(WEBOBJ)/xdr_refernce.o \
-       $(WEBOBJ)/afs_uuid.o \
-       $(WEBOBJ)/assert.o \
-       $(WEBOBJ)/osi_vnodeops.o \
-       $(WEBOBJ)/osi_vm.o \
-       $(WEBOBJ)/osi_groups.o \
-       $(WEBOBJ)/osi_gcpags.o \
-       $(WEBOBJ)/osi_vcache.o \
-       $(WEBOBJ)/afsaux.o \
-       $(WEBOBJ)/Kvice.xdr.o \
-       $(WEBOBJ)/xdr_array.o \
-       $(WEBOBJ)/xdr_arrayn.o \
-       $(WEBOBJ)/Kvice.cs.o \
-       $(WEBOBJ)/fcrypt.o \
-       $(WEBOBJ)/rx.o \
-       $(WEBOBJ)/rx_rdwr.o \
-       $(WEBOBJ)/rx_clock.o \
-       $(WEBOBJ)/rx_event.o \
-       $(WEBOBJ)/rx_globals.o \
-       $(WEBOBJ)/rx_identity.o \
-       $(WEBOBJ)/rx_kmutex.o \
-       $(WEBOBJ)/rx_knet.o \
-       $(WEBOBJ)/rx_kcommon.o \
-       $(WEBOBJ)/rx_misc.o \
-       $(WEBOBJ)/rx_multi.o \
-       $(WEBOBJ)/rx_null.o \
-       $(WEBOBJ)/rx_opaque.o \
-       $(WEBOBJ)/rx_getaddr.o \
-       $(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 \
-       $(WEBOBJ)/Kcallback.ss.o \
-       $(WEBOBJ)/crypt_conn.o \
-       $(WEBOBJ)/AFS_component_version_number.o \
-       $(WEBOBJ)/afs_exporter.o \
-       $(WEBOBJ)/rxkad_client.o \
-       $(WEBOBJ)/rxkad_common.o \
-       $(WEBOBJ)/casestrcpy.o \
-       $(WEBOBJ)/dirpath.o \
-       $(WEBOBJ)/fileutil.o \
-       $(WEBOBJ)/netrestrict.o \
-       $(WEBOBJ)/cellconfig.o \
-       $(WEBOBJ)/keys.o \
-       $(WEBOBJ)/realms.o \
-       $(WEBOBJ)/ktc.o \
-       $(WEBOBJ)/securehash.o \
-       $(WEBOBJ)/nsafs.o \
-       $(WEBOBJ)/Krxstat.ss.o \
-       $(WEBOBJ)/Krxstat.xdr.o \
-       $(WEBOBJ)/rxstat.o \
-       $(WEBOBJ)/token.xdr.o \
-       $(WEBOBJ)/token.o \
-       $(WEBOBJ)/xdr_mem.o \
-       $(WEBOBJ)/xdr_len.o
-
-AFSWEBOBJKRB = \
-       $(WEBOBJ)/afs_atomlist.o \
-       $(WEBOBJ)/afs_lhash.o \
-       $(WEBOBJ)/afs_analyze.o \
-       $(WEBOBJ)/afs_error.o \
-       $(WEBOBJ)/afs_axscache.o \
-       $(WEBOBJ)/afs_buffer.o \
-       $(WEBOBJ)/afs_bypasscache.o \
-       $(WEBOBJ)/afs_callback.o \
-       $(WEBOBJ)/afs_cbqueue.o \
-       $(WEBOBJ)/afs_cell.o \
-       $(WEBOBJ)/afs_chunk.o \
-       $(WEBOBJ)/afs_conn.o \
-       $(WEBOBJ)/afs_daemons.o \
-       $(WEBOBJ)/afs_dcache.o \
-       $(WEBOBJ)/afs_dir.o \
-       $(WEBOBJ)/afs_dynroot.o \
-       $(WEBOBJ)/afs_disconnected.o \
-       $(WEBOBJ)/afs_icl.o \
-       $(WEBOBJ)/afs_init.o \
-       $(WEBOBJ)/afs_lock.o \
-       $(WEBOBJ)/afs_mariner.o \
-       $(WEBOBJ)/afs_memcache.o \
-       $(WEBOBJ)/afs_fetchstore.o \
-       $(WEBOBJ)/afs_osidnlc.o \
-       $(WEBOBJ)/afs_osi_pag.o \
-       $(WEBOBJ)/afs_segments.o \
-       $(WEBOBJ)/afs_server.o \
-       $(WEBOBJ)/afs_stat.o \
-       $(WEBOBJ)/afs_syscall.o \
-       $(WEBOBJ)/afs_tokens.o \
-       $(WEBOBJ)/afs_user.o \
-       $(WEBOBJ)/afs_util.o \
-       $(WEBOBJ)/afs_vcache.o \
-       $(WEBOBJ)/afs_warn.o \
-       $(WEBOBJ)/afs_osi_uio.o \
-       $(WEBOBJ)/afs_vnop_access.o \
-       $(WEBOBJ)/afs_vnop_attrs.o \
-       $(WEBOBJ)/afs_vnop_create.o \
-       $(WEBOBJ)/afs_vnop_dirops.o \
-       $(WEBOBJ)/afs_vnop_fid.o \
-       $(WEBOBJ)/afs_vnop_flock.o \
-       $(WEBOBJ)/afs_vnop_link.o \
-       $(WEBOBJ)/afs_vnop_lookup.o \
-       $(WEBOBJ)/afs_vnop_open.o \
-       $(WEBOBJ)/afs_vnop_read.o \
-       $(WEBOBJ)/afs_vnop_readdir.o \
-       $(WEBOBJ)/afs_vnop_remove.o \
-       $(WEBOBJ)/afs_vnop_rename.o \
-       $(WEBOBJ)/afs_vnop_strategy.o \
-       $(WEBOBJ)/afs_vnop_symlink.o \
-       $(WEBOBJ)/afs_vnop_write.o \
-       $(WEBOBJ)/afs_volume.o \
-       $(WEBOBJ)/afs_call.o \
-       $(WEBOBJ)/afs_pioctl.o \
-       $(WEBOBJ)/osi_vfsops.o \
-       $(WEBOBJ)/afs_usrops.o \
-       $(WEBOBJ)/afsd.o \
-       $(WEBOBJ)/afsd_uafs.o \
-       $(WEBOBJ)/osi_vnodeops.o \
-       $(WEBOBJ)/osi_vm.o \
-       $(WEBOBJ)/osi_groups.o \
-       $(WEBOBJ)/osi_gcpags.o \
-       $(WEBOBJ)/osi_vcache.o \
-       $(WEBOBJ)/afsaux.o \
-       $(WEBOBJ)/Kvice.xdr.o \
-       $(WEBOBJ)/xdr_array.o \
-       $(WEBOBJ)/xdr_arrayn.o \
-       $(WEBOBJ)/Kvice.cs.o \
-       $(WEBOBJ)/fcrypt.o \
-       $(WEBOBJ)/rx.o \
-       $(WEBOBJ)/rx_rdwr.o \
-       $(WEBOBJ)/rx_clock.o \
-       $(WEBOBJ)/rx_event.o \
-       $(WEBOBJ)/rx_globals.o \
-       $(WEBOBJ)/rx_identity.o \
-       $(WEBOBJ)/rx_kmutex.o \
-       $(WEBOBJ)/rx_knet.o \
-       $(WEBOBJ)/rx_kcommon.o \
-       $(WEBOBJ)/rx_misc.o \
-       $(WEBOBJ)/rx_multi.o \
-       $(WEBOBJ)/rx_null.o \
-       $(WEBOBJ)/rx_opaque.o \
-       $(WEBOBJ)/rx_getaddr.o \
-       $(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 \
-       $(WEBOBJ)/Kcallback.ss.o \
-       $(WEBOBJ)/crypt_conn.o \
-       $(WEBOBJ)/AFS_component_version_number.o \
-       $(WEBOBJ)/afs_exporter.o \
-       $(WEBOBJ)/rxkad_client.o \
-       $(WEBOBJ)/rxkad_common.o \
-       $(WEBOBJ)/casestrcpy.o \
-       $(WEBOBJ)/dirpath.o \
-       $(WEBOBJ)/fileutil.o \
-       $(WEBOBJ)/netrestrict.o \
-       $(WEBOBJ)/cellconfig.o \
-       $(WEBOBJ)/keys.o \
-       $(WEBOBJ)/realms.o \
-       $(WEBOBJ)/ktc.krb.o \
-       $(WEBOBJ)/securehash.o \
-       $(WEBOBJ)/nsafs.o \
-       $(WEBOBJ)/Krxstat.ss.o \
-       $(WEBOBJ)/Krxstat.xdr.o \
-       $(WEBOBJ)/rxstat.o \
-       $(WEBOBJ)/token.xdr.o \
-       $(WEBOBJ)/token.o \
-       $(WEBOBJ)/xdr_mem.o \
-       $(WEBOBJ)/xdr_len.o
-
 JUAFSOBJ = \
        $(JUAFS)/afs_atomlist.o \
        $(JUAFS)/afs_lhash.o \
@@ -1219,262 +966,6 @@ $(PICOBJ)/xdr_mem.o: $(TOP_SRC_RX)/xdr_mem.c
 $(PICOBJ)/xdr_len.o: $(TOP_SRC_RX)/xdr_len.c
        $(CRULEPIC)
 
-# These files are for the netscape plugin
-
-$(WEBOBJ)/afs_atomlist.o: $(TOP_SRCDIR)/util/afs_atomlist.c
-       $(CRULE2)
-$(WEBOBJ)/afs_lhash.o: $(TOP_SRCDIR)/util/afs_lhash.c
-       $(CRULE2)
-$(WEBOBJ)/afs_analyze.o: $(TOP_SRC_AFS)/afs_analyze.c
-       $(CRULE2)
-$(WEBOBJ)/afs_axscache.o: $(TOP_SRC_AFS)/afs_axscache.c
-       $(CRULE2)
-$(WEBOBJ)/afs_buffer.o: $(TOP_SRC_AFS)/afs_buffer.c
-       $(CRULE2)
-$(WEBOBJ)/afs_bypasscache.o: $(TOP_SRC_AFS)/afs_bypasscache.c
-       $(CRULE2)
-$(WEBOBJ)/afs_cell.o: $(TOP_SRC_AFS)/afs_cell.c
-       $(CRULE2)
-$(WEBOBJ)/afs_conn.o: $(TOP_SRC_AFS)/afs_conn.c
-       $(CRULE2)
-$(WEBOBJ)/afs_dcache.o: $(TOP_SRC_AFS)/afs_dcache.c
-       $(CRULE2)
-$(WEBOBJ)/afs_disconnected.o: $(TOP_SRC_AFS)/afs_disconnected.c
-       $(CRULE2)
-$(WEBOBJ)/afs_dynroot.o: $(TOP_SRC_AFS)/afs_dynroot.c
-       $(CRULE2)
-$(WEBOBJ)/afs_error.o: $(TOP_SRC_AFS)/afs_error.c
-       $(CRULE2)
-$(WEBOBJ)/afs_init.o: $(TOP_SRC_AFS)/afs_init.c
-       $(CRULE2)
-$(WEBOBJ)/afs_mariner.o: $(TOP_SRC_AFS)/afs_mariner.c
-       $(CRULE2)
-$(WEBOBJ)/afs_osidnlc.o: $(TOP_SRC_AFS)/afs_osidnlc.c
-       $(CRULE2)
-$(WEBOBJ)/afs_osi.o: $(TOP_SRC_AFS)/afs_osi.c
-       $(CRULE2)
-$(WEBOBJ)/afs_osi_pag.o: $(TOP_SRC_AFS)/afs_osi_pag.c
-       $(CRULE2)
-$(WEBOBJ)/afs_segments.o: $(TOP_SRC_AFS)/afs_segments.c
-       $(CRULE2)
-$(WEBOBJ)/afs_server.o: $(TOP_SRC_AFS)/afs_server.c
-       $(CRULE2)
-$(WEBOBJ)/afs_tokens.o: $(TOP_SRC_AFS)/afs_tokens.c
-       $(CRULE2)
-$(WEBOBJ)/afs_user.o: $(TOP_SRC_AFS)/afs_user.c
-       $(CRULE2)
-$(WEBOBJ)/afs_util.o: $(TOP_SRC_AFS)/afs_util.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vcache.o: $(TOP_SRC_AFS)/afs_vcache.c
-       $(CRULE2)
-$(WEBOBJ)/afs_warn.o: $(TOP_SRC_AFS)/afs_warn.c
-       $(CRULE2)
-$(WEBOBJ)/afs_osi_uio.o: $(TOP_SRC_AFS)/afs_osi_uio.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_access.o: $(TOP_SRC_VNOPS)/afs_vnop_access.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_attrs.o: $(TOP_SRC_VNOPS)/afs_vnop_attrs.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_create.o: $(TOP_SRC_VNOPS)/afs_vnop_create.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_dirops.o: $(TOP_SRC_VNOPS)/afs_vnop_dirops.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_fid.o: $(TOP_SRC_VNOPS)/afs_vnop_fid.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_flock.o: $(TOP_SRC_VNOPS)/afs_vnop_flock.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_link.o: $(TOP_SRC_VNOPS)/afs_vnop_link.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_lookup.o: $(TOP_SRC_VNOPS)/afs_vnop_lookup.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_open.o: $(TOP_SRC_VNOPS)/afs_vnop_open.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_read.o: $(TOP_SRC_VNOPS)/afs_vnop_read.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_readdir.o: $(TOP_SRC_VNOPS)/afs_vnop_readdir.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_remove.o: $(TOP_SRC_VNOPS)/afs_vnop_remove.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_rename.o: $(TOP_SRC_VNOPS)/afs_vnop_rename.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_strategy.o: $(TOP_SRC_VNOPS)/afs_vnop_strategy.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_symlink.o: $(TOP_SRC_VNOPS)/afs_vnop_symlink.c
-       $(CRULE2)
-$(WEBOBJ)/afs_vnop_write.o: $(TOP_SRC_VNOPS)/afs_vnop_write.c
-       $(CRULE2)
-$(WEBOBJ)/afs_volume.o: $(TOP_SRC_AFS)/afs_volume.c
-       $(CRULE2)
-$(WEBOBJ)/rx_rdwr.o: $(TOP_SRC_RX)/rx_rdwr.c
-       $(CRULE2)
-$(WEBOBJ)/afs_cbqueue.o: $(TOP_SRC_AFS)/afs_cbqueue.c
-       $(CRULE2)
-$(WEBOBJ)/afs_callback.o: $(TOP_SRC_AFS)/afs_callback.c
-       $(CRULE2)
-$(WEBOBJ)/afs_chunk.o: $(TOP_SRC_AFS)/afs_chunk.c
-       $(CRULE2)
-$(WEBOBJ)/afs_daemons.o: $(TOP_SRC_AFS)/afs_daemons.c
-       $(CRULE2)
-$(WEBOBJ)/afs_dir.o:   $(TOP_SRCDIR)/dir/dir.c
-       $(CRULE2) -o afs_dir.o
-$(WEBOBJ)/AFS_component_version_number.o: AFS_component_version_number.c
-       $(CRULE2)
-$(WEBOBJ)/afs_lock.o: $(TOP_SRC_AFS)/afs_lock.c
-       $(CRULE2)
-$(WEBOBJ)/afs_memcache.o: $(TOP_SRC_AFS)/afs_memcache.c
-       $(CRULE2)
-$(WEBOBJ)/afs_md5.o: $(TOP_SRC_AFS)/afs_md5.c
-       $(CRULE2)
-$(WEBOBJ)/afs_fetchstore.o: $(TOP_SRC_AFS)/afs_fetchstore.c
-       $(CRULE2)
-$(WEBOBJ)/afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c
-       $(CRULE2)
-$(WEBOBJ)/fcrypt.o:    $(TOP_SRC_RXKAD)/fcrypt.c
-       $(CRULE2)
-$(WEBOBJ)/crypt_conn.o: $(TOP_SRC_RXKAD)/crypt_conn.c
-       $(CRULE2)
-$(WEBOBJ)/rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c
-       $(CRULE2)
-$(WEBOBJ)/rxkad_common.o: $(TOP_SRC_RXKAD)/rxkad_common.c
-       $(CRULE2)
-$(WEBOBJ)/afs_exporter.o: $(TOP_SRCDIR)/afs/afs_exporter.c
-       $(CRULE2)
-$(WEBOBJ)/afs_nfsclnt.o: $(TOP_SRC_AFS)/afs_nfsclnt.c
-       $(CRULE2)
-$(WEBOBJ)/afs_nfsdisp.o: $(TOP_SRC_AFS)/afs_nfsdisp.c
-       $(CRULE2)
-$(WEBOBJ)/rx.o: $(TOP_SRC_RX)/rx.c
-       $(CRULE2)
-$(WEBOBJ)/rx_clock.o: $(TOP_SRC_RX)/rx_clock.c
-       $(CRULE2)
-$(WEBOBJ)/rx_event.o: $(TOP_SRC_RX)/rx_event.c
-       $(CRULE2)
-$(WEBOBJ)/rx_globals.o: $(TOP_SRC_RX)/rx_globals.c
-       $(CRULE2)
-$(WEBOBJ)/rx_identity.o: $(TOP_SRC_RX)/rx_identity.c
-       $(CRULE2)
-$(WEBOBJ)/rx_misc.o: $(TOP_SRC_RX)/rx_misc.c
-       $(CRULE2)
-$(WEBOBJ)/rx_multi.o: $(TOP_SRC_RX)/rx_multi.c
-       $(CRULE2)
-$(WEBOBJ)/rx_null.o: $(TOP_SRC_RX)/rx_null.c
-       $(CRULE2)
-$(WEBOBJ)/rx_opaque.o: $(TOP_SRC_RX)/rx_opaque.c
-       $(CRULE2)
-$(WEBOBJ)/rx_getaddr.o: $(TOP_SRC_RX)/rx_getaddr.c
-       $(CRULE2)
-$(WEBOBJ)/rx_stats.o: $(TOP_SRC_RX)/rx_stats.c
-       $(CRULE2)
-$(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
-       $(CRULE2)
-$(WEBOBJ)/afsd.o: $(TOP_SRCDIR)/afsd/afsd.c
-       $(CRULE2) @CFLAGS_NOERROR@
-$(WEBOBJ)/afsd_uafs.o: $(TOP_SRC_AFS)/UKERNEL/afsd_uafs.c
-       $(CRULE2)
-$(WEBOBJ)/afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
-       $(CRULE2) -o afs_uuid.o
-$(WEBOBJ)/assert.o: $(TOP_SRCDIR)/opr/assert.c
-       $(CRULE1)
-$(WEBOBJ)/xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
-       $(CRULE2)
-$(WEBOBJ)/xdr_update.o: $(TOP_SRCDIR)/rx/xdr_update.c
-       $(CRULE2)
-$(WEBOBJ)/xdr_refernce.o: $(TOP_SRCDIR)/rx/xdr_refernce.c
-       $(CRULE2)
-$(WEBOBJ)/xdr.o: $(TOP_SRCDIR)/rx/xdr.c
-       $(CRULE2)
-$(WEBOBJ)/osi_vnodeops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vnodeops.c
-       $(CRULE2)
-$(WEBOBJ)/osi_vm.o: $(TOP_SRC_AFS)/UKERNEL/osi_vm.c
-       $(CRULE2)
-$(WEBOBJ)/osi_groups.o: $(TOP_SRC_AFS)/UKERNEL/osi_groups.c
-       $(CRULE2)
-$(WEBOBJ)/osi_gcpags.o: $(TOP_SRC_AFS)/UKERNEL/osi_gcpags.c
-       $(CRULE2)
-$(WEBOBJ)/osi_vcache.o: $(TOP_SRC_AFS)/UKERNEL/osi_vcache.c
-       $(CRULE2)
-$(WEBOBJ)/Kcallback.ss.o: $(TOP_OBJ_FSINT)/Kcallback.ss.c
-       $(CRULE2)
-$(WEBOBJ)/Kvice.xdr.o: $(TOP_OBJ_FSINT)/Kvice.xdr.c
-       $(CRULE2)
-$(WEBOBJ)/Kvice.cs.o: $(TOP_OBJ_FSINT)/Kvice.cs.c
-       $(CRULE2)
-$(WEBOBJ)/afsaux.o: $(TOP_SRC_FSINT)/afsaux.c
-       $(CRULE2)
-$(WEBOBJ)/xdr_array.o: $(TOP_SRC_RX)/xdr_array.c
-       $(CRULE2)
-$(WEBOBJ)/xdr_arrayn.o: $(TOP_SRC_RX)/xdr_arrayn.c
-       $(CRULE2)
-$(WEBOBJ)/Kvldbint.cs.o: $(TOP_OBJ_VLSERVER)/Kvldbint.cs.c
-       $(CRULE2)
-$(WEBOBJ)/Kvldbint.xdr.o: $(TOP_OBJ_VLSERVER)/Kvldbint.xdr.c
-       $(CRULE2)
-$(WEBOBJ)/rx_kmutex.o: $(TOP_SRC_RX)/UKERNEL/rx_kmutex.c
-       $(CRULE2)
-$(WEBOBJ)/rx_knet.o: $(TOP_SRC_RX)/UKERNEL/rx_knet.c
-       $(CRULE2)
-$(WEBOBJ)/rx_kcommon.o: $(TOP_SRCDIR)/rx/rx_kcommon.c
-       $(CRULE2)
-$(WEBOBJ)/afs_call.o: $(TOP_SRC_AFS)/afs_call.c
-       $(CRULE2) -DAFS_NONFSTRANS
-$(WEBOBJ)/afs_icl.o: $(TOP_SRC_AFS)/afs_icl.c
-       $(CRULE2) -DAFS_NONFSTRANS
-$(WEBOBJ)/afs_pioctl.o: $(TOP_SRC_AFS)/afs_pioctl.c
-       $(CRULE2) -DAFS_NONFSTRANS
-$(WEBOBJ)/afs_syscall.o: $(TOP_SRC_AFS)/afs_syscall.c
-       $(CRULE2) @CFLAGS_NOERROR@ -DAFS_NONFSTRANS
-$(WEBOBJ)/osi_vfsops.o: $(TOP_SRC_AFS)/UKERNEL/osi_vfsops.c
-       $(CRULE2) -DAFS_NONFSTRANS
-$(WEBOBJ)/ktc.o:       $(TOP_SRCDIR)/auth/ktc.c
-       $(CRULE2) @CFLAGS_NOERROR@
-$(WEBOBJ)/ktc.krb.o:   $(TOP_SRCDIR)/auth/ktc.c
-       $(CRULE2) -DAFS_KERBEROS_ENV -DMAYBE_NO_KTC @CFLAGS_NOERROR@
-       mv ktc.o ktc.krb.o
-$(WEBOBJ)/securehash.o: $(TOP_SRCDIR)/afsweb/securehash.c
-       $(CRULE2)
-$(WEBOBJ)/nsafs.o: $(TOP_SRCDIR)/afsweb/nsafs.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)/netrestrict.o: $(TOP_SRCDIR)/auth/netrestrict.c
-       $(CRULE1)
-$(WEBOBJ)/rxstat.o: $(TOP_SRC_RXSTAT)/rxstat.c
-       $(CRULE2)
-$(WEBOBJ)/Krxstat.ss.o: $(TOP_OBJ_RXSTAT)/Krxstat.ss.c
-       $(CRULE2)
-$(WEBOBJ)/Krxstat.xdr.o: $(TOP_OBJ_RXSTAT)/Krxstat.xdr.c
-       $(CRULE2)
-$(WEBOBJ)/token.xdr.o: $(TOP_OBJ_AUTH)/token.xdr.c
-       $(CRULE2)
-$(WEBOBJ)/token.o: $(TOP_SRCDIR)/auth/token.c
-       $(CRULE1)
-$(WEBOBJ)/xdr_mem.o: $(TOP_SRC_RX)/xdr_mem.c
-       $(CRULE2)
-$(WEBOBJ)/xdr_len.o: $(TOP_SRC_RX)/xdr_len.c
-       $(CRULE2)
-
 # These are for libjuafs.a 
 # Used for linking with libafsauthent and libafsrpc
 
@@ -1747,7 +1238,7 @@ $(PERLUAFS)/ukernel.so: $(PERLUAFS)/ukernel_swig_perl.o UAFS.pic/libuafs_pic.a
                $(XLIBS)
 
 clean:
-       -$(RM) -rf UAFS* JUAFS* AFSWEB* PERLUAFS nsapi afsd afs afsint config rx
+       -$(RM) -rf UAFS* JUAFS* PERLUAFS afsd afs afsint config rx
        -$(RM) -rf h
        -$(RM) -f linktest $(AFS_OS_CLEAN)
 
@@ -1807,18 +1298,14 @@ UAFS.pic:
 JUAFS:
        mkdir -p $@
 
-AFSWEB:
-       mkdir -p $@
-
 h: $(TOP_SRC_AFS)/*.c $(TOP_SRC_VNOPS)/*.c $(TOP_SRC_RX)/*.c
        -$(RM) -rf h
        @TOP_SRCDIR@/libuafs/make_h_tree $(TOP_SRC_AFS) $(TOP_SRC_VNOPS) \
                $(TOP_SRC_RX)
 
 setup_common: h
-       -$(RM) -f nsapi afsd
+       -$(RM) -f afsd
        -ln -s $(TOP_SRCDIR)/afsd afsd
-       -ln -s $(NS_INCL) nsapi
 
 setup_uafs: UAFS setup_common
        -$(RM) -f UAFS/Makefile UAFS/Makefile.common
@@ -1835,11 +1322,6 @@ setup_juafs: JUAFS setup_common
        ln -s ../Makefile JUAFS/Makefile
        ln -s ../Makefile.common JUAFS/Makefile.common
 
-setup_nsafs: AFSWEB setup_common
-       -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
 UAFS/$(LIBUAFS): setup_uafs
        cd UAFS && \
        $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=&& \
@@ -1855,14 +1337,4 @@ JUAFS/$(LIBJUAFS): setup_juafs
        $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=&& \
        $(RANLIB) $(LIBJUAFS)
 
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB && \
-       $(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR} && \
-       $(RANLIB) $(LIBAFSWEB)
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB && \
-       $(MAKE) $(LIBAFSWEBKRB) DESTDIR=${DESTDIR} && \
-       $(RANLIB) $(LIBAFSWEBKRB)
-
 include ${TOP_OBJDIR}/src/config/Makefile.version
index b8da294..273df8d 100644 (file)
@@ -22,8 +22,6 @@ ARFLAGS = -r
 RANLIB = /bin/ranlib
 CC = xlc_r
 DEF_LIBPATH=/usr/lib/threads:/usr/lib:/lib
-EXPFILE=../nsafslib.exp 
-LD_FLAGS=-bM:SRE -bE:$(EXPFILE) -berok -bnoentry -blibpath:$(DEF_LIBPATH)
 
 TEST_CFLAGS=-DAFS_PTHREAD_ENV -Daix -DAFS_AIX_ENV $(XCFLAGS)
 TEST_LDFLAGS=
@@ -31,9 +29,6 @@ TEST_LIBS=-lm -lpthreads
 
 LIBUAFS = libuafs.a
 LIBJUAFS = libjuafs.a
-LIBAFSWEB = nsafs.a
-LIBAFSWEBKRB = nsafs.krb.a
-
 
 AFS_OS_CLEAN = \
        *.exp \
@@ -42,7 +37,6 @@ AFS_OS_CLEAN = \
 # To get __file__ (afs_osi_pag.c) you need to specify language level 
 # C99 to xlc_r like this:
 OPTF=${OPTMZ} -qlanglvl=stdc99
-WEBOPTS = -I../nsapi -qarch=com -DNETSCAPE_NSAPI -DAIX -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
 include Makefile.common
 
@@ -60,14 +54,3 @@ $(LIBJUAFS): $(JUAFSOBJ)
        -$(RM) -f $(LIBJUAFS)
        $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ) $(AFS)/afsl.exp
        $(RANLIB) libjuafs.a
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a
-       -$(RM) -f $(LIBAFSWEB)
-       ld -o $(LIBAFSWEB) $(LD_FLAGS) $(AFSWEBOBJ) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a -lm -lc
-
-##
-## Use Kerberos authentication instead of kaservers
-##
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a 
-       -$(RM) -f $(LIBAFSWEBKRB)
-       ld -o $(LIBAFSWEBKRB) $(LD_FLAGS) $(AFSWEBOBJKRB) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a -lm -lc
index 2539204..e45a08c 100644 (file)
@@ -18,7 +18,6 @@ DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
 KOPTS=
 CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG} $(XCFLAGS) $(ARCHFLAGS)
 OPTF=${OPTMZ}
-# WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
 TEST_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV $(XCFLAGS) $(ARCHFLAGS)
 TEST_LDFLAGS=$(XLDFLAGS) $(ARCHFLAGS)
@@ -26,8 +25,6 @@ TEST_LIBS=
 
 LIBUAFS = libuafs.a
 LIBJUAFS = libjuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
@@ -42,11 +39,3 @@ libuafs_pic.a: $(PICUAFSOBJ)
 $(LIBJUAFS): $(JUAFSOBJ)
        -$(RM) -f $(LIBJUAFS)
        $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEB)
-       ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEBKRB)
-       ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
index 178a5e4..cb75407 100644 (file)
@@ -18,7 +18,6 @@ DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
 KOPTS=
 CFLAGS=-I. -I..  -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG} $(XCFLAGS)
 OPTF=${OPTMZ}
-# WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
 TEST_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_DFFBSD_ENV $(XCFLAGS)
 TEST_LDFLAGS=
@@ -27,8 +26,6 @@ TEST_LIBS=-lpthread
 
 LIBUAFS = libuafs.a
 LIBJUAFS = libjuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
@@ -43,11 +40,3 @@ libuafs_pic.a: $(PICUAFSOBJ)
 $(LIBJUAFS): $(JUAFSOBJ)
        -$(RM) -f $(LIBJUAFS)
        $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEB)
-       ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEBKRB)
-       ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
index 3cd4d74..d9ac002 100644 (file)
@@ -17,7 +17,6 @@ DEFINES=-DKERNEL -DUKERNEL -D_NO_PROTO -DOSF
 KOPTS=
 OPTF=${OPTMZ}
 CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG} $(XCFLAGS) -pthread
-WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
 TEST_CFLAGS=-pthread -D_NO_PROTO -D_REENTRANT -DAFS_PTHREAD_ENV -Dosf -DAFS_OSF_ENV -DOSF $(XCFLAGS)
 TEST_LDFLAGS=-pthread
@@ -25,8 +24,6 @@ TEST_LIBS=-lm
 
 LIBUAFS = libuafs.a
 LIBJUAFS = libjuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
@@ -44,11 +41,3 @@ $(LIBJUAFS): $(JUAFSOBJ)
        -$(RM) -f $(LIBJUAFS)
        $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ)
        ranlib $(LIBJUAFS)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEB)
-       ld -all -shared -expect_unresolved "*" $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEBKRB)
-       ld -all -shared -expect_unresolved "*" $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
index 4e8029e..5b73bae 100644 (file)
@@ -19,7 +19,6 @@ DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
 KOPTS=
 CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG} $(XCFLAGS)
 OPTF=${OPTMZ}
-# WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
 TEST_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_FBSD50_ENV $(XCFLAGS)
 TEST_LDFLAGS=
@@ -27,8 +26,6 @@ TEST_LIBS=-lpthread
 
 LIBUAFS = libuafs.a
 LIBJUAFS = libjuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
@@ -43,11 +40,3 @@ libuafs_pic.a: $(PICUAFSOBJ)
 $(LIBJUAFS): $(JUAFSOBJ)
        -$(RM) -f $(LIBJUAFS)
        $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEB)
-       ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEBKRB)
-       ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
index 8783f1e..49a104e 100644 (file)
@@ -22,7 +22,6 @@ KOPTS=-Wp,-H200000 -Wl,-a,archive_shared
 <all>
 CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG} $(XCFLAGS)
 OPTF=${OPTMZ}
-WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
 <hp_ux102 hp_ux110 hp_ux11i>
 TEST_CFLAGS= -Wp,-H200000 +DA1.0 +z -D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV -Dhpux -DAFS_HPUX_ENV $(XCFLAGS)
@@ -34,8 +33,6 @@ TEST_LIBS=-lnsl -lm -lpthread -ldld -lc
 
 LIBUAFS = libuafs.a
 LIBJUAFS = libjuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
@@ -50,11 +47,3 @@ libuafs_pic.a: $(PICUAFSOBJ)
 $(LIBJUAFS): $(JUAFSOBJ)
        -$(RM) -f $(LIBJUAFS)
        $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEB)
-       ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEBKRB)
-       ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
index 38dfc57..0cbd890 100644 (file)
@@ -17,7 +17,6 @@ CC = cc
 DEFINES=-D_SGI_MP_SOURCE -DKERNEL -DUKERNEL
 CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG} $(XCFLAGS)
 OPTF=${OPTMZ}
-WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
 TEST_CFLAGS=-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV -Dirix -DAFS_SGI_ENV $(XCFLAGS)
 TEST_LDFLAGS=-ignore_minor
@@ -25,8 +24,6 @@ TEST_LIBS=-lpthread -lm
 
 LIBUAFS = libuafs.a
 LIBJUAFS = libjuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
@@ -41,11 +38,3 @@ libuafs_pic.a: $(PICUAFSOBJ)
 $(LIBJUAFS): $(JUAFSOBJ)
        -$(RM) -f $(LIBJUAFS)
        $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEB)
-       ld -shared $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEBKRB)
-       ld -shared $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
index b95eb08..94a1632 100644 (file)
@@ -29,7 +29,6 @@ CFLAGS=
 endif
 CFLAGS+= -I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG} $(XCFLAGS)
 OPTF=${OPTMZ}
-# WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
 TEST_CFLAGS=-pthread -D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_LINUX22_ENV $(XCFLAGS)
 TEST_LDFLAGS=
@@ -37,8 +36,6 @@ TEST_LIBS=-lpthread @LIB_crypt@
 
 LIBUAFS = libuafs.a
 LIBJUAFS = libjuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
@@ -53,17 +50,3 @@ libuafs_pic.a: $(PICUAFSOBJ)
 $(LIBJUAFS): $(JUAFSOBJ)
        -$(RM) -f $(LIBJUAFS)
        $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEB)
-       ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEBKRB)
-       ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
-
-
-
-
-
-
index e3b393c..61c3ca6 100644 (file)
@@ -26,8 +26,6 @@ TEST_LIBS=
 
 LIBUAFS = libuafs.a
 LIBJUAFS = libjuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
@@ -42,11 +40,3 @@ libuafs_pic.a: $(PICUAFSOBJ)
 $(LIBJUAFS): $(JUAFSOBJ)
        -$(RM) -f $(LIBJUAFS)
        $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEB)
-       ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEBKRB)
-       ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
index d50492e..c4079b5 100644 (file)
@@ -26,8 +26,6 @@ TEST_LIBS=
 
 LIBUAFS = libuafs.a
 LIBJUAFS = libjuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
@@ -42,11 +40,3 @@ libuafs_pic.a: $(PICUAFSOBJ)
 $(LIBJUAFS): $(JUAFSOBJ)
        -$(RM) -f $(LIBJUAFS)
        $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEB)
-       ld -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEBKRB)
-       ld -b $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
index 95a5fec..74d82db 100644 (file)
@@ -16,7 +16,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
 CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG} $(XCFLAGS)
 OPTF=${OPTMZ}
-WEBOPTS = -KPIC -I../nsapi -DNETSCAPE_NSAPI -DSOLARIS -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
 TEST_CFLAGS=-mt -DAFS_PTHREAD_ENV -Dsolaris -DAFS_SUN5_ENV $(XCFLAGS)
 TEST_LDFLAGS=
@@ -24,8 +23,6 @@ TEST_LIBS=-lsocket -lnsl -lthread -lm -ldl
 
 LIBUAFS = libuafs.a
 LIBJUAFS = libjuafs.a
-LIBAFSWEB = nsafs.so
-LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
@@ -40,11 +37,3 @@ libuafs_pic.a: $(PICUAFSOBJ)
 $(LIBJUAFS): $(JUAFSOBJ)
        -$(RM) -f $(LIBJUAFS)
        $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ)
-
-$(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -$(RM) -f $(LIBAFSWEB)
-       ${LD} -G -M../mapfile -o $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
-
-$(LIBAFSWEBKRB): $(AFSWEBOBJKRB) $(DES)/libdes.a
-       -$(RM) -f $(LIBAFSWEBKRB)
-       ${LD} -G -M../mapfile -o $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
diff --git a/src/libuafs/mapfile b/src/libuafs/mapfile
deleted file mode 100644 (file)
index cfed9df..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2000, International Business Machines Corporation and others.
-# All Rights Reserved.
-# 
-# This software has been released under the terms of the IBM Public
-# License.  For details, see the LICENSE file in the top-level source
-# directory or online at http://www.openafs.org/dl/license10.html
-
-{ 
-    global:
-       nsafs_NameFromNames;
-       nsafs_basic;
-       nsafs_check;
-       nsafs_check_for_links;
-       nsafs_check_preconditions;
-       nsafs_decode64;
-       nsafs_delete;
-       nsafs_error_check;
-       nsafs_find_index;
-       nsafs_force_type;
-       nsafs_get_int;
-       nsafs_get_long;
-       nsafs_get_string;
-       nsafs_index;
-       nsafs_init;
-       nsafs_init_done;
-       nsafs_init_lock;
-       nsafs_init_once;
-       nsafs_login_cache;
-       nsafs_login_checksum;
-       nsafs_login_hash;
-       nsafs_login_lock;
-       nsafs_login_lookup;
-       nsafs_login_pad;
-       nsafs_login_store;
-       nsafs_mkdir;
-       nsafs_mount;
-       nsafs_move;
-       nsafs_nocheck;
-       nsafs_node_insert;
-       nsafs_nolinks;
-       nsafs_parse_authhdr;
-       nsafs_public;
-       nsafs_put;
-       nsafs_rmdir;
-       nsafs_send;
-       nsafs_send_directory;
-       nsafs_send_file;
-       nsafs_set_finfo;
-       nsafs_set_id_from_ints;
-       nsafs_set_id_from_strings;
-       nsafs_tree_free;
-       nsafs_tree_insert;
-       nsafs_tree_send;
-       
-   local:
-       *;
-};
-
-       
-
diff --git a/src/libuafs/nsafslib.exp b/src/libuafs/nsafslib.exp
deleted file mode 100644 (file)
index d42f091..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-nsafs_NameFromNames
-nsafs_basic
-nsafs_check
-nsafs_check_for_links
-nsafs_check_preconditions
-nsafs_decode64
-nsafs_delete
-nsafs_error_check
-nsafs_find_index
-nsafs_force_type
-nsafs_get_int
-nsafs_get_long
-nsafs_get_string
-nsafs_index
-nsafs_init
-nsafs_init_done
-nsafs_init_lock
-nsafs_init_once
-nsafs_login_cache
-nsafs_login_checksum
-nsafs_login_hash
-nsafs_login_lock
-nsafs_login_lookup
-nsafs_login_pad
-nsafs_login_store
-nsafs_mkdir
-nsafs_mount
-nsafs_move
-nsafs_nocheck
-nsafs_node_insert
-nsafs_nolinks
-nsafs_parse_authhdr
-nsafs_public
-nsafs_put
-nsafs_rmdir
-nsafs_send
-nsafs_send_directory
-nsafs_send_file
-nsafs_set_finfo
-nsafs_set_id_from_ints
-nsafs_set_id_from_strings
-nsafs_tree_free
-nsafs_tree_insert
-nsafs_tree_send