Merge conflicts

diff --git a/Makefile.in b/Makefile.in
index 5024fc0a2c18814527ac5e4c8953607b21ab3b23..44a12dc5a71b890054ebad0ca2521af63d7a2c8c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,6 +44,14 @@ all:
        set ${SYS_NAME}/dest; $(MKDIR_IF_NEEDED)
        $(MAKE) install "COMPILE_PART1=cd src; cd" "COMPILE_PART2=; $(MAKE) install SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_PART3=; $(MAKE) test SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_CLEAN=; $(MAKE) clean SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME}
 
+all_nolibafs:
+       set ${SYS_NAME}/dest; $(MKDIR_IF_NEEDED)
+       $(MAKE) install TARGET=finale_nolibafs "COMPILE_PART1=cd src; cd" "COMPILE_PART2=; $(MAKE) install SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_PART3=; $(MAKE) test SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_CLEAN=; $(MAKE) clean SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME}
+
+only_libafs:
+       set ${SYS_NAME}/dest; $(MKDIR_IF_NEEDED)
+       $(MAKE) install TARGET=libafs "COMPILE_PART1=cd src; cd" "COMPILE_PART2=; $(MAKE) install SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_PART3=; $(MAKE) test SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_CLEAN=; $(MAKE) clean SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ TOP_SRCDIR=@TOP_SRCDIR@ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME}
+
 project: cmd comerr 
 
 config: 
@@ -96,7 +104,7 @@ rxtests: rxobj
 
 fsint: project kfsint
 
-kfsint: lwp rxgen rxincls 
+kfsint: lwp rxgen rxincls
        ${COMPILE_PART1} fsint ${COMPILE_PART2}
 
 export2: project fsint
@@ -383,6 +391,12 @@ finale: project cmd comerr afsd allrcmds butc tbutc @ENABLE_KERNEL_MODULE@ libua
        libafsauthent libadmin
        ${COMPILE_PART1} finale ${COMPILE_PART2}
 
+finale_nolibafs: project cmd comerr afsd allrcmds butc tbutc libuafs audit kauth log package \
+       ptserver scout bu_utils ubik uss bozo vfsck volser \
+       venus update xstat afsmonitor dauth tests libafsrpc \
+       libafsauthent libadmin
+       ${COMPILE_PART1} finale ${COMPILE_PART2}
+
 # Use washtool to ensure MakefileProto is current and obj/libafs exists.
 
 libafs_setup: config export
@@ -503,7 +517,10 @@ distclean: clean
        /bin/rm -f config.log config.cache config.status Makefile
        /bin/rm -f src/config/afsconfig.h src/config/Makefile.${SYS_NAME} 
        /bin/rm -f src/libafs/Makefile src/libafs/MakefileProto.${MKAFS_OSTYPE}
-       /bin/rm -f src/libuafs/Makefile src/kauth/Kkauth.cs.c
+       /bin/rm -f src/libuafs/Makefile afs.ppc_darwin.plist src/pam/Makefile
+
+pristine: distclean
+       /bin/rm -f src/config/afsconfig.h.in configure aclocal.m4
 
 links:
        echo "Remove the obj directory"

diff --git a/configure.in b/configure.in
index d5e9863e6ff83a7ec3759446be062d539e184da0..bf8723487dee5891788ab9c2810df572813c96e5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -21,12 +21,18 @@ AC_ARG_ENABLE( fast-restart,
 [  --enable-fast-restart               enable fast startup of file server without salvaging],, enable_fast_restart="no")
 AC_ARG_ENABLE( bitmap-later,
 [  --enable-bitmap-later               enable fast startup of file server by not reading bitmap till needed],, enable_bitmap_later="no")
+AC_ARG_WITH(dux-kernel-headers,
+[  --with-dux-kernel-headers=path      use the kernel headers found at path(optional, defaults to first match in /usr/sys)]
+)
 AC_ARG_WITH(linux-kernel-headers,
 [  --with-linux-kernel-headers=path            use the kernel headers found at path(optional, defaults to /usr/src/linux)]
 )
 AC_ARG_ENABLE(kernel-module,
 [  --disable-kernel-module                     disable compilation of the kernel module (defaults to enabled)],, enable_kernel_module="yes"
 )
+AC_ARG_ENABLE(redhat-buildsys,
+[  --enable-redhat-buildsys            enable compilation of the redhat build system kernel (defaults to disabled)],, enable_redhat_buildsys="no"
+)
 
 AC_PROG_CC
 
@@ -65,8 +71,19 @@ case $system in
                 if test -f "$LINUX_KERNEL_PATH/include/linux/version.h"; then
                  linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_PATH/include/linux/version.h |awk 'BEGIN { FS="\"" } { print $2 }'|tail -1`
                  if test "x$linux_kvers" = "x"; then
-                   AC_MSG_ERROR(Linux headers lack version definition)
-                   exit 1
+                   if test -f "$LINUX_KERNEL_PATH/include/linux/version-up.h"; then
+                     linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_PATH/include/linux/version-up.h |awk 'BEGIN { FS="\"" } { print $2 }'|tail -1`
+                     if test "x$linux_kvers" = "x"; then
+
+                       AC_MSG_ERROR(Linux headers lack version definition [2])
+                       exit 1
+                     else
+                       LINUX_VERSION="$linux_kvers"
+                      fi
+                    else
+                      AC_MSG_ERROR(Linux headers lack version definition)
+                     exit 1
+                   fi
                  else
                    LINUX_VERSION="$linux_kvers"
                  fi
@@ -88,15 +105,26 @@ case $system in
                AC_MSG_RESULT(linux)
                if test "x$enable_kernel_module" = "xyes"; then
                 LINUX_FS_STRUCT_INODE_HAS_I_BYTES
+                LINUX_FS_STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK
                 LINUX_INODE_SETATTR_RETURN_TYPE
                 LINUX_NEED_RHCONFIG
                 LINUX_WHICH_MODULES
+                if test "x$ac_cv_linux_func_inode_setattr_returns_int" = "xyes" ; then
+                 AC_DEFINE(INODE_SETATTR_NOT_VOID)
+                fi
+                if test "x$ac_cv_linux_fs_struct_inode_has_i_bytes" = "xyes"; then 
+                 AC_DEFINE(STRUCT_INODE_HAS_I_BYTES)
+                fi
+                if test "x$ac_cv_linux_fs_struct_address_space_has_page_lock" = "xyes"; then 
+                 AC_DEFINE(STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK)
+                fi
                 :
                fi
                 ;;
         *-solaris*)
                MKAFS_OSTYPE=SOLARIS
                 AC_MSG_RESULT(sun4)
+               SOLARIS_UFSVFS_HAS_DQRWLOCK
                 ;;
         *-hpux*)
                MKAFS_OSTYPE=HPUX
@@ -113,6 +141,17 @@ case $system in
         *-osf*)
                MKAFS_OSTYPE=DUX
                 AC_MSG_RESULT(alpha_dux)
+               if test "x$enable_kernel_module" = "xyes"; then
+                if test "x$with_dux_kernel_headers" != "x"; then
+                  HEADER_RT=`ls ${with_dux_kernel_headers}/rt_preempt.h | head -1 | sed 's,/rt_preempt.h,,;s,/usr/sys/,,'`
+                else
+                  HEADER_RT=`ls /usr/sys/*/rt_preempt.h | head -1 | sed 's,/rt_preempt.h,,;s,/usr/sys/,,'`
+                fi
+               fi
+               if test "$HEADER_RT" = "*" ; then
+                       AC_MSG_ERROR([Need a configured kernel directory])
+               fi
+               AC_SUBST([HEADER_RT])
                 ;;
         *-darwin*)
                MKAFS_OSTYPE=DARWIN
@@ -127,6 +166,84 @@ case $system in
                 ;;
 esac
 
+if test "x$with_afs_sysname" != "x"; then
+        AFS_SYSNAME="$with_afs_sysname"
+else
+       AC_MSG_CHECKING(your AFS sysname)
+       case $host in
+               i?86-*-freebsd4.2*)
+                       AFS_SYSNAME="i386_fbsd_42"
+                       ;;
+               hppa-hp-hpux11*)
+                       AFS_SYSNAME="hp_ux110"
+                       ;;
+               hppa-hp-hpux10*)
+                       AFS_SYSNAME="hp_ux102"
+                       ;;
+               powerpc-apple-darwin1.2*)
+                       AFS_SYSNAME="ppc_darwin_12"
+                       ;;
+               powerpc-apple-darwin1.3*)
+                       AFS_SYSNAME="ppc_darwin_13"
+                       ;;
+               sparc-sun-solaris2.5*)
+                       AFS_SYSNAME="sun4x_55"
+                       ;;
+               sparc-sun-solaris2.6)
+                       AFS_SYSNAME="sun4x_56"
+                       ;;
+               sparc-sun-solaris2.7)
+                       AFS_SYSNAME="sun4x_57"
+                       ;;
+               sparc-sun-solaris2.8)
+                       AFS_SYSNAME="sun4x_58"
+                       ;;
+               alpha*-dec-osf4.0*)
+                       AFS_SYSNAME="alpha_dux40"
+                       ;;
+               alpha*-dec-osf5.0*)
+                       AFS_SYSNAME="alpha_dux50"
+                       ;;
+               mips-sgi-irix6.5)
+                       AFS_SYSNAME="sgi_65"
+                       ;;
+               powerpc-*-linux*)
+                       AFS_SYSNAME="ppc_linuxXX"
+                       ;;
+               alpha*-linux*)
+                       AFS_SYSNAME="alpha_linux_XX"
+                       ;;
+               sparc-*-linux*)
+                       AFS_SYSNAME="sparc_linuxXX"
+                       ;;
+               sparc64-*-linux*)
+                       AFS_SYSNAME="sparc64_linuxXX"
+                       ;;
+               i?86-*-linux*)
+                       AFS_SYSNAME="i386_linuxXX"
+                       ;;
+               power*-ibm-aix4.2*)
+                       AFS_SYSNAME="rs_aix42"
+                       ;;
+               power*-ibm-aix4.3*)
+                       AFS_SYSNAME="rs_aix42"
+                       ;;
+               default)
+                       AC_MSG_ERROR(An AFS sysname is required)
+                       exit 1
+                       ;;
+       esac
+       case $AFS_SYSNAME in
+               *_linux*)
+                       AFS_SYSKVERS=`echo $LINUX_VERSION | awk -F\. '{print $1 $2}'`
+                       _AFS_SYSNAME=`echo $AFS_SYSNAME|sed s/XX\$/$AFS_SYSKVERS/`
+                       AFS_SYSNAME="$_AFS_SYSNAME"
+                       ;;
+       esac
+        AC_MSG_RESULT($AFS_SYSNAME)
+fi
+
+
 if test "x${MKAFS_OSTYPE}" = "xIRIX"; then
         echo Skipping library tests because they confuse Irix.
 else
@@ -210,14 +327,6 @@ if test "$enable_bitmap_later" = "yes"; then
        AC_DEFINE(BITMAP_LATER)
 fi
 
-# Should autocompute a default
-if test "x$with_afs_sysname" != "x"; then
-       AFS_SYSNAME="$with_afs_sysname"
-else
-       AC_MSG_ERROR(An AFS sysname is required)
-       exit 1
-fi
-
 if test "$enable_bos_restricted_mode" = "yes"; then
        AC_DEFINE(BOS_RESTRICTED_MODE)
 fi
@@ -263,6 +372,9 @@ AC_SUBST(WITH_INSECURE)
 
 AC_OUTPUT(             \
 Makefile               \
+src/config/Makefile.version-NOCML \
 src/config/Makefile.${AFS_SYSNAME} \
 src/libafs/MakefileProto.${MKAFS_OSTYPE} \
+src/pam/Makefile \
+src/afsd/afs.ppc_darwin.plist \
 )

diff --git a/src/afs/LINUX/osi_cred.c b/src/afs/LINUX/osi_cred.c
index 85089f2938a9f9c9ffec7c09043bf88c83708d8b..5701b29e605eb0c03494765058aa09f52f01906b 100644 (file)
--- a/src/afs/LINUX/osi_cred.c
+++ b/src/afs/LINUX/osi_cred.c
@@ -11,10 +11,10 @@
  * osi_cred.c - Linux cred handling routines.
  *
  */
-#include "../afs/param.h"
 #include <afsconfig.h>
+#include "../afs/param.h"
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_cred.c,v 1.3 2001/07/11 04:03:24 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_cred.c,v 1.4 2001/07/15 07:22:26 hartmans Exp $");
 
 #include "../afs/sysincludes.h"
 #include "../afs/afsincludes.h"

diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c
index 2d859fd58c09cd6186bbf62b2df0ffee1fd93f10..23f7a746d0baefb02e886a8094afb127414370c1 100644 (file)
--- a/src/afs/LINUX/osi_file.c
+++ b/src/afs/LINUX/osi_file.c
@@ -7,10 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include "../afs/param.h"      /* Should be always first */
 #include <afsconfig.h>
+#include "../afs/param.h"
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_file.c,v 1.5 2001/07/11 04:03:24 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_file.c,v 1.6 2001/07/15 07:22:26 hartmans Exp $");
 
 #include "../afs/sysincludes.h"        /* Standard vendor system headers */
 #include "../afs/afsincludes.h"        /* Afs-based standard headers */

diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c
index 6cea3f9758d752d625e4961454fcd38d9acb5e95..bbb4eb36281089c48c8213cef4cad87dfff20a52 100644 (file)
--- a/src/afs/LINUX/osi_misc.c
+++ b/src/afs/LINUX/osi_misc.c
@@ -11,10 +11,10 @@
  * Linux support routines.
  *
  */
-#include "../afs/param.h"
 #include <afsconfig.h>
+#include "../afs/param.h"
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_misc.c,v 1.5 2001/07/11 04:03:24 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_misc.c,v 1.6 2001/07/15 07:22:26 hartmans Exp $");
 
 #include "../afs/sysincludes.h"
 #include "../afs/afsincludes.h"

diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index 4dddbfbdabe33d731f054c0c954b81b77f470d5c..684792c4fe6ffba71e0b44e936ab85e8bafb0813 100644 (file)
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -11,10 +11,10 @@
  * Linux module support routines.
  *
  */
-#include "../afs/param.h"
 #include <afsconfig.h>
+#include "../afs/param.h"
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_module.c,v 1.5 2001/07/11 04:03:24 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_module.c,v 1.6 2001/07/15 07:22:26 hartmans Exp $");
 
 #include "../afs/sysincludes.h"
 #include "../afs/afsincludes.h"

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index bf3d9daf37a2f06ea1aa9893465d5a8114cc586d..f4610c8d9f1c129bd985a64aa2e1e0faf1d8416f 100644 (file)
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -20,10 +20,10 @@
  * stat calls.
  */
 
-#include "../afs/param.h"
 #include <afsconfig.h>
+#include "../afs/param.h"
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.7 2001/07/11 04:03:24 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.8 2001/07/15 07:22:26 hartmans Exp $");
 
 #include "../afs/sysincludes.h"
 #include "../afs/afsincludes.h"

diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c
index fbfbb28df7502da274a8fe39966d73405ad0b5b5..44593c8e568cf1b0ea02ab26542361abee6aac72 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_lookup.c
+++ b/src/afs/VNOPS/afs_vnop_lookup.c
@@ -19,10 +19,10 @@
  * afs_index
  */
 
-#include "../afs/param.h"      /* Should be always first */
 #include <afsconfig.h>
+#include "../afs/param.h"
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/VNOPS/afs_vnop_lookup.c,v 1.5 2001/07/11 04:03:25 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/afs/VNOPS/afs_vnop_lookup.c,v 1.6 2001/07/15 07:22:27 hartmans Exp $");
 
 #include "../afs/sysincludes.h"        /* Standard vendor system headers */
 #include "../afs/afsincludes.h"        /* Afs-based standard headers */

diff --git a/src/afs/VNOPS/afs_vnop_readdir.c b/src/afs/VNOPS/afs_vnop_readdir.c
index b2788f77bcb13bf9c5979be6b895c83643ff0a10..3d86fa1660a2e87e5767e84bd2004bdf4d5a8588 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_readdir.c
+++ b/src/afs/VNOPS/afs_vnop_readdir.c
@@ -19,10 +19,10 @@
  * 
  */
 
-#include "../afs/param.h"      /* Should be always first */
 #include <afsconfig.h>
+#include "../afs/param.h"
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/VNOPS/afs_vnop_readdir.c,v 1.6 2001/07/11 04:03:25 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/afs/VNOPS/afs_vnop_readdir.c,v 1.7 2001/07/15 07:22:27 hartmans Exp $");
 
 #include "../afs/sysincludes.h"        /* Standard vendor system headers */
 #include "../afs/afsincludes.h"        /* Afs-based standard headers */

diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index 5ace1a63c6ed9762bd0b1fabd3d51dc98e5e339b..5c9f7544392ba5af08e4d51d900b8d7233b6cc3e 100644 (file)
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -7,10 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include "../afs/param.h"      /* Should be always first */
 #include <afsconfig.h>
+#include "../afs/param.h"
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_call.c,v 1.5 2001/07/11 04:03:23 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_call.c,v 1.6 2001/07/15 07:22:24 hartmans Exp $");
 
 #include "../afs/sysincludes.h"        /* Standard vendor system headers */
 #include "../afs/afsincludes.h"        /* Afs-based standard headers */

diff --git a/src/afs/afs_daemons.c b/src/afs/afs_daemons.c
index 748fec39db2bf05776442af19301bd73a1daae49..b68d80a50931bc2dc46a348d9936b11038494551 100644 (file)
--- a/src/afs/afs_daemons.c
+++ b/src/afs/afs_daemons.c
@@ -7,10 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include "../afs/param.h"      /* Should be always first */
 #include <afsconfig.h>
+#include "../afs/param.h"
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_daemons.c,v 1.3 2001/07/11 04:03:23 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_daemons.c,v 1.4 2001/07/15 07:22:24 hartmans Exp $");
 
 #include "../afs/sysincludes.h"        /* Standard vendor system headers */
 #include "../afs/afsincludes.h"        /* Afs-based standard headers */

diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index 6f98716244787c3d3de193d05841ab1b3e0136cc..f551d0dd32f50bffe8fa4f06b8c993b867bd8143 100644 (file)
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -7,10 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include "../afs/param.h"      /* Should be always first */
 #include <afsconfig.h>
+#include "../afs/param.h"
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_pioctl.c,v 1.7 2001/07/11 04:03:23 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_pioctl.c,v 1.8 2001/07/15 07:22:25 hartmans Exp $");
 
 #include "../afs/sysincludes.h"        /* Standard vendor system headers */
 #include "../afs/afsincludes.h"        /* Afs-based standard headers */

diff --git a/src/afsd/afs.ppc_darwin.plist b/src/afsd/afs.ppc_darwin.plist
deleted file mode 100644 (file)
index c29e664..0000000
--- a/src/afsd/afs.ppc_darwin.plist
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>afs</string>
-       <key>CFBundleIdentifier</key>
-       <string>org.openafs.filesystems.afs</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>afs</string>
-       <key>CFBundlePackageType</key>
-       <string>KEXT</string>
-       <key>CFBundleShortVersionString</key>
-       <string>1.0.3</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>1.0.3</string>
-       <key>OSBundleLibraries</key>
-       <dict>
-               <key>com.apple.kernel.bsd</key>
-               <string>1.0.0b1</string>
-               <key>com.apple.kernel.mach</key>
-               <string>1.0.0b1</string>
-       </dict>
-</dict>
-</plist>

diff --git a/src/config/Makefile.i386_linux22.in b/src/config/Makefile.i386_linux22.in
index e5bd2ecb9cc06f169f67f831a7415e40c4ab5f15..1f47b49b9170cb95434fe17d25e73519c1697f71 100644 (file)
--- a/src/config/Makefile.i386_linux22.in
+++ b/src/config/Makefile.i386_linux22.in
@@ -19,7 +19,7 @@ LINUX_VERS = 2.2.5-15 2.2.10 2.2.12 2.2.12-20 2.2.13 2.2.14
 
 #
 # compilation and link editor flags
-DBG=-g -Wall
+DBG=-g
 OPTMZ=-O2
 PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC
 # Put -O2 here to _ensure_ all Makefiles pick it up.
@@ -40,7 +40,7 @@ AR=ar
 AS=as
 CP=cp
 LD=ld   
-MT_CC=gcc
+MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm

diff --git a/src/config/Makefile.version-NOCML b/src/config/Makefile.version-NOCML
deleted file mode 100644 (file)
index 9edc0dd..0000000
--- a/src/config/Makefile.version-NOCML
+++ /dev/null
@@ -1,15 +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
-
-AFS_component_version_number.o: AFS_component_version_number.c
-
-AFS_component_version_number.c: 
-       echo 'char cml_version_number[]="@(#) OpenAFS devel built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c;
-       echo 'char* AFSVersion = "openafs devel"; ' >>AFS_component_version_number.c;
-
-noversion: install
-

diff --git a/src/lwp/lwp.c b/src/lwp/lwp.c
index b6c580cc391aba14c41de67ae02b584864cad4ed..4b89ff7e6c58311ad98e437a5c0e565adf253fc8 100644 (file)
--- a/src/lwp/lwp.c
+++ b/src/lwp/lwp.c
@@ -14,10 +14,10 @@
 *                                                                  *
 \*******************************************************************/
 
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/lwp/lwp.c,v 1.7 2001/07/11 04:03:27 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/lwp/lwp.c,v 1.8 2001/07/15 07:22:29 hartmans Exp $");
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/src/lwp/preempt.c b/src/lwp/preempt.c
index dd9ac8025ef66102c8f73a50a002baa9670f31ed..867a2973ff91c16ee9784ee5207f60dd78c3b41d 100644 (file)
--- a/src/lwp/preempt.c
+++ b/src/lwp/preempt.c
@@ -13,10 +13,10 @@
 *      Carnegie-Mellon University                                  *
 *                                                                  *
 \*******************************************************************/
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/lwp/preempt.c,v 1.6 2001/07/11 04:03:28 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/lwp/preempt.c,v 1.7 2001/07/15 07:22:29 hartmans Exp $");
 
 
 #if defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DJGPP_ENV)

diff --git a/src/lwp/process.c b/src/lwp/process.c
index a144c61396d82f2b4f9498485adc708d77cdf71f..c45904e8bfed2db0d48ea878b9c34612883ead4f 100644 (file)
--- a/src/lwp/process.c
+++ b/src/lwp/process.c
@@ -9,10 +9,10 @@
 
 /* process.c - manage lwp context switches be means of setjmp/longjmp. */
 
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/lwp/process.c,v 1.6 2001/07/11 04:03:28 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/lwp/process.c,v 1.7 2001/07/15 07:22:30 hartmans Exp $");
 
 #include <stdio.h>
 #include <assert.h>

diff --git a/src/pam/Makefile b/src/pam/Makefile
deleted file mode 100644 (file)
index c6f3c8e..0000000
--- a/src/pam/Makefile
+++ /dev/null
@@ -1,104 +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
-
-SHELL=/bin/sh
-KERNELDIR = ../libafs/
-
-COMPONENT=afs
-include ../config/Makefile.${SYS_NAME}
-
-LIBDIR = ${DESTDIR}lib/
-  LIBSA = ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a
-AFSLIBS = ${DESTDIR}lib/librxkad.a         \
-         ${LIBDIR}afs/libsys.a ${DESTDIR}lib/libdes.a      \
-         ${LIBDIR}librx.a ${LIBDIR}liblwp.a ${LIBDIR}afs/libaudit.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
-
-LDFLAGS = ${SHARE_LDFLAGS}
-   LIBS = ${LIBDIR}afs/libkauth.a ${LIBSA} ${LIBDIR}afs/libauth.a \
-         ${AFSLIBS} ${PAMLIBS}
-  KLIBS = ${LIBDIR}afs/libkauth.krb.a ${LIBSA} ${LIBDIR}afs/libauth.krb.a \
-         ${AFSLIBS} ${PAMLIBS}
- SHOBJS = afs_auth.o afs_account.o afs_session.o afs_password.o \
-         afs_pam_msg.o afs_message.o afs_util.o AFS_component_version_number.o
-   OBJS = $(SHOBJS) test_pam.o
-INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}include \
-       -I/usr/include -I/usr/include/sys
-CFLAGS =  ${DEBUG}  ${INCLUDES} ${PAM_CFLAGS}
-
-TARGETS = pam_afs.so.1 test_pam pam_afs.krb.so.1
-
-include ../config/Makefile.version
-
-system all: $(TARGETS)
-
-afs_setcred.o: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h
-       ${CC} ${CFLAGS} -c afs_setcred.c -o afs_setcred.o
-
-afs_setcred_krb.o: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h
-       ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c afs_setcred.c -o afs_setcred_krb.o
-
-pam_afs.so.1: $(SHOBJS) afs_setcred.o
-       set -x; \
-       case "$(SYS_NAME)" in \
-       hp_ux*) \
-               $(LD) $(LDFLAGS) -c mapfile.hp -o $@ afs_setcred.o \
-                       $(SHOBJS) $(LIBS) ;; \
-       sun*_5*) \
-               $(LD) $(LDFLAGS) -M mapfile -o $@ afs_setcred.o \
-                       $(SHOBJS) $(LIBS) ;; \
-       *linux*) \
-               $(CC) $(LDFLAGS) -o $@ afs_setcred.o $(SHOBJS) $(LIBS) ;;\
-       *fbsd*) \
-               $(CC) $(LDFLAGS) -o $@ afs_setcred.o $(SHOBJS) $(LIBS) ;;\
-       * ) \
-               echo No link line for system $(SYS_NAME). ;; \
-       esac
-
-pam_afs.krb.so.1: $(SHOBJS) afs_setcred_krb.o
-       set -x; \
-       case "$(SYS_NAME)" in \
-       hp_ux*) \
-               $(LD) $(LDFLAGS) -c mapfile.hp -o $@ \
-                       afs_setcred_krb.o $(SHOBJS) $(LDFLAGS) $(KLIBS) ;; \
-       sun*_5*) \
-               $(LD) $(LDFLAGS) -M mapfile -o $@ \
-                       afs_setcred_krb.o $(SHOBJS) $(LDFLAGS) $(KLIBS) ;; \
-       *linux*) \
-               $(CC) $(LDFLAGS) -o $@ afs_setcred_krb.o $(SHOBJS) $(KLIBS) ;;\
-       *fbsd*) \
-               $(CC) $(LDFLAGS) -o $@ afs_setcred_krb.o $(SHOBJS) $(KLIBS) ;;\
-       * ) \
-               echo No link line for system $(SYS_NAME). ;; \
-       esac
-
-test_pam: test_pam.o
-       set -x; \
-       case "$(SYS_NAME)" in \
-       hp_ux*) \
-               $(CC) $(CFLAGS) -o $@ test_pam.o ${PAMLIBS};; \
-       sun*_5*) \
-               $(CC) $(CFLAGS) -o $@ test_pam.o ${PAMLIBS};; \
-       *linux*) \
-               $(CC) $(CFLAGS) -rdynamic -o $@ test_pam.o -lpam -ldl;; \
-       *fbsd*) \
-               $(CC) $(CFLAGS) -rdynamic -o $@ test_pam.o -lpam ;; \
-       *) \
-               echo No link line for system $(SYS_NAME). ;; \
-       esac
-
-clean:
-       /bin/rm -f $(TARGETS) $(OBJS) afs_setcred.o afs_setcred_krb.o core *~ AFS_component_version_number.c
-
-install:       all
-       ${INSTALL} -s pam_afs.so.1 ${DESTDIR}lib/pam_afs.so.1
-       ${INSTALL} -s pam_afs.krb.so.1 ${DESTDIR}lib/pam_afs.krb.so.1
-
-afs_auth.o: afs_auth.c afs_pam_msg.h afs_message.h afs_util.h
-afs_pam_msg.o: afs_pam_msg.c afs_pam_msg.h afs_message.h
-afs_message.o: afs_message.c afs_message.h
-afs_util.o: afs_util.c afs_util.h

diff --git a/src/ptserver/pt_util.c b/src/ptserver/pt_util.c
index 529cf3e32213cca5a64cdcaef0bb542eed602344..a80ce08cb6b30d2234209d7f363280da1951d307 100644 (file)
--- a/src/ptserver/pt_util.c
+++ b/src/ptserver/pt_util.c
@@ -1,4 +1,4 @@
-/* $Id: pt_util.c,v 1.3 2001/07/11 04:03:28 hartmans Exp $ */
+/* $Id: pt_util.c,v 1.4 2001/07/15 07:22:30 hartmans Exp $ */
 
 /*
  *
@@ -18,10 +18,10 @@
 #include <string.h>
 #include <sys/file.h>
 
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/ptserver/pt_util.c,v 1.3 2001/07/11 04:03:28 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/ptserver/pt_util.c,v 1.4 2001/07/15 07:22:30 hartmans Exp $");
 
 #include <lock.h>
 #include <netinet/in.h>

diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c
index fe78048a5110af624293f9a031595c3a7b513d6f..7f31e087a186d929ee9ee4b6be3a87cdadea256e 100644 (file)
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -7,10 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/ptserver/ptserver.c,v 1.3 2001/07/11 04:03:28 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/ptserver/ptserver.c,v 1.4 2001/07/15 07:22:31 hartmans Exp $");
 
 #include <afs/stds.h>
 #ifdef AFS_AIX32_ENV

diff --git a/src/util/dirpath.c b/src/util/dirpath.c
index d7f2c52bd302388d9b2a8ef3950eabffcce3230c..72c1ec3e853826e2228b308a5c96c425732b5d0b 100644 (file)
--- a/src/util/dirpath.c
+++ b/src/util/dirpath.c
@@ -10,10 +10,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/util/dirpath.c,v 1.8 2001/07/11 04:03:29 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/util/dirpath.c,v 1.9 2001/07/15 07:22:31 hartmans Exp $");
 
 #include <stddef.h>
 #include <stdlib.h>

diff --git a/src/venus/Makefile b/src/venus/Makefile
index 833e7632249c3b217ea93fcc9fa398b994cfe7db..470547d3cb0bc656cd6515a7b9513d3cb330067b 100644 (file)
--- a/src/venus/Makefile
+++ b/src/venus/Makefile
@@ -188,11 +188,11 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c
        case ${SYS_NAME} in \
                alpha_linux* ) \
                        for lv in ${LINUX_VERS}; do \
-                               ${CC} -g -I${LINUX_SRCDIR}$$lv/include -I${DESTDIR}include -I${SRCDIR}include ${XCFLAGS} -mno-fp-regs -ffixed-8 -o kdump-$$lv.o -c kdump.c ; \
+                               ${CC} -g -I${LINUX_SRCDIR}$$lv/include -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} -mno-fp-regs -ffixed-8 -o kdump-$$lv.o -c kdump.c ; \
                                done ;; \
                *linux* ) \
                        for lv in ${LINUX_VERS}; do \
-                               ${CC} -g -I${LINUX_SRCDIR}$$lv/include -I${DESTDIR}include -I${SRCDIR}include ${XCFLAGS} -o kdump-$$lv.o -c kdump.c ; \
+                               ${CC} -g -I${LINUX_SRCDIR}$$lv/include -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} -o kdump-$$lv.o -c kdump.c ; \
                        done ;; \
                alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c| alpha_dux?? ) \
                        ${CC} -g ${CFLAGS} -I/usr/sys/include -I/usr/sys/BINARY -I/usr/sys/AFS -DDEBUGGER -c kdump.c ;;\
@@ -205,12 +205,14 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c
                                case $$CPU_KDEFS in \
                                *-64*)  ${CC} -D_KMEMUSER -woff 1178 \
                                                -g -I${DESTDIR}include \
+                                               -I${TOP_SRCDIR}/config \
                                                $$CPU_KDEFS \
                                                ${XCFLAGS64} \
                                                -c kdump.c -o kdump.$$IP.o \
                                        ;; \
                                *)      ${CC} -D_KMEMUSER -woff 1178 \
                                                -g -I${DESTDIR}include \
+                                               -I${TOP_SRCDIR}/config \
                                                $$CPU_KDEFS \
                                                ${XCFLAGS} -DAFS_32BIT_KERNEL_ENV \
                                                -c kdump.c -o kdump.$$IP.o \
@@ -219,14 +221,14 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c
                        done \
                        ;; \
                *) \
-                       ${CC} -g -I${DESTDIR}include -I${SRCDIR}include ${XCFLAGS} -c kdump.c ;; \
+                       ${CC} -g -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} -c kdump.c ;; \
        esac ;
 
 kdump64.o : kdump.c ${INCLS} AFS_component_version_number.c
        -set -x; \
        case ${SYS_NAME} in \
        sun4x_57 | hp_ux11* ) \
-               ${CC} -g -I${DESTDIR}include -I${SRCDIR}include ${XCFLAGS64} -o kdump64.o -c kdump.c ;; \
+               ${CC} -g -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS64} -o kdump64.o -c kdump.c ;; \
        esac
 
 kdump:  kdump.o

diff --git a/src/venus/fstrace.c b/src/venus/fstrace.c
index e2c257a1779edb0f217de1c3d146580413c6dd85..1b0f0bdc61275e17486d0586c77112ed574db470 100644 (file)
--- a/src/venus/fstrace.c
+++ b/src/venus/fstrace.c
@@ -10,10 +10,10 @@
 /*
  * All Rights Reserved
  */
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/venus/fstrace.c,v 1.4 2001/07/11 04:03:30 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/venus/fstrace.c,v 1.5 2001/07/15 07:22:32 hartmans Exp $");
 
 #include <stdio.h>
 #include <sys/types.h>

diff --git a/src/vol/partition.c b/src/vol/partition.c
index f0abbeb840f2b68d9d8036fc951354f00e93f278..24d2cc09d5549231a4baf68a1f8526e6988786cb 100644 (file)
--- a/src/vol/partition.c
+++ b/src/vol/partition.c
@@ -15,10 +15,10 @@
 
  */
 
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/vol/partition.c,v 1.6 2001/07/11 04:03:31 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/vol/partition.c,v 1.7 2001/07/15 07:22:32 hartmans Exp $");
 
 #include <ctype.h>
 #ifdef AFS_NT40_ENV

diff --git a/src/volser/volmain.c b/src/volser/volmain.c
index 65722e4d35c0f04d26d76d80fa6a14f35fa4b9d8..200c6e1221b223578c8cb46ed1b0eb2a99d00ca1 100644 (file)
--- a/src/volser/volmain.c
+++ b/src/volser/volmain.c
@@ -7,10 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/volser/volmain.c,v 1.5 2001/07/11 04:03:31 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/volser/volmain.c,v 1.6 2001/07/15 07:22:32 hartmans Exp $");
 
 #include <sys/types.h>
 #ifdef AFS_NT40_ENV