New upstream version merges

diff --git a/src/Makefile b/src/Makefile
index 8ebc0b70cf43ca75c65f1651ad1cdb6b515bfbc3..9d6c1e173aff7dfb0fee5c81cd432dc118049920 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,9 @@
-#/* Copyright (C) 1990, 1989 Transarc Corporation - All rights reserved */
-
+# 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
 DESTDIR=dest/

diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h
index 732874f64cc2d934f98fe2bed447610eb367abee..55a3ab2b0c48c1607538a7ea304280eea83bbffd 100644 (file)
--- a/src/afs/UKERNEL/sysincludes.h
+++ b/src/afs/UKERNEL/sysincludes.h
@@ -1,6 +1,10 @@
 /*
- * (C) COPYRIGHT IBM CORPORATION 1998
- * LICENSED MATERIALS - PROPERTY OF IBM
+ * 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
  */
 
 #ifndef __AFS_SYSINCLUDESH__

diff --git a/src/afsd/afs.rc.linux b/src/afsd/afs.rc.linux
index a4cfb96739d8dbba31b823779d51ec8d7179eaf3..5ad3555ab830b99289b18a2b0f735aa9d031eb51 100644 (file)
--- a/src/afsd/afs.rc.linux
+++ b/src/afsd/afs.rc.linux
@@ -1,5 +1,11 @@
 #! /bin/sh
-#
+# 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  Start and stop AFS components
 # 
 # 

diff --git a/src/config/Makefile.i386_linux22 b/src/config/Makefile.i386_linux22
index 331ef21816046f323d33044789f02afe7431703c..0128d4d261f02556f70adb1d4d53afdf61819430 100644 (file)
--- a/src/config/Makefile.i386_linux22
+++ b/src/config/Makefile.i386_linux22
@@ -1,5 +1,10 @@
-# Copyright 1998 Transarc Corporation 
-#
+# 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
+
 # Keep macros within each section in sorted order for clean diff displays.
 #
 # AFS_OSTYPE used to indicate suffixes and os specific subdirectories.

diff --git a/src/util/dirpath.h b/src/util/dirpath.h
index 197e248c8779fd46f3c831f81a059d5493ec5cc7..7b4f7a14f41cf7038d987693159c65f23d6c5ba8 100644 (file)
--- a/src/util/dirpath.h
+++ b/src/util/dirpath.h
@@ -1,6 +1,15 @@
 /* Changed for Debian by Sam Hartman <hartmans@mit.edu>
  * conform to FHS
  */
+/*
+ * 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
+
+ */
 
 /* Copyright (C) 1998 Transarc Corporation - All rights reserved.
  */

diff --git a/src/vfsck/libfs.h b/src/vfsck/libfs.h
deleted file mode 100644 (file)
index 769c9f9..0000000
--- a/src/vfsck/libfs.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * $Revision: 1.1 $
- */
-
-/*
- * libfs.h:
- *    Contains declarations and macro definitions utilized by source
- *    files that make up the libfs library.
- *
- *    This file is local to the build environment.
- *    One can include this header in their code with the statement:
- *        #include <sys/libfs.h>
- */
-
-/*
- * This file is part of the HP-YUX source code and shouls not be released
- * to AFS  customers unless thay have a source license
- */
-
-#ifndef _STDIO_INCLUDED
-#  include <stdio.h>         /* For FILE definition */
-#endif
-#ifndef _SYS_FS_INCLUDED
-#  include <sys/fs.h>        /* For UFS_*(fs) macro definitions */
-#endif
-
-/*
- * Useful macros used by many FS commands
- */
-
-#define VALID_FS_MAGIC(fs)    UFS_VALID_FS_MAGIC(fs)   /* in <sys/fs.h> */
-#define LONG_FILENAME_FS(fs)  UFS_LFN_FS(fs)           /* in <sys/fs.h> */
-
-/*
- * Return Values from LongFilenameOK()
- */
-#define LFN_ERROR             (-1)
-#define LFN_NOT_OK             0
-#define LFN_OK                 1
-
-/*
- * Values returned by setup_block_seek()
- */
-#define BLKSEEK_PROCESSING_ERROR   (-2)
-#define BLKSEEK_FILE_WRITEONLY     (-1)
-#define BLKSEEK_NOT_ENABLED         0
-#define BLKSEEK_ENABLED             1
-
-/* 
- * extern declarations of libfs routines.
- */
-typedef int   boolean;
-
-#ifdef _PROTOTYPES
-  extern boolean is_mounted(char *);
-  extern boolean IsSwap(char *);
-  extern FILE    *mnt_setmntent(char *, char *);
-  extern int     LongFilenameOK(char *);
-  extern char    *fserror(char *);
-  extern void    set_fserror(char *);
-  extern int     setup_block_seek(int);
-  extern int     setup_block_seek_2(int,int *);
-#else
-  extern boolean is_mounted();
-  extern boolean IsSwap();
-  extern FILE    *mnt_setmntent();
-  extern int     LongFilenameOK();
-  extern char    *fserror();
-  extern void    set_fserror();
-  extern int     setup_block_seek();
-  extern int     setup_block_seek_2();
-#endif
-