diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index bcd5ed6..0000000 --- a/.cvsignore +++ /dev/null @@ -1,27 +0,0 @@ -Makefile -aclocal.m4 -config.log -config.cache -config.status -configure -configure-libafs -hp_ux102 -hp_ux110 -i386_linux22 -i386_linux24 -i386_umlinux22 -i386_umlinux24 -include -lib -parisc_linux24 -sgi_65 -sun4x_56 -sun4x_57 -autom4te.cache -ID -TAGS -dest -obj -NTLang.bat -NTMakefile -golast.bat diff --git a/.gitignore b/.gitignore index 1070917..083d4ef 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ *.so *.sl *.so.* +*.dylib.* *.xdr.c *.cs.c *.ss.c @@ -52,16 +53,31 @@ AFS_component_version_number.h /golast.bat # Destination build directories -/amd64_linux26 -/hp_ux102 -/hp_ux110 -/i386_linux22 -/i386_linux24 -/i386_linux26 -/i386_umlinux22 -/i386_umlinux24 -/parisc_linux24 +/alpha_nbsd* +/alpha_dux* +/amd64_linux* +/amd64_fsbd* +/amd64_nbsd* +/hp_ux* +/i386_dfbsd* +/i386_fbsd* +/i386_nbsd* +/i386_obsd* +/i386_linux* +/i386_umlinux* +/ia64_hpux* +/ia64_linux* +/parisc_linux* +/ppc_darwin* +/ppc_nbsd* +/ppc64_linux* +/rs_aix* +/s390_linux* +/s390x_linux* /sgi_65 -/sun4x_56 -/sun4x_57 - +/sparc64_obsd* +/sparc64_linux* +/sun4_* +/sun4x_* +/sunx86_* +/x86_darwin* diff --git a/Makefile.in b/Makefile.in index 4dc9649..1b7a4e8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -514,7 +514,7 @@ shlibafsrpc: rx rxkad des case ${SYS_NAME} in \ amd64_linux24) \ echo Skipping shlibafsrpc for amd64_linux24 ;; \ - alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \ + alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*_darwin_1*) \ ${COMPILE_PART1} shlibafsrpc ${COMPILE_PART2} ;; \ *) \ echo Not building shared libafsrpc for ${SYS_NAME} ;; \ @@ -524,7 +524,7 @@ shlibafsauthent: ubik auth kauth shlibafsrpc case ${SYS_NAME} in \ amd64_linux24) \ echo Skipping shlibafsauthent for amd64_linux24 ;; \ - alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \ + alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*_darwin_1*) \ ${COMPILE_PART1} shlibafsauthent ${COMPILE_PART2} ;; \ *) \ echo Not building shared libafsauthent for ${SYS_NAME} ;; \ diff --git a/acinclude.m4 b/acinclude.m4 index dda4ae1..f3a90ea 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -5,10 +5,8 @@ dnl NB: Because this code is a macro, references to positional shell dnl parameters must be done like $[]1 instead of $1 AC_DEFUN([OPENAFS_CONFIGURE_COMMON],[ -AH_VERBATIM([RCSID], -[#define RCSID(msg) \ -static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } -#undef HAVE_CONNECT +AH_VERBATIM([OPENAFS_HEADER], +[#undef HAVE_CONNECT #undef HAVE_GETHOSTBYNAME #undef HAVE_RES_SEARCH #undef HAVE_SOCKET @@ -552,6 +550,9 @@ else i386-apple-darwin9.*) AFS_SYSNAME="x86_darwin_90" ;; + i?86-apple-darwin10.*) + AFS_SYSNAME="x86_darwin_100" + ;; sparc-sun-solaris2.5*) AFS_SYSNAME="sun4x_55" enable_login="yes" diff --git a/doc/man-pages/.cvsignore b/doc/man-pages/.cvsignore deleted file mode 100644 index ededa50..0000000 --- a/doc/man-pages/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -html -install-man -man1 -man5 -man8 diff --git a/doc/man-pages/pod1/vos_addsite.pod b/doc/man-pages/pod1/vos_addsite.pod index ab10c1a..ac6a9cf 100644 --- a/doc/man-pages/pod1/vos_addsite.pod +++ b/doc/man-pages/pod1/vos_addsite.pod @@ -9,14 +9,17 @@ vos_addsite - Adds a read-only site definition to a volume's VLDB entry B S<<< B<-server> > >>> S<<< B<-partition> > >>> - S<<< B<-id> > >>> S<<< B<-valid> > >>> - S<<< [B<-cell> >] >>> [B<-noauth>] [B<-localauth>] + S<<< B<-id> > >>> + S<<< [B<-roid> >] >>> + [B<-valid>] S<<< [B<-cell> >] >>> + [B<-noauth>] [B<-localauth>] [B<-verbose>] [B<-help>] B S<<< B<-s> > >>> S<<< B<-p> > >>> - S<<< B<-i> > >>> S<<< B<-valid> > >>> - S<<< [B<-c> >] >>> [B<-n>] [B<-l>] [B<-v>] [B<-h>] + S<<< B<-i> > >>> + S<<< [B<-r> >] >>> + [B<-va>] [B<-c> >] >>> [B<-n>] [B<-l>] [B<-v>] [B<-h>] =for html @@ -69,14 +72,30 @@ L. Specifies either the complete name or volume ID number of the read/write source volume. -=item B<-valid> > +=item B<-roid> > -Specifies the volume ID number of the existing release-equivalent -volume that is not already marked as a replica. This is useful when an -existing read-only volume is dumped and restored with the B<-readonly> -flag at the new site. This option is available in OpenAFS clients -1.4.7 or later and 1.5.31 and later. This option can be used with -OpenAFS server versions later than 1.4.1 or 1.5.0. +Specifies either the complete name or volume ID number of the readonly +volume. This will only be honored if the source read/write volume does not +already have a readonly volume ID associated with it. If the source +read/write volume already has a readonly volume ID, the specified ID will +be ignored, and a warning will be printed. + +If this is not specified and the source read/write volume does not already +have a readonly volume ID, a volume ID for the readonly volume will be +allocated for it when the B command is run. + +The automatically allocated readonly volume IDs should be fine for almost +all cases, so you should almost never need to specify this option. + +=item B<-valid> + +Marks the site as up-to-date in the VLDB. You should only do this if the +new site already has a current readonly replica of the volume, but for +some reason it is not in the VLDB as a replica site. This is useful when +an existing read-only volume is dumped and restored with the B<-readonly> +flag at the new site. This option is available in OpenAFS clients 1.4.7 or +later and 1.5.31 and later. This option can be used with OpenAFS server +versions later than 1.4.1 or 1.5.0. =item B<-cell> > @@ -88,7 +107,7 @@ with the B<-localauth> flag. For more details, see L. Assigns the unprivileged identity anonymous to the issuer. Do not combine this flag with the B<-localauth> flag. For more details, see L. -=item -localauth +=item B<-localauth> Constructs a server ticket using a key from the local F file. The B command interpreter presents it diff --git a/doc/man-pages/pod1/vos_create.pod b/doc/man-pages/pod1/vos_create.pod index 2906205..6033960 100644 --- a/doc/man-pages/pod1/vos_create.pod +++ b/doc/man-pages/pod1/vos_create.pod @@ -9,11 +9,13 @@ vos_create - Creates a read/write volume and associated VLDB entry B S<<< B<-server> > >>> S<<< B<-partition> > >>> S<<< B<-name> > >>> S<<< [B<-maxquota> >] >>> + S<<< [B<-id> >] >>> S<<< [B<-roid> >] >>> S<<< [B<-cell> >] >>> [B<-noauth>] [B<-localauth>] [B<-verbose>] [B<-help>] B S<<< B<-s> > >>> S<<< B<-p> > >>> S<<< B<-na> > >>> S<<< [B<-m> >] >>> + S<<< [B<-i> >] >>> S<<< [B<-r> >] >>> S<<< [B<-c> >] >>> [B<-no>] [B<-l>] [B<-v>] [B<-h>] =for html @@ -107,6 +109,32 @@ of kilobyte blocks (a value of C<1024> is one megabyte). The value C<0> houses the volume places an absolute limit on its size. If this argument is omitted, the default value is C<5000>. +=item B<-id> > + +Specifies the volume ID for the read/write volume. If this options is not +specified, or the given volume ID is 0, a volume ID will be allocated for +the volume automatically. The volume IDs allocated should be fine for +almost all cases, so you should almost never need to specify this option. + +=item B<-roid> > + +Specifies the volume ID for the readonly volume corresponding to the +read/write volume that is being created. The readonly volume will not be +created; this merely specifies what volume ID the readonly volume will use +when it is created. If a volume ID of 0 is specified here, no readonly +volume ID will be assigned to the created volume immediately. A readonly +volume ID can still be assigned later when B is run; if a +volume does not have a readonly volume ID associated with it by the time +B is run, a volume ID will be allocated for it. + +If this option is not specified, the default readonly volume ID is one +number higher than the read-write volume ID, whether or not that ID was +manually specified. + +As with the B<-id> option, the default allocated volume IDs should be +sufficient for almost all cases, so you should almost never need to +specify this option. + =item B<-cell> > Names the cell in which to run the command. Do not combine this argument diff --git a/doc/xml/AdminGuide/.cvsignore b/doc/xml/AdminGuide/.cvsignore deleted file mode 100644 index 1f0ab98..0000000 --- a/doc/xml/AdminGuide/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -*.html -*.pdf -version.xml diff --git a/doc/xml/AdminGuide/.gitignore b/doc/xml/AdminGuide/.gitignore index 0e5cde8..563333e 100644 --- a/doc/xml/AdminGuide/.gitignore +++ b/doc/xml/AdminGuide/.gitignore @@ -5,5 +5,3 @@ *.html *.pdf version.xml - -!Makefile diff --git a/doc/xml/QuickStartUnix/.cvsignore b/doc/xml/QuickStartUnix/.cvsignore deleted file mode 100644 index 1f0ab98..0000000 --- a/doc/xml/QuickStartUnix/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -*.html -*.pdf -version.xml diff --git a/doc/xml/QuickStartUnix/.gitignore b/doc/xml/QuickStartUnix/.gitignore index 0e5cde8..563333e 100644 --- a/doc/xml/QuickStartUnix/.gitignore +++ b/doc/xml/QuickStartUnix/.gitignore @@ -5,5 +5,3 @@ *.html *.pdf version.xml - -!Makefile diff --git a/doc/xml/UserGuide/.cvsignore b/doc/xml/UserGuide/.cvsignore deleted file mode 100644 index 1f0ab98..0000000 --- a/doc/xml/UserGuide/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -*.html -*.pdf -version.xml diff --git a/doc/xml/UserGuide/.gitignore b/doc/xml/UserGuide/.gitignore index 0e5cde8..563333e 100644 --- a/doc/xml/UserGuide/.gitignore +++ b/doc/xml/UserGuide/.gitignore @@ -5,5 +5,3 @@ *.html *.pdf version.xml - -!Makefile diff --git a/src/.cvsignore b/src/.cvsignore deleted file mode 100644 index a08d0a3..0000000 --- a/src/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -helper-splint.sh diff --git a/src/JAVA/libjafs/.cvsignore b/src/JAVA/libjafs/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/JAVA/libjafs/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/WINNT/afsadmsvr/.cvsignore b/src/WINNT/afsadmsvr/.cvsignore deleted file mode 100644 index af83500..0000000 --- a/src/WINNT/afsadmsvr/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -iTaAfsAdmSvr.h -iTaAfsAdmSvrTypes.h -iTaAfsAdmSvr_c.c -iTaAfsAdmSvr_s.c - diff --git a/src/WINNT/afsapplib/.cvsignore b/src/WINNT/afsapplib/.cvsignore deleted file mode 100644 index 45415bd..0000000 --- a/src/WINNT/afsapplib/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -AFS_component_version_number.h -lang/AFS_component_version_number.h diff --git a/src/WINNT/afssvrcfg/.cvsignore b/src/WINNT/afssvrcfg/.cvsignore deleted file mode 100644 index 9e6d7b8..0000000 --- a/src/WINNT/afssvrcfg/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -AFS_component_version_number.h diff --git a/src/WINNT/afssvrcfg/lang/.cvsignore b/src/WINNT/afssvrcfg/lang/.cvsignore deleted file mode 100644 index 9e6d7b8..0000000 --- a/src/WINNT/afssvrcfg/lang/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -AFS_component_version_number.h diff --git a/src/WINNT/afssvrcpa/.cvsignore b/src/WINNT/afssvrcpa/.cvsignore deleted file mode 100644 index 2a4923c..0000000 --- a/src/WINNT/afssvrcpa/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -AFS_component_version_number.c -AFS_component_version_number.h diff --git a/src/WINNT/afssvrcpa/lang/.cvsignore b/src/WINNT/afssvrcpa/lang/.cvsignore deleted file mode 100644 index d0fe629..0000000 --- a/src/WINNT/afssvrcpa/lang/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -AFS_component_version_number.h - diff --git a/src/WINNT/afsusrmgr/.cvsignore b/src/WINNT/afsusrmgr/.cvsignore deleted file mode 100644 index d0fe629..0000000 --- a/src/WINNT/afsusrmgr/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -AFS_component_version_number.h - diff --git a/src/WINNT/afsusrmgr/lang/.cvsignore b/src/WINNT/afsusrmgr/lang/.cvsignore deleted file mode 100644 index 9e6d7b8..0000000 --- a/src/WINNT/afsusrmgr/lang/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -AFS_component_version_number.h diff --git a/src/WINNT/aklog/.cvsignore b/src/WINNT/aklog/.cvsignore deleted file mode 100644 index 9e6d7b8..0000000 --- a/src/WINNT/aklog/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -AFS_component_version_number.h diff --git a/src/WINNT/bosctlsvc/.cvsignore b/src/WINNT/bosctlsvc/.cvsignore deleted file mode 100644 index 9e6d7b8..0000000 --- a/src/WINNT/bosctlsvc/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -AFS_component_version_number.h diff --git a/src/WINNT/client_config/.cvsignore b/src/WINNT/client_config/.cvsignore deleted file mode 100644 index 9e6d7b8..0000000 --- a/src/WINNT/client_config/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -AFS_component_version_number.h diff --git a/src/WINNT/client_config/lang/.cvsignore b/src/WINNT/client_config/lang/.cvsignore deleted file mode 100644 index 9e6d7b8..0000000 --- a/src/WINNT/client_config/lang/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -AFS_component_version_number.h diff --git a/src/WINNT/client_cpa/.cvsignore b/src/WINNT/client_cpa/.cvsignore deleted file mode 100644 index 2a4923c..0000000 --- a/src/WINNT/client_cpa/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -AFS_component_version_number.c -AFS_component_version_number.h diff --git a/src/WINNT/client_cpa/lang/.cvsignore b/src/WINNT/client_cpa/lang/.cvsignore deleted file mode 100644 index 9e6d7b8..0000000 --- a/src/WINNT/client_cpa/lang/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -AFS_component_version_number.h diff --git a/src/afs/.cvsignore b/src/afs/.cvsignore deleted file mode 100644 index fb596ce..0000000 --- a/src/afs/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -AFS_component_version_number.c -Makefile -afs_trace.h -afs_trace.msf -afszcm.cat -unified_afs.c -unified_afs.h diff --git a/src/afs/AIX/osi_config.c b/src/afs/AIX/osi_config.c index ee9e87e..7c42a58 100644 --- a/src/afs/AIX/osi_config.c +++ b/src/afs/AIX/osi_config.c @@ -36,8 +36,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "sys/limits.h" #include "sys/types.h" diff --git a/src/afs/AIX/osi_file.c b/src/afs/AIX/osi_file.c index 7f5e60c..1c7c941 100644 --- a/src/afs/AIX/osi_file.c +++ b/src/afs/AIX/osi_file.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/AIX/osi_groups.c b/src/afs/AIX/osi_groups.c index 358b796..2ef317f 100644 --- a/src/afs/AIX/osi_groups.c +++ b/src/afs/AIX/osi_groups.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afsincludes.h" diff --git a/src/afs/AIX/osi_inode.c b/src/afs/AIX/osi_inode.c index e8a4cbb..b1a2c33 100644 --- a/src/afs/AIX/osi_inode.c +++ b/src/afs/AIX/osi_inode.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/AIX/osi_machdep.h b/src/afs/AIX/osi_machdep.h index 9033fd1..a1658db 100644 --- a/src/afs/AIX/osi_machdep.h +++ b/src/afs/AIX/osi_machdep.h @@ -41,6 +41,10 @@ extern long time; #define gop_lookupname(fnamep,segflg,followlink,compvpp) \ lookupvp((fnamep), (followlink), (compvpp), &afs_osi_cred) +#undef gop_lookupname_user +#define gop_lookupname_user(fnamep,segflg,followlink,compvpp) \ + lookupvp((fnamep), (followlink), (compvpp), &afs_osi_cred) + #undef afs_suser #undef setuerror diff --git a/src/afs/AIX/osi_misc.c b/src/afs/AIX/osi_misc.c index 2d25c5f..9961d02 100644 --- a/src/afs/AIX/osi_misc.c +++ b/src/afs/AIX/osi_misc.c @@ -19,8 +19,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "h/systm.h" #include "h/types.h" diff --git a/src/afs/AIX/osi_sleep.c b/src/afs/AIX/osi_sleep.c index fe49380..33e6505 100644 --- a/src/afs/AIX/osi_sleep.c +++ b/src/afs/AIX/osi_sleep.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/AIX/osi_timeout.c b/src/afs/AIX/osi_timeout.c index 6f9f588..64ef235 100644 --- a/src/afs/AIX/osi_timeout.c +++ b/src/afs/AIX/osi_timeout.c @@ -15,8 +15,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/AIX/osi_vfsops.c b/src/afs/AIX/osi_vfsops.c index 9c51c67..a4e87f1 100644 --- a/src/afs/AIX/osi_vfsops.c +++ b/src/afs/AIX/osi_vfsops.c @@ -13,8 +13,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/AIX/osi_vm.c b/src/afs/AIX/osi_vm.c index 336db19..6751b08 100644 --- a/src/afs/AIX/osi_vm.c +++ b/src/afs/AIX/osi_vm.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/AIX/osi_vnodeops.c b/src/afs/AIX/osi_vnodeops.c index 33958e6..165a7ba 100644 --- a/src/afs/AIX/osi_vnodeops.c +++ b/src/afs/AIX/osi_vnodeops.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "h/systm.h" #include "h/types.h" diff --git a/src/afs/DARWIN/osi_file.c b/src/afs/DARWIN/osi_file.c index d0f2f19..7c1667a 100644 --- a/src/afs/DARWIN/osi_file.c +++ b/src/afs/DARWIN/osi_file.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/DARWIN/osi_groups.c b/src/afs/DARWIN/osi_groups.c index 0542c27..11e65e3 100644 --- a/src/afs/DARWIN/osi_groups.c +++ b/src/afs/DARWIN/osi_groups.c @@ -16,9 +16,10 @@ */ #include #include "afs/param.h" +#include "afs/sysincludes.h" +#include "afsincludes.h" +#include "afs/afs_stats.h" /* statistics */ -RCSID - ("$Header$"); /* We should be doing something better anyway */ #ifdef AFS_DARWIN80_ENV int @@ -29,12 +30,9 @@ setpag(proc, cred, pagvalue, newpag, change_parent) afs_uint32 *newpag; afs_uint32 change_parent; { - return -1; + return EINVAL; } #else -#include "afs/sysincludes.h" -#include "afsincludes.h" -#include "afs/afs_stats.h" /* statistics */ static int afs_getgroups(struct ucred *cred, int ngroups, gid_t * gidset); diff --git a/src/afs/DARWIN/osi_inode.c b/src/afs/DARWIN/osi_inode.c index ddecc6c..6995bc6 100644 --- a/src/afs/DARWIN/osi_inode.c +++ b/src/afs/DARWIN/osi_inode.c @@ -15,8 +15,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/DARWIN/osi_machdep.h b/src/afs/DARWIN/osi_machdep.h index fc13ade..d13760c 100644 --- a/src/afs/DARWIN/osi_machdep.h +++ b/src/afs/DARWIN/osi_machdep.h @@ -57,6 +57,8 @@ typedef unsigned short etap_event_t; #endif #undef gop_lookupname #define gop_lookupname osi_lookupname +#undef gop_lookupname_user +#define gop_lookupname_user osi_lookupname_user #define FTRUNC 0 @@ -101,9 +103,17 @@ enum vcexcl { EXCL, NONEXCL }; #define crref kauth_cred_get_with_ref #define crhold kauth_cred_ref +#ifdef AFS_DARWIN100_ENV +#define crfree(X) kauth_cred_unref(&X) +#else #define crfree kauth_cred_rele +#endif #define crdup kauth_cred_dup - +#ifdef AFS_DARWIN100_ENV +#define ubc_msync_range(X,Y,Z,A) ubc_msync(X,Y,Z,NULL,A) +#else +#define ubc_msync_range(X,Y,Z,A) ubc_sync_range(X,Y,Z,A) +#endif extern vfs_context_t afs_osi_ctxtp; extern int afs_osi_ctxtp_initialized; #endif diff --git a/src/afs/DARWIN/osi_misc.c b/src/afs/DARWIN/osi_misc.c index 42f2eac..076d567 100644 --- a/src/afs/DARWIN/osi_misc.c +++ b/src/afs/DARWIN/osi_misc.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afsincludes.h" @@ -23,19 +21,28 @@ RCSID #ifdef AFS_DARWIN80_ENV int -osi_lookupname(char *aname, enum uio_seg seg, int followlink, - struct vnode **vpp) { - vfs_context_t ctx; +osi_lookupname_user(user_addr_t aname, enum uio_seg seg, int followlink, + struct vnode **vpp) { char tname[PATHBUFLEN]; - int code, flags; size_t len; - + int code; + if (seg == AFS_UIOUSER) { /* XXX 64bit */ AFS_COPYINSTR(aname, tname, sizeof(tname), &len, code); if (code) return code; - aname=tname; - } + return osi_lookupname(tname, seg, followlink, vpp); + } else + return osi_lookupname(CAST_DOWN(char *, aname), seg, followlink, vpp); + +} + +int +osi_lookupname(char *aname, enum uio_seg seg, int followlink, + struct vnode **vpp) { + vfs_context_t ctx; + int code, flags; + flags = 0; if (!followlink) flags |= VNODE_LOOKUP_NOFOLLOW; @@ -96,139 +103,144 @@ afs_suser(void *credp) } #ifdef AFS_DARWIN80_ENV -uio_t afsio_darwin_partialcopy(uio_t auio, int size) { - uio_t res; - int i; - user_addr_t iovaddr; - user_size_t iovsize; - - if (proc_is64bit(current_proc())) { - res = uio_create(uio_iovcnt(auio), uio_offset(auio), - uio_isuserspace(auio) ? UIO_USERSPACE64 : UIO_SYSSPACE32, - uio_rw(auio)); - } else { - res = uio_create(uio_iovcnt(auio), uio_offset(auio), - uio_isuserspace(auio) ? UIO_USERSPACE32 : UIO_SYSSPACE32, - uio_rw(auio)); - } - - for (i = 0;i < uio_iovcnt(auio) && size > 0;i++) { - if (uio_getiov(auio, i, &iovaddr, &iovsize)) - break; - if (iovsize > size) - iovsize = size; - if (uio_addiov(res, iovaddr, iovsize)) - break; - size -= iovsize; - } - return res; +uio_t +afsio_darwin_partialcopy(uio_t auio, int size) +{ + uio_t res; + int i; + user_addr_t iovaddr; + user_size_t iovsize; + + if (proc_is64bit(current_proc())) { + res = uio_create(uio_iovcnt(auio), uio_offset(auio), + uio_isuserspace(auio) ? UIO_USERSPACE64 : UIO_SYSSPACE32, + uio_rw(auio)); + } else { + res = uio_create(uio_iovcnt(auio), uio_offset(auio), + uio_isuserspace(auio) ? UIO_USERSPACE32 : UIO_SYSSPACE32, + uio_rw(auio)); + } + + for (i = 0;i < uio_iovcnt(auio) && size > 0;i++) { + if (uio_getiov(auio, i, &iovaddr, &iovsize)) + break; + if (iovsize > size) + iovsize = size; + if (uio_addiov(res, iovaddr, iovsize)) + break; + size -= iovsize; + } + return res; } vfs_context_t afs_osi_ctxtp; int afs_osi_ctxtp_initialized; static thread_t vfs_context_owner; -#define RECURSIVE_VFS_CONTEXT 1 -#if RECURSIVE_VFS_CONTEXT static proc_t vfs_context_curproc; int vfs_context_ref; -#else -#define vfs_context_ref 1 -#endif -void get_vfs_context(void) { - int isglock = ISAFS_GLOCK(); - if (!isglock) - AFS_GLOCK(); - if (afs_osi_ctxtp_initialized) { - if (!isglock) - AFS_GUNLOCK(); - return; - } - osi_Assert(vfs_context_owner != current_thread()); -#if RECURSIVE_VFS_CONTEXT - if (afs_osi_ctxtp && current_proc() == vfs_context_curproc) { - vfs_context_ref++; - vfs_context_owner = current_thread(); - if (!isglock) - AFS_GUNLOCK(); - return; - } -#endif - while (afs_osi_ctxtp && vfs_context_ref) { - printf("[%d] waiting for afs_osi_ctxtp\n", proc_selfpid()); - afs_osi_Sleep(&afs_osi_ctxtp); - if (afs_osi_ctxtp_initialized) { - printf("[%d] ok\n", proc_selfpid()); - if (!isglock) - AFS_GUNLOCK(); - return; - } - if (!afs_osi_ctxtp || !vfs_context_ref) - printf("[%d] ok\n", proc_selfpid()); - } -#if RECURSIVE_VFS_CONTEXT - vfs_context_rele(afs_osi_ctxtp); - vfs_context_ref=1; -#else - osi_Assert(vfs_context_owner == (thread_t)0); -#endif - afs_osi_ctxtp = vfs_context_create(NULL); - vfs_context_owner = current_thread(); - vfs_context_curproc = current_proc(); - if (!isglock) - AFS_GUNLOCK(); +void +get_vfs_context(void) +{ + int isglock = ISAFS_GLOCK(); + + if (!isglock) + AFS_GLOCK(); + if (afs_osi_ctxtp_initialized) { + if (!isglock) + AFS_GUNLOCK(); + return; + } + osi_Assert(vfs_context_owner != current_thread()); + if (afs_osi_ctxtp && current_proc() == vfs_context_curproc) { + vfs_context_ref++; + vfs_context_owner = current_thread(); + if (!isglock) + AFS_GUNLOCK(); + return; + } + while (afs_osi_ctxtp && vfs_context_ref) { + afs_osi_Sleep(&afs_osi_ctxtp); + if (afs_osi_ctxtp_initialized) { + if (!isglock) + AFS_GUNLOCK(); + return; + } + } + vfs_context_rele(afs_osi_ctxtp); + vfs_context_ref=1; + afs_osi_ctxtp = vfs_context_create(NULL); + vfs_context_owner = current_thread(); + vfs_context_curproc = current_proc(); + if (!isglock) + AFS_GUNLOCK(); } -void put_vfs_context(void) { - int isglock = ISAFS_GLOCK(); - - if (!isglock) - AFS_GLOCK(); - if (afs_osi_ctxtp_initialized) { - if (!isglock) - AFS_GUNLOCK(); - return; - } -#if RECURSIVE_VFS_CONTEXT - if (vfs_context_owner == current_thread()) - vfs_context_owner = (thread_t)0; - vfs_context_ref--; -#else - osi_Assert(vfs_context_owner == current_thread()); - vfs_context_rele(afs_osi_ctxtp); - afs_osi_ctxtp = NULL; - vfs_context_owner = (thread_t)0; -#endif - afs_osi_Wakeup(&afs_osi_ctxtp); - if (!isglock) +void +put_vfs_context(void) +{ + int isglock = ISAFS_GLOCK(); + + if (!isglock) + AFS_GLOCK(); + if (afs_osi_ctxtp_initialized) { + if (!isglock) + AFS_GUNLOCK(); + return; + } + if (vfs_context_owner == current_thread()) + vfs_context_owner = (thread_t)0; + vfs_context_ref--; + afs_osi_Wakeup(&afs_osi_ctxtp); + if (!isglock) AFS_GUNLOCK(); } -extern int afs3_syscall(); - -int afs_cdev_nop_openclose(dev_t dev, int flags, int devtype,struct proc *p) { - return 0; +int +afs_cdev_nop_openclose(dev_t dev, int flags, int devtype,struct proc *p) +{ + return 0; } -extern int afs3_syscall(struct proc *p, void *data, unsigned long *retval); + +extern int afs3_syscall(struct proc *p, void *data, unsigned int *retval); int afs_cdev_ioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct proc *p) { - unsigned long retval=0; - int code; - struct afssysargs *a = (struct afssysargs *)data; - if (proc_is64bit(p)) - return EINVAL; - - if (cmd != VIOC_SYSCALL) { - return EINVAL; - } - - code=afs3_syscall(p, data, &retval); - if (code) - return code; - if (retval && a->syscall != AFSCALL_CALL && a->param1 != AFSOP_CACHEINODE) { printf("SSCall(%d,%d) is returning non-error value %d\n", a->syscall, a->param1, retval); } - a->retval = retval; - return 0; + unsigned int retval=0; + int code, is64 = proc_is64bit(p); + struct afssysargs *a = (struct afssysargs *)data; + struct afssysargs64 *a64 = (struct afssysargs64 *)data; + + if (((unsigned int)cmd != VIOC_SYSCALL) && + ((unsigned int)cmd != VIOC_SYSCALL64)) + return EINVAL; + + if (((unsigned int)cmd == VIOC_SYSCALL64) && (is64 == 0)) + return EINVAL; + + if (((unsigned int)cmd == VIOC_SYSCALL) && (is64 != 0)) + return EINVAL; + + code=afs3_syscall(p, data, &retval); + if (code) + return code; + + if ((!is64) && retval && a->syscall != AFSCALL_CALL + && a->param1 != AFSOP_CACHEINODE) + { + printf("SSCall(%d,%d) is returning non-error value %d\n", a->syscall, a->param1, retval); + } + if ((is64) && retval && a64->syscall != AFSCALL_CALL + && a64->param1 != AFSOP_CACHEINODE) + { + printf("SSCall(%d,%llx) is returning non-error value %d\n", a64->syscall, a64->param1, retval); + } + + if (!is64) + a->retval = retval; + else + a64->retval = retval; + return 0; } #endif diff --git a/src/afs/DARWIN/osi_module.c b/src/afs/DARWIN/osi_module.c index 06a7c5a..5991b06 100644 --- a/src/afs/DARWIN/osi_module.c +++ b/src/afs/DARWIN/osi_module.c @@ -1,8 +1,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afsincludes.h" @@ -48,15 +46,18 @@ afs_modload(struct kmod_info *ki, void *data) { osi_Init(); #ifdef AFS_DARWIN80_ENV + MUTEX_SETUP(); + afs_global_lock = lck_mtx_alloc_init(openafs_lck_grp, 0); memset(&afs_vfsentry, 0, sizeof(struct vfs_fsentry)); strcpy(afs_vfsentry.vfe_fsname, "afs"); afs_vfsentry.vfe_vfsops = &afs_vfsops; afs_vfsentry.vfe_vopcnt = 2; afs_vfsentry.vfe_opvdescs = afs_vnodeop_opv_desc_list; - /* We may be 64bit ready too (VFS_TBL64BITREADY) */ - afs_vfsentry.vfe_flags = VFS_TBLTHREADSAFE|VFS_TBLNOTYPENUM; + afs_vfsentry.vfe_flags = VFS_TBLTHREADSAFE|VFS_TBLNOTYPENUM|VFS_TBL64BITREADY; if (vfs_fsadd(&afs_vfsentry, &afs_vfstable)) { printf("AFS: vfs_fsadd failed. aborting\n"); + MUTEX_FINISH(); + lck_mtx_free(afs_global_lock, openafs_lck_grp); return KERN_FAILURE; } afs_cdev.d_open = &afs_cdev_nop_openclose; @@ -66,6 +67,8 @@ afs_modload(struct kmod_info *ki, void *data) if (afs_cdev_major == -1) { printf("AFS: cdevsw_add failed. aborting\n"); vfs_fsremove(afs_vfstable); + MUTEX_FINISH(); + lck_mtx_free(afs_global_lock, openafs_lck_grp); return KERN_FAILURE; } afs_cdev_devfs_handle = devfs_make_node(makedev(afs_cdev_major, 0), @@ -96,10 +99,6 @@ afs_modload(struct kmod_info *ki, void *data) sysent[AFS_SYSCALL].sy_funnel = KERNEL_FUNNEL; #endif #endif -#ifdef AFS_DARWIN80_ENV - MUTEX_SETUP(); - afs_global_lock = lck_mtx_alloc_init(openafs_lck_grp, 0); -#endif return KERN_SUCCESS; } diff --git a/src/afs/DARWIN/osi_prototypes.h b/src/afs/DARWIN/osi_prototypes.h index a5a5ccd..4a9b6b2 100644 --- a/src/afs/DARWIN/osi_prototypes.h +++ b/src/afs/DARWIN/osi_prototypes.h @@ -20,6 +20,8 @@ extern afs_rwlock_t afs_xosi; /* osi_misc.c */ extern int osi_lookupname(char *aname, enum uio_seg seg, int followlink, struct vnode **vpp); +extern int osi_lookupname_user(user_addr_t aname, enum uio_seg seg, + int followlink, struct vnode **vpp); extern int afs_suser(void *credp); extern void get_vfs_context(void); extern void put_vfs_context(void); diff --git a/src/afs/DARWIN/osi_sleep.c b/src/afs/DARWIN/osi_sleep.c index 0495164..33e16c3 100644 --- a/src/afs/DARWIN/osi_sleep.c +++ b/src/afs/DARWIN/osi_sleep.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/DARWIN/osi_vfsops.c b/src/afs/DARWIN/osi_vfsops.c index 41bdd8b..d6d9073 100644 --- a/src/afs/DARWIN/osi_vfsops.c +++ b/src/afs/DARWIN/osi_vfsops.c @@ -4,8 +4,6 @@ #include #include -RCSID - ("$Header$"); #include /* Standard vendor system headers */ #include /* Afs-based standard headers */ diff --git a/src/afs/DARWIN/osi_vm.c b/src/afs/DARWIN/osi_vm.c index ed845d1..15a3e3f 100644 --- a/src/afs/DARWIN/osi_vm.c +++ b/src/afs/DARWIN/osi_vm.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ @@ -69,7 +67,7 @@ osi_VM_StoreAllSegments(struct vcache *avc) ReleaseWriteLock(&avc->lock); AFS_GUNLOCK(); #ifdef AFS_DARWIN80_ENV - ubc_sync_range(vp, 0, ubc_getsize(vp), UBC_SYNC|UBC_PUSHDIRTY); + ubc_msync_range(vp, 0, ubc_getsize(vp), UBC_SYNC|UBC_PUSHDIRTY); #else if (UBCINFOEXISTS(vp)) { ubc_pushdirty(vp); @@ -99,7 +97,7 @@ osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) ReleaseWriteLock(&avc->lock); AFS_GUNLOCK(); #ifdef AFS_DARWIN80_ENV - ubc_sync_range(vp, 0, ubc_getsize(vp), UBC_INVALIDATE); + ubc_msync_range(vp, 0, ubc_getsize(vp), UBC_INVALIDATE); #else if (UBCINFOEXISTS(vp)) { size = ubc_getsize(vp); @@ -128,7 +126,7 @@ osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) off_t size; #ifdef AFS_DARWIN80_ENV size = ubc_getsize(vp); - ubc_sync_range(vp, 0, size, UBC_INVALIDATE); + ubc_msync_range(vp, 0, size, UBC_INVALIDATE); /* XXX what about when not CStatd */ if (avc->states & CStatd && size != avc->m.Length) ubc_setsize(vp, avc->m.Length); diff --git a/src/afs/DARWIN/osi_vnodeops.c b/src/afs/DARWIN/osi_vnodeops.c index 88d6527..2c96d7d 100644 --- a/src/afs/DARWIN/osi_vnodeops.c +++ b/src/afs/DARWIN/osi_vnodeops.c @@ -4,8 +4,6 @@ #include #include -RCSID - ("$Header$"); #include /* Standard vendor system headers */ #include /* Afs-based standard headers */ @@ -747,7 +745,7 @@ afs_vop_read(ap) if (vnode_isdir(ap->a_vp)) return EISDIR; #ifdef AFS_DARWIN80_ENV - ubc_sync_range(ap->a_vp, AFS_UIO_OFFSET(ap->a_uio), AFS_UIO_OFFSET(ap->a_uio) + AFS_UIO_RESID(ap->a_uio), UBC_PUSHDIRTY); + ubc_msync_range(ap->a_vp, AFS_UIO_OFFSET(ap->a_uio), AFS_UIO_OFFSET(ap->a_uio) + AFS_UIO_RESID(ap->a_uio), UBC_PUSHDIRTY); #else if (UBCINFOEXISTS(ap->a_vp)) { ubc_clean(ap->a_vp, 0); @@ -888,7 +886,7 @@ afs_vop_write(ap) struct vcache *avc = VTOAFS(ap->a_vp); void *object; #ifdef AFS_DARWIN80_ENV - ubc_sync_range(ap->a_vp, AFS_UIO_OFFSET(ap->a_uio), AFS_UIO_OFFSET(ap->a_uio) + AFS_UIO_RESID(ap->a_uio), UBC_INVALIDATE); + ubc_msync_range(ap->a_vp, AFS_UIO_OFFSET(ap->a_uio), AFS_UIO_OFFSET(ap->a_uio) + AFS_UIO_RESID(ap->a_uio), UBC_INVALIDATE); #else if (UBCINFOEXISTS(ap->a_vp)) { ubc_clean(ap->a_vp, 1); @@ -1097,7 +1095,7 @@ afs_vop_ioctl(ap) if (((ap->a_command >> 8) & 0xff) == 'V') { /* This is a VICEIOCTL call */ AFS_GLOCK(); - error = HandleIoctl(tvc, (struct file *)0 /*Not used */ , + error = HandleIoctl(tvc, ap->a_command, ap->a_data); AFS_GUNLOCK(); return (error); diff --git a/src/afs/DUX/osi_file.c b/src/afs/DUX/osi_file.c index 87a34cc..fa0ac1d 100644 --- a/src/afs/DUX/osi_file.c +++ b/src/afs/DUX/osi_file.c @@ -10,9 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); - #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ #include "afs/afs_stats.h" /* afs statistics */ diff --git a/src/afs/DUX/osi_groups.c b/src/afs/DUX/osi_groups.c index daed60c..df782f9 100644 --- a/src/afs/DUX/osi_groups.c +++ b/src/afs/DUX/osi_groups.c @@ -16,9 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); - #include "afs/sysincludes.h" #include "afsincludes.h" #include "afs/afs_stats.h" /* statistics */ diff --git a/src/afs/DUX/osi_inode.c b/src/afs/DUX/osi_inode.c index daab167..e342d6e 100644 --- a/src/afs/DUX/osi_inode.c +++ b/src/afs/DUX/osi_inode.c @@ -16,9 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); - #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ #include "afs/osi_inode.h" diff --git a/src/afs/DUX/osi_misc.c b/src/afs/DUX/osi_misc.c index 27f2b6b..69ac878 100644 --- a/src/afs/DUX/osi_misc.c +++ b/src/afs/DUX/osi_misc.c @@ -15,9 +15,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); - #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/DUX/osi_sleep.c b/src/afs/DUX/osi_sleep.c index 12fa802..ba62c7e 100644 --- a/src/afs/DUX/osi_sleep.c +++ b/src/afs/DUX/osi_sleep.c @@ -10,9 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); - #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ #include "afs/afs_stats.h" /* afs statistics */ diff --git a/src/afs/DUX/osi_vfsops.c b/src/afs/DUX/osi_vfsops.c index a70d2c9..0c8c4c1 100644 --- a/src/afs/DUX/osi_vfsops.c +++ b/src/afs/DUX/osi_vfsops.c @@ -13,9 +13,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); - #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ #include "afs/afs_stats.h" /* statistics stuff */ diff --git a/src/afs/DUX/osi_vm.c b/src/afs/DUX/osi_vm.c index 853d5e6..0020230 100644 --- a/src/afs/DUX/osi_vm.c +++ b/src/afs/DUX/osi_vm.c @@ -10,9 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); - #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ #include "afs/afs_stats.h" /* statistics */ diff --git a/src/afs/DUX/osi_vnodeops.c b/src/afs/DUX/osi_vnodeops.c index 988c23f..5730e86 100644 --- a/src/afs/DUX/osi_vnodeops.c +++ b/src/afs/DUX/osi_vnodeops.c @@ -14,10 +14,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); - - #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ #include "afs/afs_stats.h" /* statistics */ diff --git a/src/afs/FBSD/osi_file.c b/src/afs/FBSD/osi_file.c index 662e4b0..feea44d 100644 --- a/src/afs/FBSD/osi_file.c +++ b/src/afs/FBSD/osi_file.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/FBSD/osi_groups.c b/src/afs/FBSD/osi_groups.c index 6c6db9e..2ed4069 100644 --- a/src/afs/FBSD/osi_groups.c +++ b/src/afs/FBSD/osi_groups.c @@ -21,8 +21,6 @@ #include #endif -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afsincludes.h" diff --git a/src/afs/FBSD/osi_inode.c b/src/afs/FBSD/osi_inode.c index 6894829..764867a 100644 --- a/src/afs/FBSD/osi_inode.c +++ b/src/afs/FBSD/osi_inode.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/FBSD/osi_machdep.h b/src/afs/FBSD/osi_machdep.h index bd305cf..95ec9d2 100644 --- a/src/afs/FBSD/osi_machdep.h +++ b/src/afs/FBSD/osi_machdep.h @@ -50,6 +50,9 @@ #undef gop_lookupname #define gop_lookupname osi_lookupname +#undef gop_lookupname_user +#define gop_lookupname osi_lookupname_user + #undef afs_suser #define afs_strcat(s1, s2) strcat((s1), (s2)) diff --git a/src/afs/FBSD/osi_misc.c b/src/afs/FBSD/osi_misc.c index 3f930de..2b6ac48 100644 --- a/src/afs/FBSD/osi_misc.c +++ b/src/afs/FBSD/osi_misc.c @@ -17,8 +17,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/FBSD/osi_module.c b/src/afs/FBSD/osi_module.c index 9b22d20..098a0a9 100644 --- a/src/afs/FBSD/osi_module.c +++ b/src/afs/FBSD/osi_module.c @@ -11,8 +11,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/afs/FBSD/osi_sleep.c b/src/afs/FBSD/osi_sleep.c index b42e75d..466e280 100644 --- a/src/afs/FBSD/osi_sleep.c +++ b/src/afs/FBSD/osi_sleep.c @@ -11,8 +11,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/FBSD/osi_vfsops.c b/src/afs/FBSD/osi_vfsops.c index 1765054..bbd3638 100644 --- a/src/afs/FBSD/osi_vfsops.c +++ b/src/afs/FBSD/osi_vfsops.c @@ -1,8 +1,6 @@ #include #include -RCSID - ("$Header$"); #include /* Standard vendor system headers */ #include /* Afs-based standard headers */ diff --git a/src/afs/FBSD/osi_vm.c b/src/afs/FBSD/osi_vm.c index 5103891..0ac8500 100644 --- a/src/afs/FBSD/osi_vm.c +++ b/src/afs/FBSD/osi_vm.c @@ -27,8 +27,6 @@ vgonel(struct vnode *vp, struct thread *td); #endif -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c index cf65d50..dcf76d3 100644 --- a/src/afs/FBSD/osi_vnodeops.c +++ b/src/afs/FBSD/osi_vnodeops.c @@ -47,8 +47,6 @@ #include #include -RCSID - ("$Header$"); #include /* Standard vendor system headers */ #include /* Afs-based standard headers */ diff --git a/src/afs/HPUX/osi_debug.c b/src/afs/HPUX/osi_debug.c index 12d86df..ed0f159 100644 --- a/src/afs/HPUX/osi_debug.c +++ b/src/afs/HPUX/osi_debug.c @@ -10,8 +10,6 @@ #include #include "param.h" -RCSID - ("$Header$"); #include "sysincludes.h" #include "afsincludes.h" diff --git a/src/afs/HPUX/osi_file.c b/src/afs/HPUX/osi_file.c index 96365ab..51689d7 100644 --- a/src/afs/HPUX/osi_file.c +++ b/src/afs/HPUX/osi_file.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/HPUX/osi_groups.c b/src/afs/HPUX/osi_groups.c index aec2f4e..3b70fc8 100644 --- a/src/afs/HPUX/osi_groups.c +++ b/src/afs/HPUX/osi_groups.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afsincludes.h" diff --git a/src/afs/HPUX/osi_inode.c b/src/afs/HPUX/osi_inode.c index 868e2bc..7716db0 100644 --- a/src/afs/HPUX/osi_inode.c +++ b/src/afs/HPUX/osi_inode.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/HPUX/osi_machdep.h b/src/afs/HPUX/osi_machdep.h index 36d73d1..e8d1544 100644 --- a/src/afs/HPUX/osi_machdep.h +++ b/src/afs/HPUX/osi_machdep.h @@ -32,6 +32,8 @@ extern struct timeval time; vn_rdwr((rw),(gp),(base),(len),(offset),(segflg),(unit),(aresid),0) #define gop_lookupname(fnamep,segflg,followlink,compvpp) \ lookupname((fnamep),(segflg),(followlink),NULL,(compvpp)) +#define gop_lookupname_user(fnamep,segflg,followlink,compvpp) \ + lookupname((fnamep),(segflg),(followlink),NULL,(compvpp)) #undef afs_suser diff --git a/src/afs/HPUX/osi_misc.c b/src/afs/HPUX/osi_misc.c index e658a1a..c80bf6a 100644 --- a/src/afs/HPUX/osi_misc.c +++ b/src/afs/HPUX/osi_misc.c @@ -15,8 +15,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/HPUX/osi_sleep.c b/src/afs/HPUX/osi_sleep.c index de72e84..2b12b4d 100644 --- a/src/afs/HPUX/osi_sleep.c +++ b/src/afs/HPUX/osi_sleep.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/HPUX/osi_vfsops.c b/src/afs/HPUX/osi_vfsops.c index 4a7b739..53f9226 100644 --- a/src/afs/HPUX/osi_vfsops.c +++ b/src/afs/HPUX/osi_vfsops.c @@ -13,8 +13,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/HPUX/osi_vm.c b/src/afs/HPUX/osi_vm.c index 17f2e7a..bf31f1a 100644 --- a/src/afs/HPUX/osi_vm.c +++ b/src/afs/HPUX/osi_vm.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/HPUX/osi_vnodeops.c b/src/afs/HPUX/osi_vnodeops.c index 063818a..ad3e63b 100644 --- a/src/afs/HPUX/osi_vnodeops.c +++ b/src/afs/HPUX/osi_vnodeops.c @@ -12,8 +12,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/IRIX/osi_file.c b/src/afs/IRIX/osi_file.c index 988864c..686bda8 100644 --- a/src/afs/IRIX/osi_file.c +++ b/src/afs/IRIX/osi_file.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/IRIX/osi_groups.c b/src/afs/IRIX/osi_groups.c index 6b6cc80..b2ee069 100644 --- a/src/afs/IRIX/osi_groups.c +++ b/src/afs/IRIX/osi_groups.c @@ -18,8 +18,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afsincludes.h" diff --git a/src/afs/IRIX/osi_idbg.c b/src/afs/IRIX/osi_idbg.c index 03f0ed7..e03c0ff 100644 --- a/src/afs/IRIX/osi_idbg.c +++ b/src/afs/IRIX/osi_idbg.c @@ -13,8 +13,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #ifdef AFS_SGI62_ENV #include "afs/sysincludes.h" /* Standard vendor system headers */ diff --git a/src/afs/IRIX/osi_inode.c b/src/afs/IRIX/osi_inode.c index 62f9825..d60ba8b 100644 --- a/src/afs/IRIX/osi_inode.c +++ b/src/afs/IRIX/osi_inode.c @@ -42,8 +42,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/IRIX/osi_machdep.h b/src/afs/IRIX/osi_machdep.h index 196a7ac..3cc7f79 100644 --- a/src/afs/IRIX/osi_machdep.h +++ b/src/afs/IRIX/osi_machdep.h @@ -32,6 +32,9 @@ extern time_t time; #undef gop_lookupname #define gop_lookupname(fnamep,segflg,followlink,compvpp) lookupname((fnamep),(segflg),(followlink),NULL,(compvpp), NULL) +#undef gop_lookupname_user +#define gop_lookupname_user(fnamep,segflg,followlink,compvpp) lookupname((fnamep),(segflg),(followlink),NULL,(compvpp), NULL) + #define osi_vnhold(avc, r) do { VN_HOLD(AFSTOV(avc)); } while(0) #undef afs_osi_Alloc_NoSleep diff --git a/src/afs/IRIX/osi_misc.c b/src/afs/IRIX/osi_misc.c index 636137a..fb65c48 100644 --- a/src/afs/IRIX/osi_misc.c +++ b/src/afs/IRIX/osi_misc.c @@ -13,8 +13,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #ifdef AFS_SGI62_ENV #include "afs/sysincludes.h" /* Standard vendor system headers */ diff --git a/src/afs/IRIX/osi_sleep.c b/src/afs/IRIX/osi_sleep.c index d698235..9795ab4 100644 --- a/src/afs/IRIX/osi_sleep.c +++ b/src/afs/IRIX/osi_sleep.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/IRIX/osi_vfsops.c b/src/afs/IRIX/osi_vfsops.c index ddab234..4afa1a2 100644 --- a/src/afs/IRIX/osi_vfsops.c +++ b/src/afs/IRIX/osi_vfsops.c @@ -13,8 +13,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/IRIX/osi_vm.c b/src/afs/IRIX/osi_vm.c index 93a29ab..28d66a6 100644 --- a/src/afs/IRIX/osi_vm.c +++ b/src/afs/IRIX/osi_vm.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/IRIX/osi_vnodeops.c b/src/afs/IRIX/osi_vnodeops.c index c6a0b7f..469d68b 100644 --- a/src/afs/IRIX/osi_vnodeops.c +++ b/src/afs/IRIX/osi_vnodeops.c @@ -13,8 +13,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #ifdef AFS_SGI62_ENV #include "afs/sysincludes.h" /* Standard vendor system headers */ diff --git a/src/afs/LINUX/.cvsignore b/src/afs/LINUX/.cvsignore deleted file mode 100644 index a17ac6d..0000000 --- a/src/afs/LINUX/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -osi_vfs.h diff --git a/src/afs/LINUX/osi_alloc.c b/src/afs/LINUX/osi_alloc.c index 95ed5e5..ae88453 100644 --- a/src/afs/LINUX/osi_alloc.c +++ b/src/afs/LINUX/osi_alloc.c @@ -14,8 +14,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afsincludes.h" diff --git a/src/afs/LINUX/osi_cred.c b/src/afs/LINUX/osi_cred.c index 8642a9f..e228e27 100644 --- a/src/afs/LINUX/osi_cred.c +++ b/src/afs/LINUX/osi_cred.c @@ -14,8 +14,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afsincludes.h" diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c index 141fad0..f441c49 100644 --- a/src/afs/LINUX/osi_file.c +++ b/src/afs/LINUX/osi_file.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #ifdef AFS_LINUX24_ENV #include "h/module.h" /* early to avoid printf->printk mapping */ diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c index 94126b0..d5ef035 100644 --- a/src/afs/LINUX/osi_groups.c +++ b/src/afs/LINUX/osi_groups.c @@ -19,8 +19,6 @@ #include #endif -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afsincludes.h" diff --git a/src/afs/LINUX/osi_inode.c b/src/afs/LINUX/osi_inode.c index 36d4c2a..9066154 100644 --- a/src/afs/LINUX/osi_inode.c +++ b/src/afs/LINUX/osi_inode.c @@ -20,8 +20,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h index 11e7030..c43a57d 100644 --- a/src/afs/LINUX/osi_machdep.h +++ b/src/afs/LINUX/osi_machdep.h @@ -103,6 +103,9 @@ static inline time_t osi_Time(void) { #undef gop_lookupname #define gop_lookupname osi_lookupname +#undef gop_lookupname_user +#define gop_lookupname_user osi_lookupname + #define osi_vnhold(V, N) do { VN_HOLD(AFSTOV(V)); } while (0) #define VN_HOLD(V) osi_Assert(igrab((V)) == (V)) #define VN_RELE(V) iput((V)) diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c index 417bffa..77c6bc6 100644 --- a/src/afs/LINUX/osi_misc.c +++ b/src/afs/LINUX/osi_misc.c @@ -14,8 +14,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afsincludes.h" @@ -66,9 +64,10 @@ osi_lookupname_internal(char *aname, int followlink, struct vfsmount **mnt, } return code; } + int osi_lookupname(char *aname, uio_seg_t seg, int followlink, - struct dentry **dpp) + struct dentry **dpp) { int code; char *tname; diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c index 7807b66..ed9be8a 100644 --- a/src/afs/LINUX/osi_module.c +++ b/src/afs/LINUX/osi_module.c @@ -14,8 +14,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include /* early to avoid printf->printk mapping */ #include "afs/sysincludes.h" diff --git a/src/afs/LINUX/osi_sleep.c b/src/afs/LINUX/osi_sleep.c index ed81e51..433c82b 100644 --- a/src/afs/LINUX/osi_sleep.c +++ b/src/afs/LINUX/osi_sleep.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/LINUX/osi_syscall.c b/src/afs/LINUX/osi_syscall.c index 4b36b76..b2ec048 100644 --- a/src/afs/LINUX/osi_syscall.c +++ b/src/afs/LINUX/osi_syscall.c @@ -14,8 +14,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #ifdef AFS_LINUX24_ENV #include /* early to avoid printf->printk mapping */ diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c index e8e8986..ff408e9 100644 --- a/src/afs/LINUX/osi_vfsops.c +++ b/src/afs/LINUX/osi_vfsops.c @@ -15,8 +15,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #define __NO_VERSION__ /* don't define kernel_version in module.h */ #include /* early to avoid printf->printk mapping */ diff --git a/src/afs/LINUX/osi_vm.c b/src/afs/LINUX/osi_vm.c index 4745b38..de1c9dd 100644 --- a/src/afs/LINUX/osi_vm.c +++ b/src/afs/LINUX/osi_vm.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c index 97670ba..0283c06 100644 --- a/src/afs/LINUX/osi_vnodeops.c +++ b/src/afs/LINUX/osi_vnodeops.c @@ -21,8 +21,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afsincludes.h" diff --git a/src/afs/NBSD/osi_file.c b/src/afs/NBSD/osi_file.c index 7f6a004..91e3cf9 100644 --- a/src/afs/NBSD/osi_file.c +++ b/src/afs/NBSD/osi_file.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/NBSD/osi_groups.c b/src/afs/NBSD/osi_groups.c index ac0d24c..00d3b24 100644 --- a/src/afs/NBSD/osi_groups.c +++ b/src/afs/NBSD/osi_groups.c @@ -18,8 +18,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afsincludes.h" diff --git a/src/afs/NBSD/osi_inode.c b/src/afs/NBSD/osi_inode.c index 04e6c7e..5bc3334 100644 --- a/src/afs/NBSD/osi_inode.c +++ b/src/afs/NBSD/osi_inode.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/NBSD/osi_machdep.h b/src/afs/NBSD/osi_machdep.h index f513d81..2ba9c45 100644 --- a/src/afs/NBSD/osi_machdep.h +++ b/src/afs/NBSD/osi_machdep.h @@ -39,6 +39,8 @@ extern struct timeval time; #undef gop_lookupname #define gop_lookupname(fnamep,segflg,followlink,compvpp) lookupname((fnamep),(segflg),(followlink),NULL,(compvpp)) +#undef gop_lookupname_user +#define gop_lookupname_user(fnamep,segflg,followlink,compvpp) lookupname((fnamep),(segflg),(followlink),NULL,(compvpp)) #define osi_vnhold(avc,r) do { \ if ((avc)->vrefCount) { VN_HOLD((struct vnode *)(avc)); } \ diff --git a/src/afs/NBSD/osi_misc.c b/src/afs/NBSD/osi_misc.c index e813156..150e08d 100644 --- a/src/afs/NBSD/osi_misc.c +++ b/src/afs/NBSD/osi_misc.c @@ -17,8 +17,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/NBSD/osi_sleep.c b/src/afs/NBSD/osi_sleep.c index 0ee5678..71cf225 100644 --- a/src/afs/NBSD/osi_sleep.c +++ b/src/afs/NBSD/osi_sleep.c @@ -11,8 +11,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/NBSD/osi_vfsops.c b/src/afs/NBSD/osi_vfsops.c index 4bb0b3c..9aba1c1 100644 --- a/src/afs/NBSD/osi_vfsops.c +++ b/src/afs/NBSD/osi_vfsops.c @@ -13,8 +13,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/NBSD/osi_vm.c b/src/afs/NBSD/osi_vm.c index 7935ab8..e9fb228 100644 --- a/src/afs/NBSD/osi_vm.c +++ b/src/afs/NBSD/osi_vm.c @@ -21,8 +21,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/NBSD/osi_vnodeops.c b/src/afs/NBSD/osi_vnodeops.c index a5bd347..942122a 100644 --- a/src/afs/NBSD/osi_vnodeops.c +++ b/src/afs/NBSD/osi_vnodeops.c @@ -14,8 +14,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ diff --git a/src/afs/OBSD/osi_file.c b/src/afs/OBSD/osi_file.c index 39328be..546efe6 100644 --- a/src/afs/OBSD/osi_file.c +++ b/src/afs/OBSD/osi_file.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afs/afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/OBSD/osi_groups.c b/src/afs/OBSD/osi_groups.c index 5ccbf77..cb8e1d9 100644 --- a/src/afs/OBSD/osi_groups.c +++ b/src/afs/OBSD/osi_groups.c @@ -18,8 +18,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afs/afsincludes.h" diff --git a/src/afs/OBSD/osi_machdep.h b/src/afs/OBSD/osi_machdep.h index f50241f..29a8339 100644 --- a/src/afs/OBSD/osi_machdep.h +++ b/src/afs/OBSD/osi_machdep.h @@ -130,6 +130,10 @@ extern int afs_vget(); #define gop_lookupname(fnamep, segflg, followlink, compvpp) \ afs_nbsd_lookupname((fnamep), (segflg), (followlink), (compvpp)) +#undef gop_lookupname_user +#define gop_lookupname_user(fnamep, segflg, followlink, compvpp) \ + afs_nbsd_lookupname((fnamep), (segflg), (followlink), (compvpp)) + #ifdef AFS_OBSD39_ENV #define afs_osi_lockmgr(l, f, i, p) lockmgr((l), (f), (i)) #else diff --git a/src/afs/OBSD/osi_misc.c b/src/afs/OBSD/osi_misc.c index 4449ca4..5391103 100644 --- a/src/afs/OBSD/osi_misc.c +++ b/src/afs/OBSD/osi_misc.c @@ -46,8 +46,6 @@ such damages. #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afs/afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/OBSD/osi_sleep.c b/src/afs/OBSD/osi_sleep.c index a55fa7e..b362808 100644 --- a/src/afs/OBSD/osi_sleep.c +++ b/src/afs/OBSD/osi_sleep.c @@ -44,8 +44,6 @@ such damages. #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afs/afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/OBSD/osi_vfsops.c b/src/afs/OBSD/osi_vfsops.c index 8397662..6daaf5d 100644 --- a/src/afs/OBSD/osi_vfsops.c +++ b/src/afs/OBSD/osi_vfsops.c @@ -93,8 +93,6 @@ NONINFRINGEMENT. #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afs/afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/OBSD/osi_vm.c b/src/afs/OBSD/osi_vm.c index 6744b73..1c29032 100644 --- a/src/afs/OBSD/osi_vm.c +++ b/src/afs/OBSD/osi_vm.c @@ -21,8 +21,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afs/afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/OBSD/osi_vnodeops.c b/src/afs/OBSD/osi_vnodeops.c index e01b1bf..6319a73 100644 --- a/src/afs/OBSD/osi_vnodeops.c +++ b/src/afs/OBSD/osi_vnodeops.c @@ -98,8 +98,6 @@ NONINFRINGEMENT. #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afs/afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/SOLARIS/osi_file.c b/src/afs/SOLARIS/osi_file.c index 4ba7015..8948a57 100644 --- a/src/afs/SOLARIS/osi_file.c +++ b/src/afs/SOLARIS/osi_file.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/SOLARIS/osi_groups.c b/src/afs/SOLARIS/osi_groups.c index d7eaeee..58c510e 100644 --- a/src/afs/SOLARIS/osi_groups.c +++ b/src/afs/SOLARIS/osi_groups.c @@ -22,8 +22,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afsincludes.h" diff --git a/src/afs/SOLARIS/osi_inode.c b/src/afs/SOLARIS/osi_inode.c index d352e32..5fb43d1 100644 --- a/src/afs/SOLARIS/osi_inode.c +++ b/src/afs/SOLARIS/osi_inode.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/SOLARIS/osi_machdep.h b/src/afs/SOLARIS/osi_machdep.h index 373fe34..e750732 100644 --- a/src/afs/SOLARIS/osi_machdep.h +++ b/src/afs/SOLARIS/osi_machdep.h @@ -61,6 +61,8 @@ extern void *afs_osi_Alloc_NoSleep(size_t size); vn_rdwr((rw),(gp),(base),(len),(offset),(segflg),(ioflag),(ulimit),(cr),(aresid)) #define gop_lookupname(fnamep,segflg,followlink,compvpp) \ lookupname((fnamep),(segflg),(followlink),NULL,(compvpp)) +#define gop_lookupname_user(fnamep,segflg,followlink,compvpp) \ + lookupname((fnamep),(segflg),(followlink),NULL,(compvpp)) #if defined(AFS_SUN510_ENV) diff --git a/src/afs/SOLARIS/osi_sleep.c b/src/afs/SOLARIS/osi_sleep.c index e0afef4..a219d78 100644 --- a/src/afs/SOLARIS/osi_sleep.c +++ b/src/afs/SOLARIS/osi_sleep.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/SOLARIS/osi_vfsops.c b/src/afs/SOLARIS/osi_vfsops.c index 2792397..389fa3b 100644 --- a/src/afs/SOLARIS/osi_vfsops.c +++ b/src/afs/SOLARIS/osi_vfsops.c @@ -13,8 +13,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/SOLARIS/osi_vm.c b/src/afs/SOLARIS/osi_vm.c index 5f2ab31..c4f55cd 100644 --- a/src/afs/SOLARIS/osi_vm.c +++ b/src/afs/SOLARIS/osi_vm.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/SOLARIS/osi_vnodeops.c b/src/afs/SOLARIS/osi_vnodeops.c index ef89c84..73280bf 100644 --- a/src/afs/SOLARIS/osi_vnodeops.c +++ b/src/afs/SOLARIS/osi_vnodeops.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); /* * SOLARIS/osi_vnodeops.c diff --git a/src/afs/UKERNEL/afs_usrops.c b/src/afs/UKERNEL/afs_usrops.c index 15fd9a1..99004d7 100644 --- a/src/afs/UKERNEL/afs_usrops.c +++ b/src/afs/UKERNEL/afs_usrops.c @@ -15,8 +15,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #ifdef UKERNEL diff --git a/src/afs/UKERNEL/osi_groups.c b/src/afs/UKERNEL/osi_groups.c index 248627d..3352b6c 100644 --- a/src/afs/UKERNEL/osi_groups.c +++ b/src/afs/UKERNEL/osi_groups.c @@ -14,8 +14,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afsincludes.h" diff --git a/src/afs/UKERNEL/osi_machdep.h b/src/afs/UKERNEL/osi_machdep.h index 19a25f5..21f7d79 100644 --- a/src/afs/UKERNEL/osi_machdep.h +++ b/src/afs/UKERNEL/osi_machdep.h @@ -38,6 +38,8 @@ #undef gop_lookupname #define gop_lookupname(fnamep,segflg,followlink,compvpp) lookupname((fnamep),(segflg),(followlink),(compvpp)) +#undef gop_lookupname_user +#define gop_lookupname_user(fnamep,segflg,followlink,compvpp) lookupname((fnamep),(segflg),(followlink),(compvpp)) #define osi_vnhold(avc, r) do { VN_HOLD(AFSTOV(avc)); } while(0) #define afs_suser(x) suser(x) diff --git a/src/afs/UKERNEL/osi_vfsops.c b/src/afs/UKERNEL/osi_vfsops.c index b9e95e9..7ed2657 100644 --- a/src/afs/UKERNEL/osi_vfsops.c +++ b/src/afs/UKERNEL/osi_vfsops.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/UKERNEL/osi_vm.c b/src/afs/UKERNEL/osi_vm.c index 5d066d7..b26b7fb 100644 --- a/src/afs/UKERNEL/osi_vm.c +++ b/src/afs/UKERNEL/osi_vm.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/UKERNEL/osi_vnodeops.c b/src/afs/UKERNEL/osi_vnodeops.c index edd02b7..5c1cd66 100644 --- a/src/afs/UKERNEL/osi_vnodeops.c +++ b/src/afs/UKERNEL/osi_vnodeops.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/VNOPS/afs_vnop_access.c b/src/afs/VNOPS/afs_vnop_access.c index 0db7b1a..69f6e0d 100644 --- a/src/afs/VNOPS/afs_vnop_access.c +++ b/src/afs/VNOPS/afs_vnop_access.c @@ -22,8 +22,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c index 7ad6c1f..a26f5db 100644 --- a/src/afs/VNOPS/afs_vnop_attrs.c +++ b/src/afs/VNOPS/afs_vnop_attrs.c @@ -23,8 +23,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/VNOPS/afs_vnop_create.c b/src/afs/VNOPS/afs_vnop_create.c index 1684307..5e2dfda 100644 --- a/src/afs/VNOPS/afs_vnop_create.c +++ b/src/afs/VNOPS/afs_vnop_create.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/VNOPS/afs_vnop_dirops.c b/src/afs/VNOPS/afs_vnop_dirops.c index ed6cebe..33be5e6 100644 --- a/src/afs/VNOPS/afs_vnop_dirops.c +++ b/src/afs/VNOPS/afs_vnop_dirops.c @@ -20,8 +20,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/VNOPS/afs_vnop_fid.c b/src/afs/VNOPS/afs_vnop_fid.c index a558212..1a17510 100644 --- a/src/afs/VNOPS/afs_vnop_fid.c +++ b/src/afs/VNOPS/afs_vnop_fid.c @@ -17,8 +17,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #if !defined(AFS_DUX40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_OBSD_ENV) #include "afs/sysincludes.h" /* Standard vendor system headers */ diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c index 3b8e8cf..7219258 100644 --- a/src/afs/VNOPS/afs_vnop_flock.c +++ b/src/afs/VNOPS/afs_vnop_flock.c @@ -15,8 +15,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/VNOPS/afs_vnop_link.c b/src/afs/VNOPS/afs_vnop_link.c index 830f60e..f6bc93f 100644 --- a/src/afs/VNOPS/afs_vnop_link.c +++ b/src/afs/VNOPS/afs_vnop_link.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c index 27f12ca..eb644c4 100644 --- a/src/afs/VNOPS/afs_vnop_lookup.c +++ b/src/afs/VNOPS/afs_vnop_lookup.c @@ -17,8 +17,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/VNOPS/afs_vnop_open.c b/src/afs/VNOPS/afs_vnop_open.c index cab75bb..75f4e98 100644 --- a/src/afs/VNOPS/afs_vnop_open.c +++ b/src/afs/VNOPS/afs_vnop_open.c @@ -17,8 +17,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/VNOPS/afs_vnop_read.c b/src/afs/VNOPS/afs_vnop_read.c index ba9378e..c6686b2 100644 --- a/src/afs/VNOPS/afs_vnop_read.c +++ b/src/afs/VNOPS/afs_vnop_read.c @@ -18,8 +18,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "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 f4f11da..9bd9070 100644 --- a/src/afs/VNOPS/afs_vnop_readdir.c +++ b/src/afs/VNOPS/afs_vnop_readdir.c @@ -22,8 +22,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/VNOPS/afs_vnop_remove.c b/src/afs/VNOPS/afs_vnop_remove.c index 41bf97e..2d5793c 100644 --- a/src/afs/VNOPS/afs_vnop_remove.c +++ b/src/afs/VNOPS/afs_vnop_remove.c @@ -20,8 +20,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/VNOPS/afs_vnop_rename.c b/src/afs/VNOPS/afs_vnop_rename.c index d5c12fd..8f601f0 100644 --- a/src/afs/VNOPS/afs_vnop_rename.c +++ b/src/afs/VNOPS/afs_vnop_rename.c @@ -17,8 +17,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/VNOPS/afs_vnop_strategy.c b/src/afs/VNOPS/afs_vnop_strategy.c index 766c2da..d54affd 100644 --- a/src/afs/VNOPS/afs_vnop_strategy.c +++ b/src/afs/VNOPS/afs_vnop_strategy.c @@ -15,8 +15,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #if !defined(AFS_HPUX_ENV) && !defined(AFS_SGI_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN80_ENV) diff --git a/src/afs/VNOPS/afs_vnop_symlink.c b/src/afs/VNOPS/afs_vnop_symlink.c index 49325cf..b57e206 100644 --- a/src/afs/VNOPS/afs_vnop_symlink.c +++ b/src/afs/VNOPS/afs_vnop_symlink.c @@ -21,8 +21,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/VNOPS/afs_vnop_write.c b/src/afs/VNOPS/afs_vnop_write.c index 894b354..79717f8 100644 --- a/src/afs/VNOPS/afs_vnop_write.c +++ b/src/afs/VNOPS/afs_vnop_write.c @@ -20,8 +20,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/afs.h b/src/afs/afs.h index 2224e5a..635fa42 100644 --- a/src/afs/afs.h +++ b/src/afs/afs.h @@ -875,9 +875,15 @@ struct cm_initparams { #define IFAnyPages 32 #define IFDiscarded 64 /* index entry in discardDCList */ +#ifdef AFS_DARWIN100_ENV +typedef user_addr_t iparmtype; /* 64 bit */ +#else +typedef char * iparmtype; +#endif + struct afs_ioctl { - char *in; /* input buffer */ - char *out; /* output buffer */ + iparmtype in; /* input buffer */ + iparmtype out; /* output buffer */ short in_size; /* Size of input buffer <= 2K */ short out_size; /* Maximum size of output buffer, <= 2K */ }; diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c index 7b1869c..3d70f83 100644 --- a/src/afs/afs_analyze.c +++ b/src/afs/afs_analyze.c @@ -13,8 +13,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ diff --git a/src/afs/afs_axscache.c b/src/afs/afs_axscache.c index ab585f0..700d0e1 100644 --- a/src/afs/afs_axscache.c +++ b/src/afs/afs_axscache.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/afs_buffer.c b/src/afs/afs_buffer.c index 2d949aa..b2f81dc 100644 --- a/src/afs/afs_buffer.c +++ b/src/afs/afs_buffer.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" #include "afsincludes.h" diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c index 3b3298b..5330008 100644 --- a/src/afs/afs_call.c +++ b/src/afs/afs_call.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ @@ -112,6 +110,10 @@ afs_int32 afs_rx_deadtime = AFS_RXDEADTIME; afs_int32 afs_rx_harddead = AFS_HARDDEADTIME; afs_int32 afs_rx_idledead = AFS_IDLEDEADTIME; +#ifdef AFS_DARWIN100_ENV +static int +Afscall64_icl(int opcode, user_addr_t kp1, user_addr_t kp2, user_addr_t kp3, user_addr_t kp4, int *retval); +#endif static int Afscall_icl(long opcode, long p1, long p2, long p3, long p4, long *retval); @@ -518,11 +520,30 @@ wait_for_cachedefs(void) { #endif } -/* leaving as is, probably will barf if we add prototypes here since it's likely being called -with partial list */ +#ifdef AFS_DARWIN100_ENV +#define AFSKPTR(X) k ## X +int +afs_syscall_call(long parm, long parm2, long parm3, + long parm4, long parm5, long parm6) +{ + return afs_syscall64_call(CAST_USER_ADDR_T((parm)), + CAST_USER_ADDR_T((parm2)), + CAST_USER_ADDR_T((parm3)), + CAST_USER_ADDR_T((parm4)), + CAST_USER_ADDR_T((parm5)), + CAST_USER_ADDR_T((parm6))); +} +#else +#define AFSKPTR(X) ((caddr_t)X) +#endif int -afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6) - long parm, parm2, parm3, parm4, parm5, parm6; +#ifdef AFS_DARWIN100_ENV +afs_syscall64_call(user_addr_t kparm, user_addr_t kparm2, user_addr_t kparm3, + user_addr_t kparm4, user_addr_t kparm5, user_addr_t kparm6) +#else +afs_syscall_call(long parm, long parm2, long parm3, + long parm4, long parm5, long parm6) +#endif { afs_int32 code = 0; #if defined(AFS_SGI61_ENV) || defined(AFS_SUN57_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) @@ -530,6 +551,15 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6) #else /* AFS_SGI61_ENV */ u_int bufferSize; #endif /* AFS_SGI61_ENV */ +#ifdef AFS_DARWIN100_ENV + /* AFSKPTR macro relies on this name format/mapping */ + afs_uint32 parm = (afs_uint32)kparm; + afs_uint32 parm2 = (afs_uint32)kparm2; + afs_uint32 parm3 = (afs_uint32)kparm3; + afs_uint32 parm4 = (afs_uint32)kparm4; + afs_uint32 parm5 = (afs_uint32)kparm5; + afs_uint32 parm6 = (afs_uint32)kparm6; +#endif AFS_STATCNT(afs_syscall_call); if ( @@ -714,13 +744,13 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6) * home cell flag (0x1 bit) and the nosuid flag (0x2 bit) */ struct afsop_cell *tcell = afs_osi_Alloc(sizeof(struct afsop_cell)); - AFS_COPYIN((char *)parm2, (char *)tcell->hosts, sizeof(tcell->hosts), + AFS_COPYIN(AFSKPTR(parm2), (caddr_t)tcell->hosts, sizeof(tcell->hosts), code); if (!code) { if (parm4 > sizeof(tcell->cellName)) code = EFAULT; else { - AFS_COPYIN((char *)parm3, tcell->cellName, parm4, code); + AFS_COPYIN(AFSKPTR(parm3), (caddr_t)tcell->cellName, parm4, code); if (!code) afs_NewCell(tcell->cellName, tcell->hosts, parm5, NULL, 0, 0, 0); @@ -739,14 +769,14 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6) afs_osi_Sleep(&afs_initState); #endif - AFS_COPYIN((char *)parm2, (char *)tcell->hosts, sizeof(tcell->hosts), + AFS_COPYIN(AFSKPTR(parm2), (caddr_t)tcell->hosts, sizeof(tcell->hosts), code); if (!code) { - AFS_COPYINSTR((char *)parm3, tbuffer1, AFS_SMALLOCSIZ, + AFS_COPYINSTR(AFSKPTR(parm3), tbuffer1, AFS_SMALLOCSIZ, &bufferSize, code); if (!code) { if (parm4 & 4) { - AFS_COPYINSTR((char *)parm5, tbuffer, AFS_SMALLOCSIZ, + AFS_COPYINSTR(AFSKPTR(parm5), tbuffer, AFS_SMALLOCSIZ, &bufferSize, code); if (!code) { lcnamep = tbuffer; @@ -771,10 +801,10 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6) char *aliasName = osi_AllocSmallSpace(AFS_SMALLOCSIZ); char *cellName = osi_AllocSmallSpace(AFS_SMALLOCSIZ); - AFS_COPYINSTR((char *)parm2, aliasName, AFS_SMALLOCSIZ, &bufferSize, + AFS_COPYINSTR(AFSKPTR(parm2), aliasName, AFS_SMALLOCSIZ, &bufferSize, code); if (!code) - AFS_COPYINSTR((char *)parm3, cellName, AFS_SMALLOCSIZ, + AFS_COPYINSTR(AFSKPTR(parm3), cellName, AFS_SMALLOCSIZ, &bufferSize, code); if (!code) afs_NewCellAlias(aliasName, cellName); @@ -787,7 +817,7 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6) */ char *cell = osi_AllocSmallSpace(AFS_SMALLOCSIZ); - AFS_COPYINSTR((char *)parm2, cell, AFS_SMALLOCSIZ, &bufferSize, code); + AFS_COPYINSTR(AFSKPTR(parm2), cell, AFS_SMALLOCSIZ, &bufferSize, code); if (!code) afs_SetPrimaryCell(cell); osi_FreeSmallSpace(cell); @@ -797,7 +827,7 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6) if (afs_CacheInit_Done) goto out; - AFS_COPYIN((char *)parm2, (caddr_t) & cparms, sizeof(cparms), code); + AFS_COPYIN(AFSKPTR(parm2), (caddr_t) & cparms, sizeof(cparms), code); if (code) { #if defined(KERNEL_HAVE_UERROR) setuerror(code); @@ -857,7 +887,7 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6) afs_osi_Sleep(&afs_initState); if (parm2) { - AFS_COPYINSTR((char *)parm2, afs_rootVolumeName, + AFS_COPYINSTR(AFSKPTR(parm2), afs_rootVolumeName, sizeof(afs_rootVolumeName), &bufferSize, code); afs_rootVolumeName[sizeof(afs_rootVolumeName) - 1] = 0; } else @@ -868,7 +898,7 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6) char *tbuffer = osi_AllocSmallSpace(AFS_SMALLOCSIZ); code = 0; - AFS_COPYINSTR((char *)parm2, tbuffer, AFS_SMALLOCSIZ, &bufferSize, + AFS_COPYINSTR(AFSKPTR(parm2), tbuffer, AFS_SMALLOCSIZ, &bufferSize, code); if (code) { osi_FreeSmallSpace(tbuffer); @@ -976,39 +1006,43 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6) count = AFS_MAX_INTERFACE_ADDR; } - AFS_COPYIN((char *)parm3, (char *)buffer, count * sizeof(afs_int32), + AFS_COPYIN(AFSKPTR(parm3), (caddr_t)buffer, count * sizeof(afs_int32), code); - if (parm4) - AFS_COPYIN((char *)parm4, (char *)maskbuffer, + if (parm4 && !code) + AFS_COPYIN(AFSKPTR(parm4), (caddr_t)maskbuffer, count * sizeof(afs_int32), code); - if (parm5) - AFS_COPYIN((char *)parm5, (char *)mtubuffer, + if (parm5 && !code) + AFS_COPYIN(AFSKPTR(parm5), (caddr_t)mtubuffer, count * sizeof(afs_int32), code); - afs_cb_interface.numberOfInterfaces = count; - for (i = 0; i < count; i++) { - afs_cb_interface.addr_in[i] = buffer[i]; + if (!code) { + afs_cb_interface.numberOfInterfaces = count; + for (i = 0; i < count; i++) { + afs_cb_interface.addr_in[i] = buffer[i]; #ifdef AFS_USERSPACE_IP_ADDR - /* AFS_USERSPACE_IP_ADDR means we have no way of finding the - * machines IP addresses when in the kernel (the in_ifaddr - * struct is not available), so we pass the info in at - * startup. We also pass in the subnetmask and mtu size. The - * subnetmask is used when setting the rank: - * afsi_SetServerIPRank(); and the mtu size is used when - * finding the best mtu size. rxi_FindIfnet() is replaced - * with rxi_Findcbi(). - */ - afs_cb_interface.subnetmask[i] = - (parm4 ? maskbuffer[i] : 0xffffffff); - afs_cb_interface.mtu[i] = (parm5 ? mtubuffer[i] : htonl(1500)); + /* AFS_USERSPACE_IP_ADDR means we have no way of finding the + * machines IP addresses when in the kernel (the in_ifaddr + * struct is not available), so we pass the info in at + * startup. We also pass in the subnetmask and mtu size. The + * subnetmask is used when setting the rank: + * afsi_SetServerIPRank(); and the mtu size is used when + * finding the best mtu size. rxi_FindIfnet() is replaced + * with rxi_Findcbi(). + */ + afs_cb_interface.subnetmask[i] = + (parm4 ? maskbuffer[i] : 0xffffffff); + afs_cb_interface.mtu[i] = (parm5 ? mtubuffer[i] : htonl(1500)); #endif - } - rxi_setaddr(buffer[0]); - if (!refresh) { - if (rxbind) - rx_bindhost = buffer[0]; - else - rx_bindhost = htonl(INADDR_ANY); + } + rxi_setaddr(buffer[0]); + if (!refresh) { + if (rxbind) + rx_bindhost = buffer[0]; + else + rx_bindhost = htonl(INADDR_ANY); + } + } else { + refresh = 0; } afs_osi_Free(buffer, sizeof(afs_int32) * AFS_MAX_INTERFACE_ADDR); @@ -1084,8 +1118,8 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6) #endif /* else AFS_USERSPACE_IP_ADDR */ #endif /* !AFS_SUN5_ENV */ if (!code) - AFS_COPYOUT((caddr_t) & mtu, (caddr_t) parm3, sizeof(afs_int32), - code); + AFS_COPYOUT((caddr_t) & mtu, AFSKPTR(parm3), + sizeof(afs_int32), code); #ifdef AFS_AIX32_ENV /* this is disabled for now because I can't figure out how to get access * to these kernel variables. It's only for supporting user-mode rx @@ -1122,8 +1156,8 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6) #endif /* else AFS_USERSPACE_IP_ADDR */ #endif /* !AFS_SUN5_ENV */ if (!code) - AFS_COPYOUT((caddr_t) & mask, (caddr_t) parm3, sizeof(afs_int32), - code); + AFS_COPYOUT((caddr_t) & mask, AFSKPTR(parm3), + sizeof(afs_int32), code); } #ifdef AFS_AFSDB_ENV else if (parm == AFSOP_AFSDB_HANDLER) { @@ -1136,8 +1170,8 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6) #ifndef UKERNEL afs_osi_MaskUserLoop(); #endif - AFS_COPYIN((afs_int32 *) parm2, cellname, cellLen, code); - AFS_COPYIN((afs_int32 *) parm3, kmsg, kmsgLen, code); + AFS_COPYIN(AFSKPTR(parm2), cellname, cellLen, code); + AFS_COPYIN(AFSKPTR(parm3), kmsg, kmsgLen, code); if (!code) { code = afs_AFSDBHandler(cellname, cellLen, kmsg); if (*cellname == 1) @@ -1148,7 +1182,7 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6) } } if (!code) - AFS_COPYOUT(cellname, (char *)parm2, cellLen, code); + AFS_COPYOUT(cellname, AFSKPTR(parm2), cellLen, code); afs_osi_Free(kmsg, kmsgLen); afs_osi_Free(cellname, cellLen); } @@ -1164,9 +1198,10 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6) rx_extraPackets = parm2; afscall_set_rxpck_received = 1; } else if (parm == AFSOP_SET_RXMAXMTU) { - rx_MyMaxSendSize = rx_maxReceiveSizeUser = rx_maxReceiveSize = parm2; - } else + rx_MyMaxSendSize = rx_maxReceiveSizeUser = rx_maxReceiveSize = parm2; + } else { code = EINVAL; + } out: AFS_GUNLOCK(); @@ -1346,10 +1381,10 @@ Afs_syscall(struct afsargs *uap, rval_t * rvp) #else /* AFS_SGI_ENV */ struct iparam { - long param1; - long param2; - long param3; - long param4; + iparmtype param1; + iparmtype param2; + iparmtype param3; + iparmtype param4; }; struct iparam32 { @@ -1360,7 +1395,7 @@ struct iparam32 { }; -#if defined(AFS_HPUX_64BIT_ENV) || defined(AFS_SUN57_64BIT_ENV) || (defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV)) +#if defined(AFS_HPUX_64BIT_ENV) || defined(AFS_SUN57_64BIT_ENV) || (defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV)) || defined(NEED_IOCTL32) static void iparam32_to_iparam(const struct iparam32 *src, struct iparam *dst) { @@ -1374,6 +1409,9 @@ iparam32_to_iparam(const struct iparam32 *src, struct iparam *dst) /* * If you need to change copyin_iparam(), you may also need to change * copyin_afs_ioctl(). + * + * This function is needed only for icreate, meaning, only on platforms + * providing the inode fileserver. */ static int @@ -1482,7 +1520,31 @@ Afs_syscall(register struct afssysa *uap, rval_t * rvp) { int *retval = &rvp->r_val1; #else /* AFS_SUN5_ENV */ -#if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) +#ifdef AFS_DARWIN100_ENV +struct afssysa { + afs_int32 syscall; + afs_int32 parm1; + afs_int32 parm2; + afs_int32 parm3; + afs_int32 parm4; + afs_int32 parm5; + afs_int32 parm6; +}; +struct afssysa64 { + afs_int64 parm1; + afs_int64 parm2; + afs_int64 parm3; + afs_int64 parm4; + afs_int64 parm5; + afs_int64 parm6; + afs_int32 syscall; +}; +int +afs3_syscall(struct proc *p, void *args, unsigned int *retval) +{ + struct afssysa64 *uap64 = NULL; + struct afssysa *uap = NULL; +#elif defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) int afs3_syscall(p, args, retval) #ifdef AFS_FBSD50_ENV @@ -1616,148 +1678,171 @@ Afs_syscall() #if defined(AFS_DARWIN80_ENV) get_vfs_context(); osi_Assert(*retval == 0); +#ifdef AFS_DARWIN100_ENV + if (proc_is64bit(p)) { + uap64 = (struct afssysa64 *)args; + if (uap64->syscall == AFSCALL_CALL) { + code = + afs_syscall64_call(uap64->parm1, uap64->parm2, uap64->parm3, + uap64->parm4, uap64->parm5, uap64->parm6); + } else if (uap64->syscall == AFSCALL_SETPAG) { + AFS_GLOCK(); + code = afs_setpag(p, args, retval); + AFS_GUNLOCK(); + } else if (uap64->syscall == AFSCALL_PIOCTL) { + AFS_GLOCK(); + code = + afs_syscall64_pioctl(uap64->parm1, (unsigned int)uap64->parm2, + uap64->parm3, (int)uap64->parm4, + kauth_cred_get()); + AFS_GUNLOCK(); + } else if (uap64->syscall == AFSCALL_ICL) { + AFS_GLOCK(); + code = + Afscall64_icl(uap64->parm1, uap64->parm2, uap64->parm3, + uap64->parm4, uap64->parm5, retval); + AFS_GUNLOCK(); + } else + code = EINVAL; + if (uap64->syscall != AFSCALL_CALL) + put_vfs_context(); + } else { /* and the default case for 32 bit procs */ #endif -#if defined(AFS_HPUX_ENV) - /* - * There used to be code here (duplicated from osi_Init()) for - * initializing the semaphore used by AFS_GLOCK(). Was the - * duplication to handle the case of a dynamically loaded kernel - * module? - */ - osi_InitGlock(); + uap = (struct afssysa *)args; #endif - if (uap->syscall == AFSCALL_CALL) { +#if defined(AFS_HPUX_ENV) + /* + * There used to be code here (duplicated from osi_Init()) for + * initializing the semaphore used by AFS_GLOCK(). Was the + * duplication to handle the case of a dynamically loaded kernel + * module? + */ + osi_InitGlock(); +#endif + if (uap->syscall == AFSCALL_CALL) { + code = + afs_syscall_call(uap->parm1, uap->parm2, uap->parm3, uap->parm4, + uap->parm5, uap->parm6 #ifdef AFS_SUN5_ENV - code = - afs_syscall_call(uap->parm1, uap->parm2, uap->parm3, uap->parm4, - uap->parm5, uap->parm6, rvp, CRED()); -#else - code = - afs_syscall_call(uap->parm1, uap->parm2, uap->parm3, uap->parm4, - uap->parm5, uap->parm6); + , rvp, CRED() #endif - } else if (uap->syscall == AFSCALL_SETPAG) { + ); + } else if (uap->syscall == AFSCALL_SETPAG) { #ifdef AFS_SUN5_ENV - register proc_t *procp; - - procp = ttoproc(curthread); - AFS_GLOCK(); - code = afs_setpag(&procp->p_cred); - AFS_GUNLOCK(); + register proc_t *procp; + + procp = ttoproc(curthread); + AFS_GLOCK(); + code = afs_setpag(&procp->p_cred); + AFS_GUNLOCK(); #else - AFS_GLOCK(); + AFS_GLOCK(); #if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) - code = afs_setpag(p, args, retval); + code = afs_setpag(p, args, retval); #else /* AFS_OSF_ENV */ - code = afs_setpag(); + code = afs_setpag(); #endif - AFS_GUNLOCK(); + AFS_GUNLOCK(); #endif - } else if (uap->syscall == AFSCALL_PIOCTL) { - AFS_GLOCK(); + } else if (uap->syscall == AFSCALL_PIOCTL) { + AFS_GLOCK(); #if defined(AFS_SUN5_ENV) - code = - afs_syscall_pioctl(uap->parm1, uap->parm2, uap->parm3, uap->parm4, - rvp, CRED()); + code = + afs_syscall_pioctl(uap->parm1, uap->parm2, uap->parm3, + uap->parm4, rvp, CRED()); #elif defined(AFS_FBSD50_ENV) - code = - afs_syscall_pioctl(uap->parm1, uap->parm2, uap->parm3, uap->parm4, - p->td_ucred); + code = + afs_syscall_pioctl(uap->parm1, uap->parm2, uap->parm3, + uap->parm4, p->td_ucred); #elif defined(AFS_DARWIN80_ENV) - code = - afs_syscall_pioctl(uap->parm1, uap->parm2, uap->parm3, uap->parm4, - kauth_cred_get()); + code = + afs_syscall_pioctl(uap->parm1, uap->parm2, uap->parm3, + uap->parm4, kauth_cred_get()); #elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) - code = - afs_syscall_pioctl(uap->parm1, uap->parm2, uap->parm3, uap->parm4, - p->p_cred->pc_ucred); + code = + afs_syscall_pioctl(uap->parm1, uap->parm2, uap->parm3, + uap->parm4, p->p_cred->pc_ucred); #else - code = - afs_syscall_pioctl(uap->parm1, uap->parm2, uap->parm3, - uap->parm4); -#endif - AFS_GUNLOCK(); - } else if (uap->syscall == AFSCALL_ICREATE) { - struct iparam iparams; - - code = copyin_iparam((char *)uap->parm3, &iparams); - if (code) { + code = + afs_syscall_pioctl(uap->parm1, uap->parm2, uap->parm3, + uap->parm4); +#endif + AFS_GUNLOCK(); + } else if (uap->syscall == AFSCALL_ICREATE) { + struct iparam iparams; + + code = copyin_iparam((char *)uap->parm3, &iparams); + if (code) { #if defined(KERNEL_HAVE_UERROR) - setuerror(code); -#endif - } else + setuerror(code); +#endif + } else { + code = + afs_syscall_icreate(uap->parm1, uap->parm2, iparams.param1, + iparams.param2, iparams.param3, + iparams.param4 +#ifdef AFS_SUN5_ENV + , rvp, CRED() +#elif defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) + , retval +#endif + ); + } + } else if (uap->syscall == AFSCALL_IOPEN) { + code = + afs_syscall_iopen(uap->parm1, uap->parm2, uap->parm3 #ifdef AFS_SUN5_ENV - code = - afs_syscall_icreate(uap->parm1, uap->parm2, iparams.param1, - iparams.param2, iparams.param3, - iparams.param4, rvp, CRED()); -#else - code = - afs_syscall_icreate(uap->parm1, uap->parm2, iparams.param1, - iparams.param2, -#if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) - iparams.param3, iparams.param4, retval); -#else - iparams.param3, iparams.param4); -#endif -#endif /* AFS_SUN5_ENV */ - } else if (uap->syscall == AFSCALL_IOPEN) { + , rvp, CRED() +#elif defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) + , retval +#endif + ); + } else if (uap->syscall == AFSCALL_IDEC) { + code = + afs_syscall_iincdec(uap->parm1, uap->parm2, uap->parm3, -1 #ifdef AFS_SUN5_ENV - code = - afs_syscall_iopen(uap->parm1, uap->parm2, uap->parm3, rvp, - CRED()); -#else -#if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) - code = afs_syscall_iopen(uap->parm1, uap->parm2, uap->parm3, retval); -#else - code = afs_syscall_iopen(uap->parm1, uap->parm2, uap->parm3); + , rvp, CRED() #endif -#endif /* AFS_SUN5_ENV */ - } else if (uap->syscall == AFSCALL_IDEC) { -#ifdef AFS_SUN5_ENV - code = - afs_syscall_iincdec(uap->parm1, uap->parm2, uap->parm3, -1, rvp, - CRED()); -#else - code = afs_syscall_iincdec(uap->parm1, uap->parm2, uap->parm3, -1); -#endif /* AFS_SUN5_ENV */ - } else if (uap->syscall == AFSCALL_IINC) { + ); + } else if (uap->syscall == AFSCALL_IINC) { + code = + afs_syscall_iincdec(uap->parm1, uap->parm2, uap->parm3, 1 #ifdef AFS_SUN5_ENV - code = - afs_syscall_iincdec(uap->parm1, uap->parm2, uap->parm3, 1, rvp, - CRED()); -#else - code = afs_syscall_iincdec(uap->parm1, uap->parm2, uap->parm3, 1); -#endif /* AFS_SUN5_ENV */ - } else if (uap->syscall == AFSCALL_ICL) { - AFS_GLOCK(); - code = - Afscall_icl(uap->parm1, uap->parm2, uap->parm3, uap->parm4, - uap->parm5, retval); - AFS_GUNLOCK(); + , rvp, CRED() +#endif + ); + } else if (uap->syscall == AFSCALL_ICL) { + AFS_GLOCK(); + code = + Afscall_icl(uap->parm1, uap->parm2, uap->parm3, uap->parm4, + uap->parm5, retval); + AFS_GUNLOCK(); #ifdef AFS_LINUX20_ENV - if (!code) { - /* ICL commands can return values. */ - code = -linux_ret; /* Gets negated again at exit below */ - } + if (!code) { + /* ICL commands can return values. */ + code = -linux_ret; /* Gets negated again at exit below */ + } #else - if (code) { + if (code) { #if defined(KERNEL_HAVE_UERROR) - setuerror(code); + setuerror(code); #endif - } + } #endif /* !AFS_LINUX20_ENV */ - } else { + } else { #if defined(KERNEL_HAVE_UERROR) - setuerror(EINVAL); + setuerror(EINVAL); #else - code = EINVAL; + code = EINVAL; #endif - } - + } + #if defined(AFS_DARWIN80_ENV) - if (uap->syscall != AFSCALL_CALL) - put_vfs_context(); + if (uap->syscall != AFSCALL_CALL) + put_vfs_context(); +#ifdef AFS_DARWIN100_ENV + } /* 32 bit procs */ +#endif #endif #ifdef AFS_LINUX20_ENV code = -code; @@ -1972,9 +2057,29 @@ extern struct afs_icl_log *afs_icl_FindLog(); extern struct afs_icl_set *afs_icl_FindSet(); +#ifdef AFS_DARWIN100_ENV +#define AFSKPTR(X) k ## X static int Afscall_icl(long opcode, long p1, long p2, long p3, long p4, long *retval) { + return Afscall64_icl(opcode, + CAST_USER_ADDR_T((p1)), + CAST_USER_ADDR_T((p2)), + CAST_USER_ADDR_T((p3)), + CAST_USER_ADDR_T((p4)), + retval); +} +#else +#define AFSKPTR(X) ((caddr_t)X) +#endif + +static int +#ifdef AFS_DARWIN100_ENV +Afscall64_icl(int opcode, user_addr_t kp1, user_addr_t kp2, user_addr_t kp3, user_addr_t kp4, int *retval) +#else +Afscall_icl(long opcode, long p1, long p2, long p3, long p4, long *retval) +#endif +{ afs_int32 *lp, elts, flags; register afs_int32 code; struct afs_icl_log *logp; @@ -1992,6 +2097,12 @@ Afscall_icl(long opcode, long p1, long p2, long p3, long p4, long *retval) afs_int32 startCookie; afs_int32 allocated; struct afs_icl_log *tlp; +#ifdef AFS_DARWIN100_ENV + afs_uint32 p1 = (afs_uint32)kp1; + afs_uint32 p2 = (afs_uint32)kp2; + afs_uint32 p3 = (afs_uint32)kp3; + afs_uint32 p4 = (afs_uint32)kp4; +#endif #ifdef AFS_SUN5_ENV if (!afs_suser(CRED())) { /* only root can run this code */ @@ -2015,10 +2126,10 @@ Afscall_icl(long opcode, long p1, long p2, long p3, long p4, long *retval) * updates cookie to updated start (not end) if we had to * skip some records. */ - AFS_COPYINSTR((char *)p1, tname, sizeof(tname), &temp, code); + AFS_COPYINSTR(AFSKPTR(p1), tname, sizeof(tname), &temp, code); if (code) return code; - AFS_COPYIN((char *)p4, (char *)&startCookie, sizeof(afs_int32), code); + AFS_COPYIN(AFSKPTR(p4), (char *)&startCookie, sizeof(afs_int32), code); if (code) return code; logp = afs_icl_FindLog(tname); @@ -2037,10 +2148,10 @@ Afscall_icl(long opcode, long p1, long p2, long p3, long p4, long *retval) osi_FreeLargeSpace((struct osi_buffer *)lp); break; } - AFS_COPYOUT((char *)lp, (char *)p2, elts * sizeof(afs_int32), code); + AFS_COPYOUT((char *)lp, AFSKPTR(p2), elts * sizeof(afs_int32), code); if (code) goto done; - AFS_COPYOUT((char *)&startCookie, (char *)p4, sizeof(afs_int32), + AFS_COPYOUT((char *)&startCookie, AFSKPTR(p4), sizeof(afs_int32), code); if (code) goto done; @@ -2068,9 +2179,9 @@ Afscall_icl(long opcode, long p1, long p2, long p3, long p4, long *retval) temp = strlen(tlp->name) + 1; if (temp > p3) return EINVAL; - AFS_COPYOUT(tlp->name, (char *)p2, temp, code); + AFS_COPYOUT(tlp->name, AFSKPTR(p2), temp, code); if (!code) /* copy out size of log */ - AFS_COPYOUT((char *)&tlp->logSize, (char *)p4, sizeof(afs_int32), + AFS_COPYOUT((char *)&tlp->logSize, AFSKPTR(p4), sizeof(afs_int32), code); break; @@ -2078,7 +2189,7 @@ Afscall_icl(long opcode, long p1, long p2, long p3, long p4, long *retval) /* enumerate logs: p1=setname, p2=index, p3=&name, p4=sizeof(name). * return 0 for success, otherwise error. */ - AFS_COPYINSTR((char *)p1, tname, sizeof(tname), &temp, code); + AFS_COPYINSTR(AFSKPTR(p1), tname, sizeof(tname), &temp, code); if (code) return code; setp = afs_icl_FindSet(tname); diff --git a/src/afs/afs_callback.c b/src/afs/afs_callback.c index 4177a2b..4562c74 100644 --- a/src/afs/afs_callback.c +++ b/src/afs/afs_callback.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ diff --git a/src/afs/afs_cbqueue.c b/src/afs/afs_cbqueue.c index 810afab..7c50e70 100644 --- a/src/afs/afs_cbqueue.c +++ b/src/afs/afs_cbqueue.c @@ -74,8 +74,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ diff --git a/src/afs/afs_cell.c b/src/afs/afs_cell.c index be469e7..be5f97e 100644 --- a/src/afs/afs_cell.c +++ b/src/afs/afs_cell.c @@ -13,8 +13,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ diff --git a/src/afs/afs_chunk.c b/src/afs/afs_chunk.c index a7c90e2..33ab521 100644 --- a/src/afs/afs_chunk.c +++ b/src/afs/afs_chunk.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c index b91e0d7..3334671 100644 --- a/src/afs/afs_conn.c +++ b/src/afs/afs_conn.c @@ -13,8 +13,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ diff --git a/src/afs/afs_daemons.c b/src/afs/afs_daemons.c index 97112fa..84dc396 100644 --- a/src/afs/afs_daemons.c +++ b/src/afs/afs_daemons.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #ifdef AFS_AIX51_ENV #define __FULL_PROTO diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c index 4ec3a33..1ee51e6 100644 --- a/src/afs/afs_dcache.c +++ b/src/afs/afs_dcache.c @@ -13,8 +13,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ diff --git a/src/afs/afs_dynroot.c b/src/afs/afs_dynroot.c index ba1bbe6..9a17bf1 100644 --- a/src/afs/afs_dynroot.c +++ b/src/afs/afs_dynroot.c @@ -130,6 +130,13 @@ afs_IsDynrootFid(struct VenusFid *fid) && fid->Fid.Unique == AFS_DYNROOT_UNIQUE); } +int +afs_IsDynrootAnyFid(struct VenusFid *fid) +{ + return (afs_dynrootEnable && fid->Cell == afs_dynrootCell + && fid->Fid.Volume == AFS_DYNROOT_VOLUME); +} + /* * Obtain the magic dynroot volume Fid. */ diff --git a/src/afs/afs_exporter.c b/src/afs/afs_exporter.c index 2164694..96ff3d8 100644 --- a/src/afs/afs_exporter.c +++ b/src/afs/afs_exporter.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/afs_init.c b/src/afs/afs_init.c index b9f24e2..b225b24 100644 --- a/src/afs/afs_init.c +++ b/src/afs/afs_init.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ diff --git a/src/afs/afs_lock.c b/src/afs/afs_lock.c index 8573a07..0acb12e 100644 --- a/src/afs/afs_lock.c +++ b/src/afs/afs_lock.c @@ -25,8 +25,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/afs_mariner.c b/src/afs/afs_mariner.c index cbdf9ca..8b9ae57 100644 --- a/src/afs/afs_mariner.c +++ b/src/afs/afs_mariner.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ diff --git a/src/afs/afs_memcache.c b/src/afs/afs_memcache.c index d1fa23b..de195cd 100644 --- a/src/afs/afs_memcache.c +++ b/src/afs/afs_memcache.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #ifndef AFS_LINUX22_ENV diff --git a/src/afs/afs_nfsclnt.c b/src/afs/afs_nfsclnt.c index 2aaa237..4243ef7 100644 --- a/src/afs/afs_nfsclnt.c +++ b/src/afs/afs_nfsclnt.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #if !defined(AFS_NONFSTRANS) || defined(AFS_AIX_IAUTH_ENV) #include "afs/sysincludes.h" /* Standard vendor system headers */ diff --git a/src/afs/afs_nfsdisp.c b/src/afs/afs_nfsdisp.c index 2b45437..cd6f749 100644 --- a/src/afs/afs_nfsdisp.c +++ b/src/afs/afs_nfsdisp.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); /* Ugly Ugly Ugly but precludes conflicting XDR macros; We want kernel xdr */ #define __XDR_INCLUDE__ diff --git a/src/afs/afs_osi.c b/src/afs/afs_osi.c index 5a51bf7..01800d6 100644 --- a/src/afs/afs_osi.c +++ b/src/afs/afs_osi.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h index 799caab..0eb0e8a 100644 --- a/src/afs/afs_osi.h +++ b/src/afs/afs_osi.h @@ -277,7 +277,7 @@ typedef struct timeval osi_timeval_t; * and kernel space. Call these to avoid taking page faults while * holding the global lock. */ -#ifdef CAST_USER_ADDR_T +#if defined(CAST_USER_ADDR_T) && !defined(UKERNEL) && !defined(AFS_DARWIN100_ENV) #define __U(X) CAST_USER_ADDR_T((X)) #else #define __U(X) (X) @@ -289,7 +289,7 @@ typedef struct timeval osi_timeval_t; int haveGlock = ISAFS_GLOCK(); \ if (haveGlock) \ AFS_GUNLOCK(); \ - CODE = copyin(__U((SRC)),(DST),(LEN)); \ + CODE = copyin(__U((SRC)),(DST),(LEN)); \ if (haveGlock) \ AFS_GLOCK(); \ } while(0) diff --git a/src/afs/afs_osi_alloc.c b/src/afs/afs_osi_alloc.c index 8563384..ac1a680 100644 --- a/src/afs/afs_osi_alloc.c +++ b/src/afs/afs_osi_alloc.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c index 6b06ee8..795f75a 100644 --- a/src/afs/afs_osi_pag.c +++ b/src/afs/afs_osi_pag.c @@ -22,8 +22,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ @@ -256,13 +254,13 @@ afs_setpag(void) } #elif defined(AFS_DARWIN80_ENV) { - struct ucred *credp = kauth_cred_proc_ref(p); + struct AFS_UCRED *credp = kauth_cred_proc_ref(p); code = AddPag(p, genpag(), &credp); - kauth_cred_rele(credp); + crfree(credp); } #elif defined(AFS_DARWIN_ENV) { - struct ucred *credp = crdup(p->p_cred->pc_ucred); + struct AFS_UCRED *credp = crdup(p->p_cred->pc_ucred); code = AddPag(p, genpag(), &credp); crfree(credp); } diff --git a/src/afs/afs_osi_uio.c b/src/afs/afs_osi_uio.c index 8b61efe..3248f01 100644 --- a/src/afs/afs_osi_uio.c +++ b/src/afs/afs_osi_uio.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/afs_osi_vget.c b/src/afs/afs_osi_vget.c index aea7f7a..afc91ee 100644 --- a/src/afs/afs_osi_vget.c +++ b/src/afs/afs_osi_vget.c @@ -14,8 +14,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ diff --git a/src/afs/afs_osidnlc.c b/src/afs/afs_osidnlc.c index 82704a3..290353e 100644 --- a/src/afs/afs_osidnlc.c +++ b/src/afs/afs_osidnlc.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c index ab48471..a72ec64 100644 --- a/src/afs/afs_pioctl.c +++ b/src/afs/afs_pioctl.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #ifdef AFS_OBSD_ENV @@ -111,7 +109,7 @@ int HandleIoctl(register struct vcache *avc, register afs_int32 acom, int afs_HandlePioctl(struct vnode *avp, afs_int32 acom, register struct afs_ioctl *ablob, int afollow, struct AFS_UCRED **acred); -static int Prefetch(char *apath, struct afs_ioctl *adata, int afollow, +static int Prefetch(iparmtype apath, struct afs_ioctl *adata, int afollow, struct AFS_UCRED *acred); @@ -225,9 +223,23 @@ afs_ioctl32_to_afs_ioctl(const struct afs_ioctl32 *src, struct afs_ioctl *dst) */ static int +#ifdef AFS_DARWIN100_ENV +copyin_afs_ioctl(user_addr_t cmarg, struct afs_ioctl *dst) +#else copyin_afs_ioctl(caddr_t cmarg, struct afs_ioctl *dst) +#endif { int code; +#if defined(AFS_DARWIN100_ENV) + struct afs_ioctl32 dst32; + + if (!proc_is64bit(current_proc())) { + AFS_COPYIN(cmarg, (caddr_t) & dst32, sizeof dst32, code); + if (!code) + afs_ioctl32_to_afs_ioctl(&dst32, dst); + return code; + } +#endif #if defined(AFS_AIX51_ENV) && defined(AFS_64BIT_KERNEL) struct afs_ioctl32 dst32; @@ -379,7 +391,6 @@ HandleIoctl(register struct vcache *avc, register afs_int32 acom, return code; /* so far, none implemented */ } - #ifdef AFS_AIX_ENV /* For aix we don't temporarily bypass ioctl(2) but rather do our * thing directly in the vnode layer call, VNOP_IOCTL; thus afs_ioctl @@ -853,21 +864,18 @@ afs_pioctl(p, args, retval) int #ifdef AFS_SUN5_ENV -afs_syscall_pioctl(path, com, cmarg, follow, rvp, credp) - rval_t *rvp; - struct AFS_UCRED *credp; +afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow, rval_t *rvp, struct AFS_UCRED *credp) #else -#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) -afs_syscall_pioctl(path, com, cmarg, follow, credp) - struct AFS_UCRED *credp; +#ifdef AFS_DARWIN100_ENV +afs_syscall64_pioctl(user_addr_t path, unsigned int com, user_addr_t cmarg, + int follow, struct AFS_UCRED *credp) +#elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) +afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow, + struct AFS_UCRED *credp) #else -afs_syscall_pioctl(path, com, cmarg, follow) +afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow) #endif #endif - char *path; - unsigned int com; - caddr_t cmarg; - int follow; { struct afs_ioctl data; #ifdef AFS_NEED_CLIENTCONTEXT @@ -969,11 +977,11 @@ afs_syscall_pioctl(path, com, cmarg, follow) foreigncreds ? foreigncreds : credp); #else #ifdef AFS_LINUX22_ENV - code = gop_lookupname(path, AFS_UIOUSER, follow, &dp); + code = gop_lookupname_user(path, AFS_UIOUSER, follow, &dp); if (!code) vp = (struct vnode *)dp->d_inode; #else - code = gop_lookupname(path, AFS_UIOUSER, follow, &vp); + code = gop_lookupname_user(path, AFS_UIOUSER, follow, &vp); #endif /* AFS_LINUX22_ENV */ #endif /* AFS_AIX41_ENV */ AFS_GLOCK(); @@ -1082,6 +1090,17 @@ afs_syscall_pioctl(path, com, cmarg, follow) #endif } +#ifdef AFS_DARWIN100_ENV +int +afs_syscall_pioctl(char * path, unsigned int com, caddr_t cmarg, + int follow, struct AFS_UCRED *credp) +{ + return afs_syscall64_pioctl(CAST_USER_ADDR_T(path), com, + CAST_USER_ADDR_T((unsigned int)cmarg), follow, + credp); +} +#endif + #define MAXPIOCTLTOKENLEN \ (3*sizeof(afs_int32)+MAXKTCTICKETLEN+sizeof(struct ClearToken)+MAXKTCREALMLEN) @@ -2079,7 +2098,7 @@ DECL_PIOCTL(PCheckAuth) } static int -Prefetch(char *apath, struct afs_ioctl *adata, int afollow, +Prefetch(iparmtype apath, struct afs_ioctl *adata, int afollow, struct AFS_UCRED *acred) { register char *tp; diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h index 7ba6922..3a83f17 100644 --- a/src/afs/afs_prototypes.h +++ b/src/afs/afs_prototypes.h @@ -121,6 +121,13 @@ extern int afs_CheckInit(void); extern void afs_shutdown(void); extern void shutdown_afstest(void); extern void afs_shutdown_BKG(void); +extern int afs_syscall_call(long parm, long parm2, long parm3, + long parm4, long parm5, long parm6); +#if defined(AFS_DARWIN100_ENV) +extern int afs_syscall64_call(user_addr_t parm, user_addr_t parm2, + user_addr_t parm3, user_addr_t parm4, + user_addr_t parm5, user_addr_t parm6); +#endif /* afs_callback.c */ @@ -345,6 +352,7 @@ extern int afs_InitCacheFile(char *afile, ino_t ainode); /* afs_dynroot.c */ extern int afs_IsDynrootFid(struct VenusFid *fid); +extern int afs_IsDynrootAnyFid(struct VenusFid *fid); extern void afs_GetDynrootFid(struct VenusFid *fid); extern int afs_IsDynroot(struct vcache *avc); extern void afs_DynrootInvalidate(void); @@ -363,6 +371,7 @@ extern int afs_DynrootVOPSymlink(struct vcache *avc, struct AFS_UCRED *acred, /* afs_exporter.c */ extern struct afs_exporter *root_exported; extern struct afs_exporter *exporter_find(int type); +extern void shutdown_exporter(void); /* afs_init.c */ extern struct cm_initparams cm_initParams; @@ -675,7 +684,24 @@ extern afs_int32 afs_waitForever; extern short afs_waitForeverCount; extern afs_int32 afs_showflags; extern int afs_defaultAsynchrony; -extern int afs_syscall_pioctl(); +#if defined(AFS_DARWIN100_ENV) +extern int afs_syscall64_pioctl(user_addr_t path, unsigned int com, + user_addr_t cmarg, int follow, \ + struct AFS_UCRED *credp); +#endif +#ifdef AFS_SUN5_ENV +extern int afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, + int follow, rval_t *rvp, struct AFS_UCRED *credp); +#elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) +extern int afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, + int follow, struct AFS_UCRED *credp); +#else +extern int afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, + int follow); +#endif +extern int HandleIoctl(register struct vcache *avc, register afs_int32 acom, + struct afs_ioctl *adata); + /* afs_segments.c */ extern int afs_StoreMini(register struct vcache *avc, struct vrequest *areq); @@ -754,7 +780,6 @@ extern void afs_GetCMStat(char **ptr, unsigned *size); extern void afs_AddToMean(struct afs_MeanStats *oldMean, afs_int32 newValue); #endif - /* UKERNEL/afs_usrops.c */ #ifdef UKERNEL extern void uafs_Shutdown(void); diff --git a/src/afs/afs_segments.c b/src/afs/afs_segments.c index 1ff2135..a430c08 100644 --- a/src/afs/afs_segments.c +++ b/src/afs/afs_segments.c @@ -13,8 +13,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c index 4b63afb..703133e 100644 --- a/src/afs/afs_server.c +++ b/src/afs/afs_server.c @@ -32,8 +32,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ diff --git a/src/afs/afs_stat.c b/src/afs/afs_stat.c index 9b0996c..32d36c4 100644 --- a/src/afs/afs_stat.c +++ b/src/afs/afs_stat.c @@ -12,8 +12,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ diff --git a/src/afs/afs_user.c b/src/afs/afs_user.c index 843c0cd..e6841eb 100644 --- a/src/afs/afs_user.c +++ b/src/afs/afs_user.c @@ -13,8 +13,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ diff --git a/src/afs/afs_util.c b/src/afs/afs_util.c index 85a1a8b..e7b3d0d 100644 --- a/src/afs/afs_util.c +++ b/src/afs/afs_util.c @@ -15,8 +15,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c index 3782a41..f56ee03 100644 --- a/src/afs/afs_vcache.c +++ b/src/afs/afs_vcache.c @@ -38,8 +38,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ @@ -1228,7 +1226,7 @@ afs_FlushActiveVcaches(register afs_int32 doflocks) register int i; register struct afs_conn *tc; register afs_int32 code; - register struct AFS_UCRED *cred = NULL; + struct AFS_UCRED *cred = NULL; struct vrequest treq, ureq; struct AFSVolSync tsync; int didCore; diff --git a/src/afs/afs_volume.c b/src/afs/afs_volume.c index 30fa912..a6103ae 100644 --- a/src/afs/afs_volume.c +++ b/src/afs/afs_volume.c @@ -18,8 +18,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ @@ -432,7 +430,7 @@ afs_GetVolume(struct VenusFid *afid, struct vrequest *areq, tv = afs_FindVolume(afid, locktype); if (!tv) { - if (afs_IsDynrootFid(afid)) { + if (afs_IsDynrootAnyFid(afid)) { tv = afs_NewDynrootVolume(afid); } else { bp = afs_cv2string(&tbuf[CVBS], afid->Fid.Volume); diff --git a/src/afsd/.cvsignore b/src/afsd/.cvsignore deleted file mode 100644 index 8dddbec..0000000 --- a/src/afsd/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -AFS_component_version_number.c -Makefile -afs.ppc_darwin.plist -afsd -vsys diff --git a/src/afsd/afs.rc.darwin b/src/afsd/afs.rc.darwin index 4e3fce3..da27714 100644 --- a/src/afsd/afs.rc.darwin +++ b/src/afsd/afs.rc.darwin @@ -82,7 +82,7 @@ StartService() # Start the AFS server processes if a bosserver exists # - if [ -x /usr/afs/bin/bosserver ]; then + if [ -x /usr/afs/bin/bosserver -a -f /usr/afs/local/BosConfig ]; then echo "Starting AFS Server processes" /usr/afs/bin/bosserver AFSD_OPTIONS="$AFSD_OPTIONS -nosettime" @@ -190,6 +190,12 @@ StopService() echo "Unloading AFS kernel extensions" kextunload $VICEETC/afs.kext 2>&1 > /dev/console fi + + if [ -x /usr/afs/bin/bosserver -a -f /usr/afs/local/BosConfig ]; then + echo "Stopping AFS Server processes" + /usr/afs/bin/bos shutdown localhost -local + killall bosserver + fi } RestartService() diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c index e81d131..cfd8730 100644 --- a/src/afsd/afsd.c +++ b/src/afsd/afsd.c @@ -61,8 +61,6 @@ #include #include -RCSID - ("$Header$"); #define VFS 1 @@ -164,12 +162,13 @@ void set_staticaddrs(void); #include #endif #include +#ifndef AFS_DARWIN100_ENV /* Symbols from the DiskArbitration framework */ kern_return_t DiskArbStart(mach_port_t *); kern_return_t DiskArbDiskAppearedWithMountpointPing_auto(char *, unsigned int, char *); #define DISK_ARB_NETWORK_DISK_FLAG 8 - +#endif #include #include #include @@ -2566,6 +2565,7 @@ HandleMTab() #endif /* AFS_SUN5_ENV */ #endif /* unreasonable systems */ #ifdef AFS_DARWIN_ENV +#ifndef AFS_DARWIN100_ENV mach_port_t diskarb_port; kern_return_t status; @@ -2578,14 +2578,15 @@ HandleMTab() } return status; +#endif #endif /* AFS_DARWIN_ENV */ return 0; } #if !defined(AFS_SGI_ENV) && !defined(AFS_AIX32_ENV) - -call_syscall(param1, param2, param3, param4, param5, param6, param7) - long param1, param2, param3, param4, param5, param6, param7; +int +call_syscall(long param1, long param2, long param3, long param4, long param5, + long param6, long param7) { int error; #ifdef AFS_LINUX20_ENV @@ -2614,22 +2615,50 @@ call_syscall(param1, param2, param3, param4, param5, param6, param7) #endif #ifdef AFS_DARWIN80_ENV struct afssysargs syscall_data; + void *ioctldata; int fd = open(SYSCALL_DEV_FNAME,O_RDWR); - syscall_data.syscall = AFSCALL_CALL; - syscall_data.param1 = param1; - syscall_data.param2 = param2; - syscall_data.param3 = param3; - syscall_data.param4 = param4; - syscall_data.param5 = param5; - syscall_data.param6 = param6; + int syscallnum, is64 = 0; +#ifdef AFS_DARWIN100_ENV + struct afssysargs64 syscall64_data; + if (sizeof(param1) == 8) { + syscallnum = VIOC_SYSCALL64; + is64 = 1; + ioctldata = &syscall64_data; + syscall64_data.syscall = (int)AFSCALL_CALL; + syscall64_data.param1 = param1; + syscall64_data.param2 = param2; + syscall64_data.param3 = param3; + syscall64_data.param4 = param4; + syscall64_data.param5 = param5; + syscall64_data.param6 = param6; + } else { +#endif + syscallnum = VIOC_SYSCALL; + ioctldata = &syscall_data; + syscall_data.syscall = AFSCALL_CALL; + syscall_data.param1 = param1; + syscall_data.param2 = param2; + syscall_data.param3 = param3; + syscall_data.param4 = param4; + syscall_data.param5 = param5; + syscall_data.param6 = param6; +#ifdef AFS_DARWIN100_ENV + } +#endif if(fd >= 0) { - error = ioctl(fd, VIOC_SYSCALL, &syscall_data); - close(fd); + error = ioctl(fd, syscallnum, ioctldata); + close(fd); } else { - error = -1; + error = -1; + } + if (!error) { +#ifdef AFS_DARWIN100_ENV + if (is64) + error=syscall64_data.retval; + else +#endif + error=syscall_data.retval; } - if (!error) - error=syscall_data.retval; #else error = syscall(AFS_SYSCALL, AFSCALL_CALL, param1, param2, param3, param4, diff --git a/src/afsd/vsys.c b/src/afsd/vsys.c index a36b5cd..eea70f2 100644 --- a/src/afsd/vsys.c +++ b/src/afsd/vsys.c @@ -17,8 +17,6 @@ #include #endif -RCSID - ("$Header$"); #include diff --git a/src/afsmonitor/.cvsignore b/src/afsmonitor/.cvsignore deleted file mode 100644 index 9206363..0000000 --- a/src/afsmonitor/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -AFS_component_version_number.c -Makefile -afsmonitor diff --git a/src/afsmonitor/afsmon-output.c b/src/afsmonitor/afsmon-output.c index c3403c7..c3d2250 100644 --- a/src/afsmonitor/afsmon-output.c +++ b/src/afsmonitor/afsmon-output.c @@ -21,8 +21,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/afsmonitor/afsmon-parselog.c b/src/afsmonitor/afsmon-parselog.c index 679f12c..645c525 100644 --- a/src/afsmonitor/afsmon-parselog.c +++ b/src/afsmonitor/afsmon-parselog.c @@ -21,8 +21,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/afsmonitor/afsmon-win.c b/src/afsmonitor/afsmon-win.c index 613e5a0..25339d9 100644 --- a/src/afsmonitor/afsmon-win.c +++ b/src/afsmonitor/afsmon-win.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/afsmonitor/afsmonitor.c b/src/afsmonitor/afsmonitor.c index 345004c..64e2e0e 100644 --- a/src/afsmonitor/afsmonitor.c +++ b/src/afsmonitor/afsmonitor.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/afsweb/.cvsignore b/src/afsweb/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/afsweb/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/afsweb/apache_afs_cache.c b/src/afsweb/apache_afs_cache.c index 7260bb4..0fbc447 100644 --- a/src/afsweb/apache_afs_cache.c +++ b/src/afsweb/apache_afs_cache.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include "apache_afs_cache.h" diff --git a/src/afsweb/nsafs.c b/src/afsweb/nsafs.c index 17e41d7..2182d9c 100644 --- a/src/afsweb/nsafs.c +++ b/src/afsweb/nsafs.c @@ -14,8 +14,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include diff --git a/src/afsweb/securehash.c b/src/afsweb/securehash.c index 6c14503..1263f48 100644 --- a/src/afsweb/securehash.c +++ b/src/afsweb/securehash.c @@ -21,8 +21,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include diff --git a/src/afsweb/weblog.c b/src/afsweb/weblog.c index 2a10642..2cd5c6f 100644 --- a/src/afsweb/weblog.c +++ b/src/afsweb/weblog.c @@ -24,8 +24,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/aklog/.cvsignore b/src/aklog/.cvsignore deleted file mode 100644 index 51469b1..0000000 --- a/src/aklog/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -aklog -asetkey -klog diff --git a/src/aklog/aklog_main.c b/src/aklog/aklog_main.c index d62898f..e6cee55 100644 --- a/src/aklog/aklog_main.c +++ b/src/aklog/aklog_main.c @@ -35,8 +35,7 @@ */ #include -RCSID - ("$Header$"); + #include #include #include diff --git a/src/aklog/krb_util.c b/src/aklog/krb_util.c index 8fec55a..1ef5ceb 100644 --- a/src/aklog/krb_util.c +++ b/src/aklog/krb_util.c @@ -10,8 +10,6 @@ */ #include -RCSID - ("$Header$"); #if 0 #include diff --git a/src/aklog/linked_list.c b/src/aklog/linked_list.c index 9a9833c..8bd9c50 100644 --- a/src/aklog/linked_list.c +++ b/src/aklog/linked_list.c @@ -8,8 +8,6 @@ */ #include -RCSID - ("$Header$"); #include #include diff --git a/src/audit/.cvsignore b/src/audit/.cvsignore deleted file mode 100644 index c6c769e..0000000 --- a/src/audit/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -AFS_component_version_number.c -Makefile diff --git a/src/audit/audit.c b/src/audit/audit.c index d42b44f..8dff115 100644 --- a/src/audit/audit.c +++ b/src/audit/audit.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/auth/.cvsignore b/src/auth/.cvsignore deleted file mode 100644 index 897fc3d..0000000 --- a/src/auth/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -AFS_component_version_number.c -Makefile -acfg_errors.c -auth.h -cellconfig.h -copyauth -ktc_errors.c -setkey diff --git a/src/auth/auth.p.h b/src/auth/auth.p.h index d59755c..39a6643 100644 --- a/src/auth/auth.p.h +++ b/src/auth/auth.p.h @@ -37,6 +37,8 @@ extern int ktc_ForgetToken(struct ktc_principal *server); extern int ktc_ForgetAllTokens(void); +afs_uint32 ktc_curpag(void); + #ifdef AFS_NT40_ENV /* Flags for the flag word sent along with a token */ diff --git a/src/auth/authcon.c b/src/auth/authcon.c index 3e03d97..76fff02 100644 --- a/src/auth/authcon.c +++ b/src/auth/authcon.c @@ -14,8 +14,6 @@ #include #endif -RCSID - ("$Header$"); #if defined(UKERNEL) #include "afs/sysincludes.h" diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c index 17c7946..0732f8a 100644 --- a/src/auth/cellconfig.c +++ b/src/auth/cellconfig.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/auth/copyauth.c b/src/auth/copyauth.c index 2ced48a..f3fa69f 100644 --- a/src/auth/copyauth.c +++ b/src/auth/copyauth.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/auth/ktc.c b/src/auth/ktc.c index 32574d5..7dc571a 100644 --- a/src/auth/ktc.c +++ b/src/auth/ktc.c @@ -16,8 +16,6 @@ #include #endif -RCSID - ("$Header$"); #if defined(UKERNEL) #include "afs/sysincludes.h" @@ -61,6 +59,9 @@ RCSID #endif #endif #endif +#ifdef AFS_DARWIN100_ENV +#include +#endif #ifdef HAVE_UNISTD_H #include #endif @@ -920,6 +921,57 @@ ktc_OldPioctl(void) return rc; } +afs_uint32 +ktc_curpag(void) +{ + int code; + struct ViceIoctl iob; + afs_int32 pag; + + /* now setup for the pioctl */ + iob.in = NULL; + iob.in_size = 0; + iob.out = &pag; + iob.out_size = sizeof(afs_int32); + + code = PIOCTL(0, VIOC_GETPAG, &iob, 0); + if (code < 0) { +#if defined(AFS_AIX52_ENV) + code = getpagvalue("afs"); + if (code < 0 && errno == EINVAL) + code = 0; + return code; +#elif defined(AFS_AIX51_ENV) + return -1; +#else + gid_t groups[NGROUPS_MAX]; + afs_uint32 g0, g1; + afs_uint32 h, l, ret; + + if (getgroups(sizeof groups / sizeof groups[0], groups) < 2) + return 0; + + g0 = groups[0] & 0xffff; + g1 = groups[1] & 0xffff; + g0 -= 0x3f00; + g1 -= 0x3f00; + if (g0 < 0xc000 && g1 < 0xc000) { + l = ((g0 & 0x3fff) << 14) | (g1 & 0x3fff); + h = (g0 >> 14); + h = (g1 >> 14) + h + h + h; + ret = ((h << 28) | l); + /* Additional testing */ + if (((ret >> 24) & 0xff) == 'A') + return ret; + else + return -1; + } + return -1; +#endif + } + return pag; +} + #ifdef AFS_KERBEROS_ENV /* @@ -1613,61 +1665,14 @@ afs_tf_dest_tkt(void) return 0; } -afs_uint32 -ktc_curpag(void) -{ - int code; - struct ViceIoctl iob; - afs_int32 pag; - - /* now setup for the pioctl */ - iob.in = NULL; - iob.in_size = 0; - iob.out = &pag; - iob.out_size = sizeof(afs_int32); - - code = PIOCTL(0, VIOC_GETPAG, &iob, 0); - if (code < 0) { -#if defined(AFS_AIX52_ENV) - code = getpagvalue("afs"); - if (code < 0 && errno == EINVAL) - code = 0; - return code; -#elif defined(AFS_AIX51_ENV) - return -1; -#else - gid_t groups[NGROUPS_MAX]; - afs_uint32 g0, g1; - afs_uint32 h, l, ret; - - if (getgroups(sizeof groups / sizeof groups[0], groups) < 2) - return 0; - - g0 = groups[0] & 0xffff; - g1 = groups[1] & 0xffff; - g0 -= 0x3f00; - g1 -= 0x3f00; - if (g0 < 0xc000 && g1 < 0xc000) { - l = ((g0 & 0x3fff) << 14) | (g1 & 0x3fff); - h = (g0 >> 14); - h = (g1 >> 14) + h + h + h; - ret = ((h << 28) | l); - /* Additional testing */ - if (((ret >> 24) & 0xff) == 'A') - return ret; - else - return -1; - } - return -1; -#endif - } - return pag; -} - int ktc_newpag(void) { - extern char **environ; +#ifdef AFS_DARWIN100_ENV +#define environ (*_NSGetEnviron()) +#else +extern char **environ; +#endif afs_uint32 pag; struct stat sbuf; diff --git a/src/auth/ktc_nt.c b/src/auth/ktc_nt.c index 10bd995..1da0eb0 100644 --- a/src/auth/ktc_nt.c +++ b/src/auth/ktc_nt.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/auth/setkey.c b/src/auth/setkey.c index 86081d7..aabc0c1 100644 --- a/src/auth/setkey.c +++ b/src/auth/setkey.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/auth/test/.cvsignore b/src/auth/test/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/auth/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/auth/test/ktctest.c b/src/auth/test/ktctest.c index e745b8e..72c461a 100644 --- a/src/auth/test/ktctest.c +++ b/src/auth/test/ktctest.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/auth/test/testcellconf.c b/src/auth/test/testcellconf.c index 1bc9cae..d37322c 100644 --- a/src/auth/test/testcellconf.c +++ b/src/auth/test/testcellconf.c @@ -25,8 +25,6 @@ Creation date: #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/auth/userok.c b/src/auth/userok.c index d1dc286..b95366b 100644 --- a/src/auth/userok.c +++ b/src/auth/userok.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/auth/writeconfig.c b/src/auth/writeconfig.c index 937a2d4..4e92071 100644 --- a/src/auth/writeconfig.c +++ b/src/auth/writeconfig.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bozo/.cvsignore b/src/bozo/.cvsignore deleted file mode 100644 index 73aff8d..0000000 --- a/src/bozo/.cvsignore +++ /dev/null @@ -1,11 +0,0 @@ -AFS_component_version_number.c -Makefile -bnode.h -bos -bos_util -boserr.c -bosint.cs.c -bosint.h -bosint.ss.c -bosint.xdr.c -bosserver diff --git a/src/bozo/bnode.c b/src/bozo/bnode.c index acd73f3..9caa2de 100644 --- a/src/bozo/bnode.c +++ b/src/bozo/bnode.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bozo/bos.c b/src/bozo/bos.c index 75da894..480e95f 100644 --- a/src/bozo/bos.c +++ b/src/bozo/bos.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bozo/bos_util.c b/src/bozo/bos_util.c index c29b797..33d4381 100644 --- a/src/bozo/bos_util.c +++ b/src/bozo/bos_util.c @@ -22,8 +22,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bozo/bosoprocs.c b/src/bozo/bosoprocs.c index c1466da..be3cf34 100644 --- a/src/bozo/bosoprocs.c +++ b/src/bozo/bosoprocs.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c index b9c660d..60c7df1 100644 --- a/src/bozo/bosserver.c +++ b/src/bozo/bosserver.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bozo/cronbnodeops.c b/src/bozo/cronbnodeops.c index 6c80b71..c043b71 100644 --- a/src/bozo/cronbnodeops.c +++ b/src/bozo/cronbnodeops.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bozo/ezbnodeops.c b/src/bozo/ezbnodeops.c index 681e59a..11ae2f6 100644 --- a/src/bozo/ezbnodeops.c +++ b/src/bozo/ezbnodeops.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bozo/fsbnodeops.c b/src/bozo/fsbnodeops.c index 0a04428..09659ec 100644 --- a/src/bozo/fsbnodeops.c +++ b/src/bozo/fsbnodeops.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bozo/smail-notifier.c b/src/bozo/smail-notifier.c index b7670e0..b393232 100644 --- a/src/bozo/smail-notifier.c +++ b/src/bozo/smail-notifier.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bozo/test/.cvsignore b/src/bozo/test/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/bozo/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/bu_utils/.cvsignore b/src/bu_utils/.cvsignore deleted file mode 100644 index 52ef737..0000000 --- a/src/bu_utils/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -AFS_component_version_number.c -Makefile -fms diff --git a/src/bu_utils/fms.c b/src/bu_utils/fms.c index 83067f5..5700dde 100644 --- a/src/bu_utils/fms.c +++ b/src/bu_utils/fms.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #undef IN #include diff --git a/src/bubasics/.cvsignore b/src/bubasics/.cvsignore deleted file mode 100644 index 1c5c0f3..0000000 --- a/src/bubasics/.cvsignore +++ /dev/null @@ -1,16 +0,0 @@ -AFS_component_version_number.c -Makefile -bumon.cs.c -bumon.h -bumon.ss.c -bumon.xdr.c -butc.cs.c -butc.h -butc.ss.c -butc.xdr.c -butc_errs.c -butm.h -butm_errs.c -butx.h -butx_errs.c -tcdata.h diff --git a/src/bucoord/.cvsignore b/src/bucoord/.cvsignore deleted file mode 100644 index aa247c2..0000000 --- a/src/bucoord/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -AFS_component_version_number.c -Makefile -backup -bc.h -bucoord_errs.c diff --git a/src/bucoord/bc_status.c b/src/bucoord/bc_status.c index e7f3136..16f8b22 100644 --- a/src/bucoord/bc_status.c +++ b/src/bucoord/bc_status.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bucoord/commands.c b/src/bucoord/commands.c index 8206ef8..4d488c7 100644 --- a/src/bucoord/commands.c +++ b/src/bucoord/commands.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #if defined(AFS_LINUX24_ENV) diff --git a/src/bucoord/config.c b/src/bucoord/config.c index 2801d59..ecdee26 100644 --- a/src/bucoord/config.c +++ b/src/bucoord/config.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/bucoord/dlq.c b/src/bucoord/dlq.c index 4a85e28..ed96101 100644 --- a/src/bucoord/dlq.c +++ b/src/bucoord/dlq.c @@ -14,9 +14,6 @@ #endif #include -RCSID - ("$Header$"); - #include "bc.h" #include diff --git a/src/bucoord/dsstub.c b/src/bucoord/dsstub.c index 7ed4fb7..9059fee 100644 --- a/src/bucoord/dsstub.c +++ b/src/bucoord/dsstub.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bucoord/dsvs.c b/src/bucoord/dsvs.c index d65c503..0468ccf 100644 --- a/src/bucoord/dsvs.c +++ b/src/bucoord/dsvs.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bucoord/dump.c b/src/bucoord/dump.c index 0357888..96b2d0b 100644 --- a/src/bucoord/dump.c +++ b/src/bucoord/dump.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bucoord/dump_sched.c b/src/bucoord/dump_sched.c index 04d0fdf..137c4e6 100644 --- a/src/bucoord/dump_sched.c +++ b/src/bucoord/dump_sched.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/bucoord/expire.c b/src/bucoord/expire.c index b7e7c90..ae417fe 100644 --- a/src/bucoord/expire.c +++ b/src/bucoord/expire.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bucoord/main.c b/src/bucoord/main.c index 20fbe5d..f8f93af 100644 --- a/src/bucoord/main.c +++ b/src/bucoord/main.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bucoord/restore.c b/src/bucoord/restore.c index 913cf36..b2f1dcb 100644 --- a/src/bucoord/restore.c +++ b/src/bucoord/restore.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bucoord/server.c b/src/bucoord/server.c index b7672ec..b6bc13c 100644 --- a/src/bucoord/server.c +++ b/src/bucoord/server.c @@ -11,8 +11,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/bucoord/status.c b/src/bucoord/status.c index 956d93f..6981d7d 100644 --- a/src/bucoord/status.c +++ b/src/bucoord/status.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bucoord/tape_hosts.c b/src/bucoord/tape_hosts.c index 73c3fd8..b43a5f7 100644 --- a/src/bucoord/tape_hosts.c +++ b/src/bucoord/tape_hosts.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bucoord/ubik_db_if.c b/src/bucoord/ubik_db_if.c index a218413..12ecf59 100644 --- a/src/bucoord/ubik_db_if.c +++ b/src/bucoord/ubik_db_if.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bucoord/vol_sets.c b/src/bucoord/vol_sets.c index 3333daf..992fca7 100644 --- a/src/bucoord/vol_sets.c +++ b/src/bucoord/vol_sets.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/bucoord/volstub.c b/src/bucoord/volstub.c index d143df1..531a44f 100644 --- a/src/bucoord/volstub.c +++ b/src/bucoord/volstub.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/budb/.cvsignore b/src/budb/.cvsignore deleted file mode 100644 index b3add3e..0000000 --- a/src/budb/.cvsignore +++ /dev/null @@ -1,10 +0,0 @@ -AFS_component_version_number.c -Makefile -budb.cs.c -budb.h -budb.ss.c -budb.xdr.c -budb_client.h -budb_errs.c -budb_errs.h -budb_server diff --git a/src/budb/database.c b/src/budb/database.c index fa64aa2..97d8625 100644 --- a/src/budb/database.c +++ b/src/budb/database.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/budb/db_alloc.c b/src/budb/db_alloc.c index c1bce25..ae0a529 100644 --- a/src/budb/db_alloc.c +++ b/src/budb/db_alloc.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/budb/db_dump.c b/src/budb/db_dump.c index 4d0a11e..9efa9ed 100644 --- a/src/budb/db_dump.c +++ b/src/budb/db_dump.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/budb/db_hash.c b/src/budb/db_hash.c index 0b61267..2a2dafe 100644 --- a/src/budb/db_hash.c +++ b/src/budb/db_hash.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/budb/db_lock.c b/src/budb/db_lock.c index d4a6d1a..2707e60 100644 --- a/src/budb/db_lock.c +++ b/src/budb/db_lock.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/budb/db_text.c b/src/budb/db_text.c index 9589cb4..9e38bdc 100644 --- a/src/budb/db_text.c +++ b/src/budb/db_text.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/budb/dbs_dump.c b/src/budb/dbs_dump.c index 081c9d6..2f0927c 100644 --- a/src/budb/dbs_dump.c +++ b/src/budb/dbs_dump.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/budb/ol_verify.c b/src/budb/ol_verify.c index 4de92bf..b7b83b0 100644 --- a/src/budb/ol_verify.c +++ b/src/budb/ol_verify.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/budb/procs.c b/src/budb/procs.c index 2ad1be0..43f4285 100644 --- a/src/budb/procs.c +++ b/src/budb/procs.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/budb/server.c b/src/budb/server.c index c496c11..bcff72f 100644 --- a/src/budb/server.c +++ b/src/budb/server.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/budb/struct_ops.c b/src/budb/struct_ops.c index ac19a07..34d9384 100644 --- a/src/budb/struct_ops.c +++ b/src/budb/struct_ops.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/butc/.cvsignore b/src/butc/.cvsignore deleted file mode 100644 index e561bc5..0000000 --- a/src/butc/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -AFS_component_version_number.c -Makefile -butc -read_tape diff --git a/src/butc/butc_xbsa.c b/src/butc/butc_xbsa.c index 66ee315..1890759 100644 --- a/src/butc/butc_xbsa.c +++ b/src/butc/butc_xbsa.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/butc/dbentries.c b/src/butc/dbentries.c index f44d3a9..5ab88b4 100644 --- a/src/butc/dbentries.c +++ b/src/butc/dbentries.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/butc/dump.c b/src/butc/dump.c index 5c08b67..e7ea6e9 100644 --- a/src/butc/dump.c +++ b/src/butc/dump.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/butc/list.c b/src/butc/list.c index 880a1b8..ca4be73 100644 --- a/src/butc/list.c +++ b/src/butc/list.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifndef AFS_NT40_ENV #include diff --git a/src/butc/lwps.c b/src/butc/lwps.c index 8c7eb3c..4e09474 100644 --- a/src/butc/lwps.c +++ b/src/butc/lwps.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/butc/read_tape.c b/src/butc/read_tape.c index 0e12480..09c1e31 100644 --- a/src/butc/read_tape.c +++ b/src/butc/read_tape.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/butc/recoverDb.c b/src/butc/recoverDb.c index 1d60e73..faf5ac9 100644 --- a/src/butc/recoverDb.c +++ b/src/butc/recoverDb.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c index 67fbee8..3bd6fe8 100644 --- a/src/butc/tcmain.c +++ b/src/butc/tcmain.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c index 20126ca..f118ca2 100644 --- a/src/butc/tcprocs.c +++ b/src/butc/tcprocs.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/butc/tcstatus.c b/src/butc/tcstatus.c index 08cbfb9..7f06ab5 100644 --- a/src/butc/tcstatus.c +++ b/src/butc/tcstatus.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/butc/tcudbprocs.c b/src/butc/tcudbprocs.c index c090012..fbd6003 100644 --- a/src/butc/tcudbprocs.c +++ b/src/butc/tcudbprocs.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/butc/test_budb.c b/src/butc/test_budb.c index baa6af3..1289649 100644 --- a/src/butc/test_budb.c +++ b/src/butc/test_budb.c @@ -13,8 +13,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/butm/.cvsignore b/src/butm/.cvsignore deleted file mode 100644 index c6c769e..0000000 --- a/src/butm/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -AFS_component_version_number.c -Makefile diff --git a/src/butm/butm_test.c b/src/butm/butm_test.c index 4fe7997..b487c45 100644 --- a/src/butm/butm_test.c +++ b/src/butm/butm_test.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/butm/file_tm.c b/src/butm/file_tm.c index 1e858d3..4d8126c 100644 --- a/src/butm/file_tm.c +++ b/src/butm/file_tm.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/butm/test_ftm.c b/src/butm/test_ftm.c index 2942b92..248d87d 100644 --- a/src/butm/test_ftm.c +++ b/src/butm/test_ftm.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index 361c0b5..eb95bcb 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -545,7 +545,27 @@ case $AFS_SYSNAME in EXTRA_VLIBOBJS="fstab.o" SHLIB_LINKER="${MT_CC} -dynamiclib" SHLIB_SUFFIX="dylib" - RANLIB="ranlib -c" + RANLIB="ranlib" + ;; + + *_darwin_100) + AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation" + LEX="lex -l" + MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}' + MT_LIBS="-lresolv" + KROOT= + KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers' + LD="cc" + KERN_OPTMZ="-Os" + LWP_OPTMZ="-Os" + OPTMZ="-Os" + PAM_LIBS="-lpam" + REGEX_OBJ="regex.o" + TXLIBS="-lncurses" + EXTRA_VLIBOBJS="fstab.o" + SHLIB_LINKER="${MT_CC} -dynamiclib" + SHLIB_SUFFIX="dylib" + RANLIB="ranlib" ;; ppc_linux*) diff --git a/src/cmd/.cvsignore b/src/cmd/.cvsignore deleted file mode 100644 index 0e2d975..0000000 --- a/src/cmd/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -AFS_component_version_number.c -Makefile -cmd.h -cmd_errors.c diff --git a/src/cmd/cmd.c b/src/cmd/cmd.c index fab9e13..25e9e02 100644 --- a/src/cmd/cmd.c +++ b/src/cmd/cmd.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/cmd/test/.cvsignore b/src/cmd/test/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/cmd/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/cmd/test/ctest.c b/src/cmd/test/ctest.c index 4d1bcbb..7784189 100644 --- a/src/cmd/test/ctest.c +++ b/src/cmd/test/ctest.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include "cmd.h" #include diff --git a/src/cmd/test/dtest.c b/src/cmd/test/dtest.c index f9577a2..f64d74b 100644 --- a/src/cmd/test/dtest.c +++ b/src/cmd/test/dtest.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include "cmd.h" #include diff --git a/src/cmd/test/itest.c b/src/cmd/test/itest.c index f6060e1..0c577b8 100644 --- a/src/cmd/test/itest.c +++ b/src/cmd/test/itest.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include "cmd.h" #include diff --git a/src/comerr/.cvsignore b/src/comerr/.cvsignore deleted file mode 100644 index 8f618b1..0000000 --- a/src/comerr/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -AFS_component_version_number.c -Makefile -compile_et -et_lex.lex.c -y.tab.h diff --git a/src/comerr/com_err.c b/src/comerr/com_err.c index 18b02bb..65af193 100644 --- a/src/comerr/com_err.c +++ b/src/comerr/com_err.c @@ -7,8 +7,6 @@ #include #include -RCSID - ("$Header$"); #include "internal.h" #include diff --git a/src/comerr/compile_et.c b/src/comerr/compile_et.c index ca37a98..1cd46d2 100644 --- a/src/comerr/compile_et.c +++ b/src/comerr/compile_et.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/comerr/error_msg.c b/src/comerr/error_msg.c index 00b6feb..312697a 100644 --- a/src/comerr/error_msg.c +++ b/src/comerr/error_msg.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include "internal.h" #include diff --git a/src/comerr/error_table.y b/src/comerr/error_table.y index 708f07a..97dc91a 100644 --- a/src/comerr/error_table.y +++ b/src/comerr/error_table.y @@ -2,8 +2,6 @@ #include #include -RCSID("$Header$"); - /* * * Copyright 1986, 1987 by the MIT Student Information Processing Board diff --git a/src/comerr/error_table_nt.c b/src/comerr/error_table_nt.c index 20081ba..f269c6b 100755 --- a/src/comerr/error_table_nt.c +++ b/src/comerr/error_table_nt.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); /* diff --git a/src/comerr/et_name.c b/src/comerr/et_name.c index 1b840c7..002217d 100644 --- a/src/comerr/et_name.c +++ b/src/comerr/et_name.c @@ -8,8 +8,6 @@ #include #include -RCSID - ("$Header$"); #include "error_table.h" #include "mit-sipb-cr.h" diff --git a/src/comerr/test/.cvsignore b/src/comerr/test/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/comerr/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/comerr/test/test.c b/src/comerr/test/test.c index eb8c72e..2babc5f 100644 --- a/src/comerr/test/test.c +++ b/src/comerr/test/test.c @@ -1,8 +1,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/config/.cvsignore b/src/config/.cvsignore deleted file mode 100644 index a4890fb..0000000 --- a/src/config/.cvsignore +++ /dev/null @@ -1,14 +0,0 @@ -AFS_component_version_number.c -Makefile -Makefile.*_*[0123456789] -Makefile.*_*[0123456789].in -Makefile.version -Makefile.version-CML -Makefile.version-NOCML -afsconfig.h -afsconfig.h.in -config -mkvers -param.h.new -Makefile.config -stamp-h1 diff --git a/src/config/.gitignore b/src/config/.gitignore index 06916db..3a457ad 100644 --- a/src/config/.gitignore +++ b/src/config/.gitignore @@ -7,6 +7,7 @@ /Makefile.config /Makefile.version /Makefile.version-NOCML +/Makefile.version-CML /afsconfig.h /afsconfig.h.in /config diff --git a/src/config/afs_args.h b/src/config/afs_args.h index 1f8ca28..c0b74d6 100644 --- a/src/config/afs_args.h +++ b/src/config/afs_args.h @@ -217,17 +217,30 @@ struct afsprocdata32 { #ifdef AFS_DARWIN80_ENV struct afssysargs { - unsigned long syscall; - unsigned long param1; - unsigned long param2; - unsigned long param3; - unsigned long param4; - unsigned long param5; - unsigned long param6; - unsigned long retval; + unsigned int syscall; + unsigned int param1; + unsigned int param2; + unsigned int param3; + unsigned int param4; + unsigned int param5; + unsigned int param6; + unsigned int retval; +}; + +/* args reordered to avoid alignment issues */ +struct afssysargs64 { + user_addr_t param1; + user_addr_t param2; + user_addr_t param3; + user_addr_t param4; + user_addr_t param5; + user_addr_t param6; + unsigned int syscall; + unsigned int retval; }; #define VIOC_SYSCALL_TYPE 'C' #define VIOC_SYSCALL _IOWR(VIOC_SYSCALL_TYPE,1,struct afssysargs) +#define VIOC_SYSCALL64 _IOWR(VIOC_SYSCALL_TYPE,2,struct afssysargs64) #define SYSCALL_DEV_FNAME "/dev/openafs_ioctl" #endif diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h index 5ccbd28..9468922 100644 --- a/src/config/afs_sysnames.h +++ b/src/config/afs_sysnames.h @@ -62,6 +62,10 @@ #define SYS_NAME_ID_x86_darwin_80 509 #define SYS_NAME_ID_ppc_darwin_90 510 #define SYS_NAME_ID_x86_darwin_90 511 +#define SYS_NAME_ID_ppc_darwin_100 512 +#define SYS_NAME_ID_ppc64_darwin_100 513 +#define SYS_NAME_ID_x86_darwin_100 514 +#define SYS_NAME_ID_amd64_darwin_100 515 #define SYS_NAME_ID_next_mach20 601 #define SYS_NAME_ID_next_mach30 602 diff --git a/src/config/afsconfig-windows.h b/src/config/afsconfig-windows.h index bf51984..c0ce4f4 100644 --- a/src/config/afsconfig-windows.h +++ b/src/config/afsconfig-windows.h @@ -186,9 +186,6 @@ #undef PACKAGE #undef VERSION -#define RCSID(msg) \ -static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } - #undef HAVE_CONNECT //#undef HAVE_GETHOSTBYNAME #undef HAVE_RES_SEARCH diff --git a/src/config/param.x86_darwin_100.h b/src/config/param.x86_darwin_100.h index 49cdd44..b45d6fd 100644 --- a/src/config/param.x86_darwin_100.h +++ b/src/config/param.x86_darwin_100.h @@ -10,7 +10,7 @@ #define AFS_64BIT_IOPS_ENV 1 #if defined(__ppc__) #define AFS_PPC_ENV 1 -#elif defined(__i386__) +#elif defined(__i386__) || defined(__amd64__) #define AFS_X86_ENV 1 #else #error Unsupported architecture @@ -32,6 +32,7 @@ #define AFS_NAMEI_ENV 1 #define DARWIN_REFBASE 3 #define AFS_CACHE_VNODE_PATH +#define NEED_IOCTL32 /* File system entry (used if mount.h doesn't define MOUNT_AFS */ #define AFS_MOUNT_AFS "afs" @@ -49,7 +50,20 @@ #define SYS_NAME "ppc_darwin_100" #define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_100 #define AFSBIG_ENDIAN 1 -#elif defined(__i386__) +#elif defined(__ppc64__) +#define sys_ppc_darwin_12 1 +#define sys_ppc_darwin_13 1 +#define sys_ppc_darwin_14 1 +#define sys_ppc_darwin_60 1 +#define sys_ppc_darwin_70 1 +#define sys_ppc_darwin_80 1 +#define sys_ppc_darwin_90 1 +#define sys_ppc_darwin_100 1 +#define sys_ppc64_darwin_100 1 +#define SYS_NAME "ppc64_darwin_100" +#define SYS_NAME_ID SYS_NAME_ID_ppc64_darwin_100 +#define AFSBIG_ENDIAN 1 +#elif defined(__i386__) #define sys_x86_darwin_12 1 #define sys_x86_darwin_13 1 #define sys_x86_darwin_14 1 @@ -61,6 +75,19 @@ #define SYS_NAME "x86_darwin_100" #define SYS_NAME_ID SYS_NAME_ID_x86_darwin_100 #define AFSLITTLE_ENDIAN 1 +#elif defined(__amd64__) +#define sys_x86_darwin_12 1 +#define sys_x86_darwin_13 1 +#define sys_x86_darwin_14 1 +#define sys_x86_darwin_60 1 +#define sys_x86_darwin_70 1 +#define sys_x86_darwin_80 1 +#define sys_x86_darwin_90 1 +#define sys_x86_darwin_100 1 +#define sys_amd64_darwin_100 1 +#define SYS_NAME "amd64_darwin_100" +#define SYS_NAME_ID SYS_NAME_ID_amd64_darwin_100 +#define AFSLITTLE_ENDIAN 1 #else #error Unsupported architecture #endif @@ -111,7 +138,7 @@ #define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ #if defined(__ppc__) #define AFS_PPC_ENV 1 -#elif defined(__i386__) +#elif defined(__i386__) || defined(__amd64__) #define AFS_X86_ENV 1 #else #error Unsupported architecture @@ -158,6 +185,18 @@ #define SYS_NAME "x86_darwin_100" #define SYS_NAME_ID SYS_NAME_ID_x86_darwin_100 #define AFSLITTLE_ENDIAN 1 +#elif defined(__amd64__) +#define sys_x86_darwin_12 1 +#define sys_x86_darwin_13 1 +#define sys_x86_darwin_14 1 +#define sys_x86_darwin_60 1 +#define sys_x86_darwin_70 1 +#define sys_x86_darwin_80 1 +#define sys_x86_darwin_100 1 +#define sys_amd64_darwin_100 1 +#define SYS_NAME "amd64_darwin_100" +#define SYS_NAME_ID SYS_NAME_ID_amd64_darwin_100 +#define AFSLITTLE_ENDIAN 1 #else #error Unsupported architecture #endif diff --git a/src/dauth/dlog.c b/src/dauth/dlog.c index 38eb716..c176598 100644 --- a/src/dauth/dlog.c +++ b/src/dauth/dlog.c @@ -71,9 +71,6 @@ #include #include -RCSID - ("$Header$"); - #include #include #include diff --git a/src/dauth/dpass.c b/src/dauth/dpass.c index 5580f8c..b26580e 100644 --- a/src/dauth/dpass.c +++ b/src/dauth/dpass.c @@ -18,9 +18,6 @@ #include #include -RCSID - ("$Header$"); - #include #include #include diff --git a/src/des/.cvsignore b/src/des/.cvsignore deleted file mode 100644 index e6d4fd8..0000000 --- a/src/des/.cvsignore +++ /dev/null @@ -1,16 +0,0 @@ -AFS_component_version_number.c -Makefile -fp.c -ip.c -key_perm.h -make_fp -make_ip -make_keyperm -make_odd -make_p -make_p_table -make_s_table -odd.h -p.c -p_table.h -s_table.h diff --git a/src/des/cbc_encrypt.c b/src/des/cbc_encrypt.c index a2c8a52..65bbd3a 100644 --- a/src/des/cbc_encrypt.c +++ b/src/des/cbc_encrypt.c @@ -28,8 +28,6 @@ #include #include "des_prototypes.h" -RCSID - ("$Header$"); #define XPRT_CBC_ENCRYPT diff --git a/src/des/cksum.c b/src/des/cksum.c index fdb24f7..9e570ed 100644 --- a/src/des/cksum.c +++ b/src/des/cksum.c @@ -20,8 +20,6 @@ #include #include -RCSID - ("$Header$"); #include #ifndef KERNEL diff --git a/src/des/conf-darwin.h b/src/des/conf-darwin.h index 2bf8e1f..f686e46 100644 --- a/src/des/conf-darwin.h +++ b/src/des/conf-darwin.h @@ -1,9 +1,9 @@ #define BITS32 #define BIG #undef BSDUNIX -#if defined(__ppc__) +#if defined(__ppc__) || defined(__ppc64__) #define MSBFIRST -#elif defined(__i386__) +#elif defined(__i386__) || defined(__amd64__) #define LSBFIRST #else #error "MSBFIRST or LSBFIRST undefined" diff --git a/src/des/crypt.c b/src/des/crypt.c index 72a1883..346ef50 100644 --- a/src/des/crypt.c +++ b/src/des/crypt.c @@ -37,8 +37,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/des/debug_decl.c b/src/des/debug_decl.c index 682380c..1a4a5b5 100644 --- a/src/des/debug_decl.c +++ b/src/des/debug_decl.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include int des_debug = 0; diff --git a/src/des/des.c b/src/des/des.c index 0990217..8b6be51 100644 --- a/src/des/des.c +++ b/src/des/des.c @@ -36,8 +36,6 @@ #include #include -RCSID - ("$Header$"); #ifndef KERNEL #include diff --git a/src/des/enc.c b/src/des/enc.c index 1642cca..5dc8dba 100644 --- a/src/des/enc.c +++ b/src/des/enc.c @@ -8,8 +8,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/des/key_parity.c b/src/des/key_parity.c index 23bedd6..1f0217d 100644 --- a/src/des/key_parity.c +++ b/src/des/key_parity.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/des/key_sched.c b/src/des/key_sched.c index a49354f..8fa71fa 100644 --- a/src/des/key_sched.c +++ b/src/des/key_sched.c @@ -30,8 +30,6 @@ #include #include -RCSID - ("$Header$"); #include #include "des_internal.h" diff --git a/src/des/main.c b/src/des/main.c index 0248663..13cadc7 100644 --- a/src/des/main.c +++ b/src/des/main.c @@ -13,8 +13,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/des/make_e.c b/src/des/make_e.c index 264f9f5..11be537 100644 --- a/src/des/make_e.c +++ b/src/des/make_e.c @@ -11,8 +11,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/des/make_fp.c b/src/des/make_fp.c index 7c9b32d..74e8b74 100644 --- a/src/des/make_fp.c +++ b/src/des/make_fp.c @@ -11,8 +11,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/des/make_ip.c b/src/des/make_ip.c index 3b9624c..5d699bb 100644 --- a/src/des/make_ip.c +++ b/src/des/make_ip.c @@ -11,8 +11,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/des/make_keyperm.c b/src/des/make_keyperm.c index 858eb5c..a83be8f 100644 --- a/src/des/make_keyperm.c +++ b/src/des/make_keyperm.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/des/make_odd.c b/src/des/make_odd.c index b8ce5ec..c5978c7 100644 --- a/src/des/make_odd.c +++ b/src/des/make_odd.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/des/make_p.c b/src/des/make_p.c index 9764571..1e61e48 100644 --- a/src/des/make_p.c +++ b/src/des/make_p.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include @@ -40,12 +38,12 @@ gen(FILE * stream) fprintf(stream, " P_temp_p = (unsigned char *) &P_temp;\n"); #ifdef AFS_DARWIN80_ENV - fprintf(stream, "#if defined(__i386__)\n"); + fprintf(stream, "#if defined(__i386__) || defined(__amd64__)\n"); fprintf(stream, " R2 = P_prime[0][*P_temp_p++];\n"); fprintf(stream, " R2 |= P_prime[1][*P_temp_p++];\n"); fprintf(stream, " R2 |= P_prime[2][*P_temp_p++];\n"); fprintf(stream, " R2 |= P_prime[3][*P_temp_p];\n"); - fprintf(stream, "#elif defined(__ppc__)\n"); + fprintf(stream, "#elif defined(__ppc__) || defined(__ppc64__)\n"); fprintf(stream, " R2 = P_prime[3][*P_temp_p++];\n"); fprintf(stream, " R2 |= P_prime[2][*P_temp_p++];\n"); fprintf(stream, " R2 |= P_prime[1][*P_temp_p++];\n"); diff --git a/src/des/make_p_table.c b/src/des/make_p_table.c index ffcc5f5..d162917 100644 --- a/src/des/make_p_table.c +++ b/src/des/make_p_table.c @@ -9,8 +9,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/des/make_s.c b/src/des/make_s.c index 0801d82..be25405 100644 --- a/src/des/make_s.c +++ b/src/des/make_s.c @@ -8,8 +8,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/des/make_s_table.c b/src/des/make_s_table.c index 953d2b6..5f2f314 100644 --- a/src/des/make_s_table.c +++ b/src/des/make_s_table.c @@ -8,8 +8,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/des/misc.c b/src/des/misc.c index 26ccab6..7d0e129 100644 --- a/src/des/misc.c +++ b/src/des/misc.c @@ -13,8 +13,6 @@ #include #include -RCSID - ("$Header$"); #include #ifndef KERNEL @@ -272,8 +270,8 @@ swap_long_bytes_bit_number(afs_uint32 x) #if !defined(KERNEL) && defined(AFS_DARWIN80_ENV) char *_darwin_whichstr[] = { - "#if defined(__ppc__)\n", - "#elif defined(__i386__)\n", + "#if defined(__ppc__) || defined(__ppc64__)\n", + "#elif defined(__i386__) || defined(__amd64__)\n", "#else\n#error architecture unsupported\n#endif\n" }; int _darwin_which = 1; diff --git a/src/des/new_rnd_key.c b/src/des/new_rnd_key.c index 91a4b60..a2659c3 100644 --- a/src/des/new_rnd_key.c +++ b/src/des/new_rnd_key.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #ifndef KERNEL #include diff --git a/src/des/pcbc_encrypt.c b/src/des/pcbc_encrypt.c index 19bcb87..2f2e943 100644 --- a/src/des/pcbc_encrypt.c +++ b/src/des/pcbc_encrypt.c @@ -29,8 +29,6 @@ #include #include "des_prototypes.h" -RCSID - ("$Header$"); #include "des_internal.h" diff --git a/src/des/quad_cksum.c b/src/des/quad_cksum.c index 7ca92de..7b9ff7a 100644 --- a/src/des/quad_cksum.c +++ b/src/des/quad_cksum.c @@ -66,8 +66,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/des/read_pssword.c b/src/des/read_pssword.c index 4105dbe..1d2e08a 100644 --- a/src/des/read_pssword.c +++ b/src/des/read_pssword.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/des/strng_to_key.c b/src/des/strng_to_key.c index d7e0128..6bad34f 100644 --- a/src/des/strng_to_key.c +++ b/src/des/strng_to_key.c @@ -24,8 +24,6 @@ #include #include -RCSID - ("$Header$"); #ifndef KERNEL #include diff --git a/src/des/test/.cvsignore b/src/des/test/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/des/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/des/test/key_test.c b/src/des/test/key_test.c index f88770d..0ba5efb 100644 --- a/src/des/test/key_test.c +++ b/src/des/test/key_test.c @@ -11,8 +11,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/des/test/testit.c b/src/des/test/testit.c index 32523f1..2f64f42 100644 --- a/src/des/test/testit.c +++ b/src/des/test/testit.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #define MIN_ARGC 0 /* min # args, not incl flags */ diff --git a/src/des/test/verify.c b/src/des/test/verify.c index 7a4d662..c4f59c3 100644 --- a/src/des/test/verify.c +++ b/src/des/test/verify.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); extern char *errmsg(); diff --git a/src/des/util.c b/src/des/util.c index 520ca1a..9490d36 100644 --- a/src/des/util.c +++ b/src/des/util.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include "mit-cpyright.h" #ifndef KERNEL diff --git a/src/des/weak_key.c b/src/des/weak_key.c index ffc04a0..c539679 100644 --- a/src/des/weak_key.c +++ b/src/des/weak_key.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #ifndef KERNEL #include diff --git a/src/dir/.cvsignore b/src/dir/.cvsignore deleted file mode 100644 index c6c769e..0000000 --- a/src/dir/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -AFS_component_version_number.c -Makefile diff --git a/src/dir/buffer.c b/src/dir/buffer.c index 9f795e4..544037e 100644 --- a/src/dir/buffer.c +++ b/src/dir/buffer.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/dir/dir.c b/src/dir/dir.c index 0e3647d..53ec2dc 100644 --- a/src/dir/dir.c +++ b/src/dir/dir.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef KERNEL #if !defined(UKERNEL) diff --git a/src/dir/salvage.c b/src/dir/salvage.c index 4b867e0..bd28617 100644 --- a/src/dir/salvage.c +++ b/src/dir/salvage.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/dir/test/.cvsignore b/src/dir/test/.cvsignore deleted file mode 100644 index 4173343..0000000 --- a/src/dir/test/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -dtest diff --git a/src/dir/test/dtest.c b/src/dir/test/dtest.c index 8e1aa8b..819c5c9 100644 --- a/src/dir/test/dtest.c +++ b/src/dir/test/dtest.c @@ -11,8 +11,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/dir/test/physio.c b/src/dir/test/physio.c index 5e5a838..53bad95 100644 --- a/src/dir/test/physio.c +++ b/src/dir/test/physio.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_VFSINCL_ENV diff --git a/src/dir/test/test-salvage.c b/src/dir/test/test-salvage.c index a7d0cef..5fa6feb 100644 --- a/src/dir/test/test-salvage.c +++ b/src/dir/test/test-salvage.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); /* This is the salvage test program. */ diff --git a/src/export/.cvsignore b/src/export/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/export/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/export/cfgafs.c b/src/export/cfgafs.c index 8be92b2..14cb376 100644 --- a/src/export/cfgafs.c +++ b/src/export/cfgafs.c @@ -13,8 +13,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/export/cfgexport.c b/src/export/cfgexport.c index 65a90c8..fa2b85d 100644 --- a/src/export/cfgexport.c +++ b/src/export/cfgexport.c @@ -13,8 +13,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/export/export.c b/src/export/export.c index 242dd28..c8a295d 100644 --- a/src/export/export.c +++ b/src/export/export.c @@ -14,7 +14,6 @@ /* Unsafe: conflicts with _KERNEL inclusion of headers below */ /* #include */ /* #include */ -/* RCSID("$Header$"); */ #define _KERNEL #include "sys/types.h" diff --git a/src/export/symtab.c b/src/export/symtab.c index e4bb0cb..98603ce 100644 --- a/src/export/symtab.c +++ b/src/export/symtab.c @@ -13,8 +13,6 @@ #include #include -RCSID - ("$Header$"); #include "sys/types.h" #include "sym.h" diff --git a/src/finale/.cvsignore b/src/finale/.cvsignore deleted file mode 100644 index 0b8ffa2..0000000 --- a/src/finale/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -AFS_component_version_number.c -Makefile -translate_et diff --git a/src/finale/translate_et.c b/src/finale/translate_et.c index d6ef820..cdbfe23 100644 --- a/src/finale/translate_et.c +++ b/src/finale/translate_et.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/finale/translate_et_nt.c b/src/finale/translate_et_nt.c index 0a0e734..a9a3dce 100644 --- a/src/finale/translate_et_nt.c +++ b/src/finale/translate_et_nt.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/fsint/.cvsignore b/src/fsint/.cvsignore deleted file mode 100644 index a27cc91..0000000 --- a/src/fsint/.cvsignore +++ /dev/null @@ -1,15 +0,0 @@ -AFS_component_version_number.c -Kcallback.h -Kcallback.ss.c -Kvice.cs.c -Kvice.h -Kvice.xdr.c -Makefile -afscbint.cs.c -afscbint.h -afscbint.ss.c -afscbint.xdr.c -afsint.cs.c -afsint.h -afsint.ss.c -afsint.xdr.c diff --git a/src/fsint/afsaux.c b/src/fsint/afsaux.c index cc919e5..9e143a1 100644 --- a/src/fsint/afsaux.c +++ b/src/fsint/afsaux.c @@ -14,8 +14,6 @@ #include #endif -RCSID - ("$Header$"); #ifdef KERNEL #if defined(UKERNEL) diff --git a/src/fsprobe/.cvsignore b/src/fsprobe/.cvsignore deleted file mode 100644 index 6991673..0000000 --- a/src/fsprobe/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -AFS_component_version_number.c -Makefile -config.log -fsprobe_test diff --git a/src/fsprobe/fsprobe.c b/src/fsprobe/fsprobe.c index ce69a9b..63cf856 100644 --- a/src/fsprobe/fsprobe.c +++ b/src/fsprobe/fsprobe.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/fsprobe/fsprobe_callback.c b/src/fsprobe/fsprobe_callback.c index fda8628..59301cb 100644 --- a/src/fsprobe/fsprobe_callback.c +++ b/src/fsprobe/fsprobe_callback.c @@ -24,8 +24,6 @@ #include #include -RCSID - ("$Header$"); #include #include /*Standard I/O stuff */ diff --git a/src/fsprobe/fsprobe_test.c b/src/fsprobe/fsprobe_test.c index 5951e04..2f4f030 100644 --- a/src/fsprobe/fsprobe_test.c +++ b/src/fsprobe/fsprobe_test.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include #include /*Interface for fsprobe module */ diff --git a/src/gtx/.cvsignore b/src/gtx/.cvsignore deleted file mode 100644 index 59c0488..0000000 --- a/src/gtx/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -AFS_component_version_number.c -Makefile -gtxtest diff --git a/src/gtx/X11windows.c b/src/gtx/X11windows.c index 743d25e..92c0ab3 100644 --- a/src/gtx/X11windows.c +++ b/src/gtx/X11windows.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include "gtxX11win.h" /*Interface definition */ #include /*Standard I/O package */ diff --git a/src/gtx/cb_test.c b/src/gtx/cb_test.c index 9efa9b5..bfccf4c 100644 --- a/src/gtx/cb_test.c +++ b/src/gtx/cb_test.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include "gtxtextcb.h" /*Module interface */ diff --git a/src/gtx/curses_test.c b/src/gtx/curses_test.c index 6b17d25..6142d7a 100644 --- a/src/gtx/curses_test.c +++ b/src/gtx/curses_test.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #if defined(AFS_HPUX110_ENV) && !defined(__HP_CURSES) #define __HP_CURSES diff --git a/src/gtx/curseswindows.c b/src/gtx/curseswindows.c index 0feb05f..365477b 100644 --- a/src/gtx/curseswindows.c +++ b/src/gtx/curseswindows.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #if defined(AFS_HPUX110_ENV) && !defined(__HP_CURSES) @@ -810,7 +808,7 @@ gator_cursesgwin_getdimensions(gwp, aparms) #if defined(AFS_DARWIN_ENV) && !defined(AFS_DARWIN60_ENV) aparms->maxx = cwp->wp->maxx; aparms->maxy = cwp->wp->maxy; -#elif defined(AFS_NBSD_ENV) +#elif defined(AFS_NBSD_ENV) || defined(AFS_DARWIN100_ENV) aparms->maxx = getmaxx(cwp->wp); aparms->maxy = getmaxy(cwp->wp); #else diff --git a/src/gtx/dumbwindows.c b/src/gtx/dumbwindows.c index 20f7510..3b3fc94 100644 --- a/src/gtx/dumbwindows.c +++ b/src/gtx/dumbwindows.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include "gtxdumbwin.h" /*Interface definition */ #include /*Standard I/O package */ diff --git a/src/gtx/frame.c b/src/gtx/frame.c index ba3d2cd..10fe825 100644 --- a/src/gtx/frame.c +++ b/src/gtx/frame.c @@ -10,9 +10,6 @@ #include #include -RCSID - ("$Header$"); - #ifdef AFS_HPUX_ENV #include #endif diff --git a/src/gtx/gtxtest.c b/src/gtx/gtxtest.c index a859d5e..4522c50 100644 --- a/src/gtx/gtxtest.c +++ b/src/gtx/gtxtest.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/gtx/input.c b/src/gtx/input.c index 2ff8c2b..1945dc0 100644 --- a/src/gtx/input.c +++ b/src/gtx/input.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_HPUX_ENV #include diff --git a/src/gtx/keymap.c b/src/gtx/keymap.c index 93dedcf..ae2a79c 100644 --- a/src/gtx/keymap.c +++ b/src/gtx/keymap.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/gtx/lightobject.c b/src/gtx/lightobject.c index db9e698..d514fcf 100644 --- a/src/gtx/lightobject.c +++ b/src/gtx/lightobject.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include "gtxlightobj.h" /*Interface for this module */ #include /*Standard I/O stuff */ diff --git a/src/gtx/objdict.c b/src/gtx/objdict.c index e86f967..6464908 100644 --- a/src/gtx/objdict.c +++ b/src/gtx/objdict.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include "gtxobjdict.h" /*Interface for this module */ #include /*Standard I/O package */ diff --git a/src/gtx/object_test.c b/src/gtx/object_test.c index 4c03b83..b4db221 100644 --- a/src/gtx/object_test.c +++ b/src/gtx/object_test.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include "gtxscreenobj.h" /*Gator screen object interface */ #include "gtxtextobj.h" /*Gator text object interface */ diff --git a/src/gtx/objects.c b/src/gtx/objects.c index 8629970..e599854 100644 --- a/src/gtx/objects.c +++ b/src/gtx/objects.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include "gtxobjects.h" /*Interface for this module */ #include "gtxtextobj.h" /*Text object interface */ diff --git a/src/gtx/screen_test.c b/src/gtx/screen_test.c index c9e39ba..06c3a7e 100644 --- a/src/gtx/screen_test.c +++ b/src/gtx/screen_test.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include "gtxwindows.h" /*Generalized window interface */ #include "gtxcurseswin.h" /*Curses window interface */ diff --git a/src/gtx/textcb.c b/src/gtx/textcb.c index 3b095e6..1b994be 100644 --- a/src/gtx/textcb.c +++ b/src/gtx/textcb.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include "gtxtextcb.h" /*Module interface */ #include /*Standard I/O stuff */ diff --git a/src/gtx/textobject.c b/src/gtx/textobject.c index b0a57ee..23a607a 100644 --- a/src/gtx/textobject.c +++ b/src/gtx/textobject.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #include "gtxtextobj.h" /*Interface for this module */ #include "gtxwindows.h" /*Gator window interface */ diff --git a/src/gtx/windows.c b/src/gtx/windows.c index a4cec1d..09481a4 100644 --- a/src/gtx/windows.c +++ b/src/gtx/windows.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); /* On DUX "IN" is a variable in curses.h, so this can be a bit of a problem */ #ifdef IN diff --git a/src/kauth/.cvsignore b/src/kauth/.cvsignore deleted file mode 100644 index 25e6466..0000000 --- a/src/kauth/.cvsignore +++ /dev/null @@ -1,23 +0,0 @@ -AFS_component_version_number.c -Kkauth.cs.c -Kkauth.h -Kkauth.xdr.c -Makefile -kaerrors.c -kas -kaserver -kauth.cs.c -kauth.h -kauth.ss.c -kauth.xdr.c -kautils.h -kdb -klog -klog.krb -klogin -klogin.krb -knfs -kpasswd -kpwvalid -rebuild -ka-forwarder diff --git a/src/kauth/admin_tools.c b/src/kauth/admin_tools.c index 6fe44d9..2b06ba5 100644 --- a/src/kauth/admin_tools.c +++ b/src/kauth/admin_tools.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/authclient.c b/src/kauth/authclient.c index 2908191..00501a5 100644 --- a/src/kauth/authclient.c +++ b/src/kauth/authclient.c @@ -16,8 +16,6 @@ #include #endif -RCSID - ("$Header$"); #if defined(UKERNEL) #include "afs/sysincludes.h" diff --git a/src/kauth/client.c b/src/kauth/client.c index eea34ea..7e641d1 100644 --- a/src/kauth/client.c +++ b/src/kauth/client.c @@ -14,8 +14,6 @@ #include #endif -RCSID - ("$Header$"); #if defined(UKERNEL) #ifdef HAVE_UNISTD_H diff --git a/src/kauth/decode_ticket.c b/src/kauth/decode_ticket.c index 51cee80..86124e7 100644 --- a/src/kauth/decode_ticket.c +++ b/src/kauth/decode_ticket.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/ka_util.c b/src/kauth/ka_util.c index 004531c..5e529dc 100644 --- a/src/kauth/ka_util.c +++ b/src/kauth/ka_util.c @@ -19,8 +19,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/kaaux.c b/src/kauth/kaaux.c index f7bcc93..bffc767 100644 --- a/src/kauth/kaaux.c +++ b/src/kauth/kaaux.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #if defined(UKERNEL) #include "rx/xdr.h" diff --git a/src/kauth/kaauxdb.c b/src/kauth/kaauxdb.c index 507500a..4314c16 100644 --- a/src/kauth/kaauxdb.c +++ b/src/kauth/kaauxdb.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/kauth/kadatabase.c b/src/kauth/kadatabase.c index d49fc8d..504e195 100644 --- a/src/kauth/kadatabase.c +++ b/src/kauth/kadatabase.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/kauth/kalocalcell.c b/src/kauth/kalocalcell.c index 60e149d..f36e2a7 100644 --- a/src/kauth/kalocalcell.c +++ b/src/kauth/kalocalcell.c @@ -14,8 +14,6 @@ #include #endif -RCSID - ("$Header$"); #if defined(UKERNEL) #include "afs/pthread_glock.h" diff --git a/src/kauth/kalog.c b/src/kauth/kalog.c index 8bc6cbd..78ad74b 100644 --- a/src/kauth/kalog.c +++ b/src/kauth/kalog.c @@ -19,8 +19,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/kaprocs.c b/src/kauth/kaprocs.c index efe35f9..6e297a8 100644 --- a/src/kauth/kaprocs.c +++ b/src/kauth/kaprocs.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/kas.c b/src/kauth/kas.c index ca75c53..8cc7f3e 100644 --- a/src/kauth/kas.c +++ b/src/kauth/kas.c @@ -11,8 +11,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_AIX32_ENV diff --git a/src/kauth/kaserver.c b/src/kauth/kaserver.c index 41788df..e510ac5 100644 --- a/src/kauth/kaserver.c +++ b/src/kauth/kaserver.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/kautils.c b/src/kauth/kautils.c index 21ee9d7..29cffd9 100644 --- a/src/kauth/kautils.c +++ b/src/kauth/kautils.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/kdb.c b/src/kauth/kdb.c index 39df9e4..e82285c 100644 --- a/src/kauth/kdb.c +++ b/src/kauth/kdb.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/kkids.c b/src/kauth/kkids.c index cc98860..ee2e60c 100644 --- a/src/kauth/kkids.c +++ b/src/kauth/kkids.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/klog.c b/src/kauth/klog.c index 2939757..c2e3e5b 100644 --- a/src/kauth/klog.c +++ b/src/kauth/klog.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/klogin.c b/src/kauth/klogin.c index cd45669..6cf25ef 100644 --- a/src/kauth/klogin.c +++ b/src/kauth/klogin.c @@ -21,8 +21,6 @@ #include #include -RCSID - ("$Header$"); #if !defined(AFS_SUN_ENV) && !defined(AFS_AIX_ENV) && !defined(AFS_HPUX_ENV) && !defined(AFS_SGI_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #include diff --git a/src/kauth/knfs.c b/src/kauth/knfs.c index 24a9b82..2b7b0ee 100644 --- a/src/kauth/knfs.c +++ b/src/kauth/knfs.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/kpasswd.c b/src/kauth/kpasswd.c index eaaf9a0..5744965 100644 --- a/src/kauth/kpasswd.c +++ b/src/kauth/kpasswd.c @@ -11,8 +11,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/kpwvalid.c b/src/kauth/kpwvalid.c index 6bfee9d..e310b96 100644 --- a/src/kauth/kpwvalid.c +++ b/src/kauth/kpwvalid.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/krb_tf.c b/src/kauth/krb_tf.c index 7d577af..09c0eae 100644 --- a/src/kauth/krb_tf.c +++ b/src/kauth/krb_tf.c @@ -47,8 +47,6 @@ #include #include -RCSID - ("$Header$"); #ifdef HAVE_FCNTL_H #include diff --git a/src/kauth/krb_udp.c b/src/kauth/krb_udp.c index 2cb910a..b285898 100644 --- a/src/kauth/krb_udp.c +++ b/src/kauth/krb_udp.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/manyklog.c b/src/kauth/manyklog.c index 0dd7a36..624cefe 100644 --- a/src/kauth/manyklog.c +++ b/src/kauth/manyklog.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/read_passwd.c b/src/kauth/read_passwd.c index 28f4053..8883653 100644 --- a/src/kauth/read_passwd.c +++ b/src/kauth/read_passwd.c @@ -13,8 +13,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/rebuild.c b/src/kauth/rebuild.c index 8c8bffc..3aff989 100644 --- a/src/kauth/rebuild.c +++ b/src/kauth/rebuild.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/test/.cvsignore b/src/kauth/test/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/kauth/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/kauth/test/background.c b/src/kauth/test/background.c index 6a76088..6327a95 100644 --- a/src/kauth/test/background.c +++ b/src/kauth/test/background.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); main(argc, argv) int argc; diff --git a/src/kauth/test/multiklog.c b/src/kauth/test/multiklog.c index cfa9b9f..3169884 100644 --- a/src/kauth/test/multiklog.c +++ b/src/kauth/test/multiklog.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/test/test_badtix.c b/src/kauth/test/test_badtix.c index e296bdc..107984e 100644 --- a/src/kauth/test/test_badtix.c +++ b/src/kauth/test/test_badtix.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/test/test_date.c b/src/kauth/test/test_date.c index 652283e..56b9c56 100644 --- a/src/kauth/test/test_date.c +++ b/src/kauth/test/test_date.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/test/test_getticket.c b/src/kauth/test/test_getticket.c index b2bcdbc..64ad3d4 100644 --- a/src/kauth/test/test_getticket.c +++ b/src/kauth/test/test_getticket.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/test/test_interim_ktc.c b/src/kauth/test/test_interim_ktc.c index 138fdbf..2c7baad 100644 --- a/src/kauth/test/test_interim_ktc.c +++ b/src/kauth/test/test_interim_ktc.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/test/test_rxkad_free.c b/src/kauth/test/test_rxkad_free.c index 5d4159b..1f3d091 100644 --- a/src/kauth/test/test_rxkad_free.c +++ b/src/kauth/test/test_rxkad_free.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/kauth/token.c b/src/kauth/token.c index d28e3c7..c5635a2 100644 --- a/src/kauth/token.c +++ b/src/kauth/token.c @@ -18,8 +18,6 @@ #include #endif -RCSID - ("$Header$"); #if defined(UKERNEL) #include "afs/sysincludes.h" diff --git a/src/kauth/user.c b/src/kauth/user.c index 7a188d7..c23a601 100644 --- a/src/kauth/user.c +++ b/src/kauth/user.c @@ -17,8 +17,6 @@ #include #endif -RCSID - ("$Header$"); #if defined(UKERNEL) #include "afs/sysincludes.h" diff --git a/src/kauth/user_nt.c b/src/kauth/user_nt.c index da99ac4..5be1672 100644 --- a/src/kauth/user_nt.c +++ b/src/kauth/user_nt.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/libacl/.cvsignore b/src/libacl/.cvsignore deleted file mode 100644 index c6c769e..0000000 --- a/src/libacl/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -AFS_component_version_number.c -Makefile diff --git a/src/libacl/aclprocs.c b/src/libacl/aclprocs.c index 7297687..f294d09 100644 --- a/src/libacl/aclprocs.c +++ b/src/libacl/aclprocs.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/libacl/netprocs.c b/src/libacl/netprocs.c index 67b0bf3..e57e3fd 100644 --- a/src/libacl/netprocs.c +++ b/src/libacl/netprocs.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/libacl/test/.cvsignore b/src/libacl/test/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/libacl/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/libacl/test/acltest.c b/src/libacl/test/acltest.c index ac4614f..1d3fe69 100644 --- a/src/libacl/test/acltest.c +++ b/src/libacl/test/acltest.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/libadmin/.cvsignore b/src/libadmin/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/libadmin/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/libadmin/adminutil/.cvsignore b/src/libadmin/adminutil/.cvsignore deleted file mode 100644 index 9a19dd9..0000000 --- a/src/libadmin/adminutil/.cvsignore +++ /dev/null @@ -1,19 +0,0 @@ -Makefile -afs_AdminBosErrors.c -afs_AdminBosErrors.h -afs_AdminCfgErrors.c -afs_AdminCfgErrors.h -afs_AdminClientErrors.c -afs_AdminClientErrors.h -afs_AdminCommonErrors.c -afs_AdminCommonErrors.h -afs_AdminKasErrors.c -afs_AdminKasErrors.h -afs_AdminMiscErrors.c -afs_AdminMiscErrors.h -afs_AdminPtsErrors.c -afs_AdminPtsErrors.h -afs_AdminUtilErrors.c -afs_AdminUtilErrors.h -afs_AdminVosErrors.c -afs_AdminVosErrors.h diff --git a/src/libadmin/adminutil/afs_utilAdmin.c b/src/libadmin/adminutil/afs_utilAdmin.c index 8072dcb..e3a7fe8 100644 --- a/src/libadmin/adminutil/afs_utilAdmin.c +++ b/src/libadmin/adminutil/afs_utilAdmin.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/libadmin/bos/.cvsignore b/src/libadmin/bos/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/libadmin/bos/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/libadmin/bos/afs_bosAdmin.c b/src/libadmin/bos/afs_bosAdmin.c index 6ad03a7..dead0a8 100644 --- a/src/libadmin/bos/afs_bosAdmin.c +++ b/src/libadmin/bos/afs_bosAdmin.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/libadmin/cfg/.cvsignore b/src/libadmin/cfg/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/libadmin/cfg/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/libadmin/cfg/cfgclient.c b/src/libadmin/cfg/cfgclient.c index 9ac669f..c63be01 100644 --- a/src/libadmin/cfg/cfgclient.c +++ b/src/libadmin/cfg/cfgclient.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/libadmin/cfg/cfgdb.c b/src/libadmin/cfg/cfgdb.c index 9f3f084..9eaeba4 100644 --- a/src/libadmin/cfg/cfgdb.c +++ b/src/libadmin/cfg/cfgdb.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/libadmin/cfg/cfghost.c b/src/libadmin/cfg/cfghost.c index 610e58e..15221db 100644 --- a/src/libadmin/cfg/cfghost.c +++ b/src/libadmin/cfg/cfghost.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/libadmin/cfg/cfginternal.c b/src/libadmin/cfg/cfginternal.c index aa35bad..6ea764f 100644 --- a/src/libadmin/cfg/cfginternal.c +++ b/src/libadmin/cfg/cfginternal.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/libadmin/cfg/cfgservers.c b/src/libadmin/cfg/cfgservers.c index 723feb1..ffe29ec 100644 --- a/src/libadmin/cfg/cfgservers.c +++ b/src/libadmin/cfg/cfgservers.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/libadmin/cfg/test/.cvsignore b/src/libadmin/cfg/test/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/libadmin/cfg/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/libadmin/cfg/test/cfgtest.c b/src/libadmin/cfg/test/cfgtest.c index 3416e80..cf4f90e 100644 --- a/src/libadmin/cfg/test/cfgtest.c +++ b/src/libadmin/cfg/test/cfgtest.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/libadmin/client/.cvsignore b/src/libadmin/client/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/libadmin/client/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/libadmin/client/afs_clientAdmin.c b/src/libadmin/client/afs_clientAdmin.c index f2183ce..a228d0a 100644 --- a/src/libadmin/client/afs_clientAdmin.c +++ b/src/libadmin/client/afs_clientAdmin.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include "afs_clientAdmin.h" diff --git a/src/libadmin/kas/.cvsignore b/src/libadmin/kas/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/libadmin/kas/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/libadmin/kas/afs_kasAdmin.c b/src/libadmin/kas/afs_kasAdmin.c index d3bbdce..0336cd8 100644 --- a/src/libadmin/kas/afs_kasAdmin.c +++ b/src/libadmin/kas/afs_kasAdmin.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/libadmin/pts/.cvsignore b/src/libadmin/pts/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/libadmin/pts/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/libadmin/pts/afs_ptsAdmin.c b/src/libadmin/pts/afs_ptsAdmin.c index 07286a1..5c73afc 100644 --- a/src/libadmin/pts/afs_ptsAdmin.c +++ b/src/libadmin/pts/afs_ptsAdmin.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/libadmin/samples/.cvsignore b/src/libadmin/samples/.cvsignore deleted file mode 100644 index 7533290..0000000 --- a/src/libadmin/samples/.cvsignore +++ /dev/null @@ -1,22 +0,0 @@ -Makefile -cm_client_config -cm_list_cells -cm_local_cell -cm_server_prefs -rxdebug_basic_stats -rxdebug_conns -rxdebug_peers -rxdebug_rx_stats -rxdebug_supported_stats -rxdebug_version -rxstat_clear_peer -rxstat_clear_process -rxstat_disable_peer -rxstat_disable_process -rxstat_enable_peer -rxstat_enable_process -rxstat_get_peer -rxstat_get_process -rxstat_get_version -rxstat_query_peer -rxstat_query_process diff --git a/src/libadmin/samples/cm_client_config.c b/src/libadmin/samples/cm_client_config.c index 48ec357..d132370 100644 --- a/src/libadmin/samples/cm_client_config.c +++ b/src/libadmin/samples/cm_client_config.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/cm_list_cells.c b/src/libadmin/samples/cm_list_cells.c index 6a32cec..e1fcfc1 100644 --- a/src/libadmin/samples/cm_list_cells.c +++ b/src/libadmin/samples/cm_list_cells.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/cm_local_cell.c b/src/libadmin/samples/cm_local_cell.c index a814ac3..6f686f4 100644 --- a/src/libadmin/samples/cm_local_cell.c +++ b/src/libadmin/samples/cm_local_cell.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/cm_server_prefs.c b/src/libadmin/samples/cm_server_prefs.c index cdae973..0f88b28 100644 --- a/src/libadmin/samples/cm_server_prefs.c +++ b/src/libadmin/samples/cm_server_prefs.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxdebug_basic_stats.c b/src/libadmin/samples/rxdebug_basic_stats.c index 6289eee..e7dd6e3 100644 --- a/src/libadmin/samples/rxdebug_basic_stats.c +++ b/src/libadmin/samples/rxdebug_basic_stats.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxdebug_conns.c b/src/libadmin/samples/rxdebug_conns.c index 2e0ff99..775e63d 100644 --- a/src/libadmin/samples/rxdebug_conns.c +++ b/src/libadmin/samples/rxdebug_conns.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxdebug_peers.c b/src/libadmin/samples/rxdebug_peers.c index c0a3a3d..9f78836 100644 --- a/src/libadmin/samples/rxdebug_peers.c +++ b/src/libadmin/samples/rxdebug_peers.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxdebug_rx_stats.c b/src/libadmin/samples/rxdebug_rx_stats.c index 2a3de6b..9103aa3 100644 --- a/src/libadmin/samples/rxdebug_rx_stats.c +++ b/src/libadmin/samples/rxdebug_rx_stats.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxdebug_supported_stats.c b/src/libadmin/samples/rxdebug_supported_stats.c index 0d5062d..6dd1748 100644 --- a/src/libadmin/samples/rxdebug_supported_stats.c +++ b/src/libadmin/samples/rxdebug_supported_stats.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxdebug_version.c b/src/libadmin/samples/rxdebug_version.c index d88aea0..e1e54cc 100644 --- a/src/libadmin/samples/rxdebug_version.c +++ b/src/libadmin/samples/rxdebug_version.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxstat_clear_peer.c b/src/libadmin/samples/rxstat_clear_peer.c index 7c4de27..da96c8a 100644 --- a/src/libadmin/samples/rxstat_clear_peer.c +++ b/src/libadmin/samples/rxstat_clear_peer.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxstat_clear_process.c b/src/libadmin/samples/rxstat_clear_process.c index b17eb6d..eea2792 100644 --- a/src/libadmin/samples/rxstat_clear_process.c +++ b/src/libadmin/samples/rxstat_clear_process.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxstat_disable_peer.c b/src/libadmin/samples/rxstat_disable_peer.c index 2690e34..775dac5 100644 --- a/src/libadmin/samples/rxstat_disable_peer.c +++ b/src/libadmin/samples/rxstat_disable_peer.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxstat_disable_process.c b/src/libadmin/samples/rxstat_disable_process.c index 1012a5d..8fbf26f 100644 --- a/src/libadmin/samples/rxstat_disable_process.c +++ b/src/libadmin/samples/rxstat_disable_process.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxstat_enable_peer.c b/src/libadmin/samples/rxstat_enable_peer.c index 8b6929e..755ee8c 100644 --- a/src/libadmin/samples/rxstat_enable_peer.c +++ b/src/libadmin/samples/rxstat_enable_peer.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxstat_enable_process.c b/src/libadmin/samples/rxstat_enable_process.c index 3fc2c94..74823e6 100644 --- a/src/libadmin/samples/rxstat_enable_process.c +++ b/src/libadmin/samples/rxstat_enable_process.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxstat_get_peer.c b/src/libadmin/samples/rxstat_get_peer.c index 0632411..9a083c6 100644 --- a/src/libadmin/samples/rxstat_get_peer.c +++ b/src/libadmin/samples/rxstat_get_peer.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxstat_get_process.c b/src/libadmin/samples/rxstat_get_process.c index 6c7bc35..3fe54ca 100644 --- a/src/libadmin/samples/rxstat_get_process.c +++ b/src/libadmin/samples/rxstat_get_process.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxstat_get_version.c b/src/libadmin/samples/rxstat_get_version.c index c49d89e..0e12166 100644 --- a/src/libadmin/samples/rxstat_get_version.c +++ b/src/libadmin/samples/rxstat_get_version.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxstat_query_peer.c b/src/libadmin/samples/rxstat_query_peer.c index 2845f3a..f050680 100644 --- a/src/libadmin/samples/rxstat_query_peer.c +++ b/src/libadmin/samples/rxstat_query_peer.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/samples/rxstat_query_process.c b/src/libadmin/samples/rxstat_query_process.c index 2017a4b..707ac7b 100644 --- a/src/libadmin/samples/rxstat_query_process.c +++ b/src/libadmin/samples/rxstat_query_process.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/libadmin/test/.cvsignore b/src/libadmin/test/.cvsignore deleted file mode 100644 index d7087ab..0000000 --- a/src/libadmin/test/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -afscp diff --git a/src/libadmin/test/afscp.c b/src/libadmin/test/afscp.c index af0fb22..0e1fc72 100644 --- a/src/libadmin/test/afscp.c +++ b/src/libadmin/test/afscp.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/libadmin/test/bos.c b/src/libadmin/test/bos.c index bc85cc9..ae76778 100644 --- a/src/libadmin/test/bos.c +++ b/src/libadmin/test/bos.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include "bos.h" diff --git a/src/libadmin/test/client.c b/src/libadmin/test/client.c index c4fd4d4..5f81b57 100644 --- a/src/libadmin/test/client.c +++ b/src/libadmin/test/client.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include "client.h" #include diff --git a/src/libadmin/test/kas.c b/src/libadmin/test/kas.c index a2d3dc5..71b8b9f 100644 --- a/src/libadmin/test/kas.c +++ b/src/libadmin/test/kas.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include "kas.h" #include diff --git a/src/libadmin/test/pts.c b/src/libadmin/test/pts.c index 36a6cd3..74f46b8 100644 --- a/src/libadmin/test/pts.c +++ b/src/libadmin/test/pts.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include "pts.h" diff --git a/src/libadmin/test/util.c b/src/libadmin/test/util.c index da4261f..e9c5cd2 100644 --- a/src/libadmin/test/util.c +++ b/src/libadmin/test/util.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include "util.h" diff --git a/src/libadmin/test/vos.c b/src/libadmin/test/vos.c index 86a4175..3dd2f23 100644 --- a/src/libadmin/test/vos.c +++ b/src/libadmin/test/vos.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include "vos.h" diff --git a/src/libadmin/vos/.cvsignore b/src/libadmin/vos/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/libadmin/vos/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c index ff5b7c1..4021037 100644 --- a/src/libadmin/vos/afs_vosAdmin.c +++ b/src/libadmin/vos/afs_vosAdmin.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/libadmin/vos/lockprocs.c b/src/libadmin/vos/lockprocs.c index bc72dfd..26f124b 100644 --- a/src/libadmin/vos/lockprocs.c +++ b/src/libadmin/vos/lockprocs.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include "lockprocs.h" #include diff --git a/src/libadmin/vos/vosutils.c b/src/libadmin/vos/vosutils.c index 4042bc1..e0bd803 100644 --- a/src/libadmin/vos/vosutils.c +++ b/src/libadmin/vos/vosutils.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include "vosutils.h" #include "vsprocs.h" diff --git a/src/libadmin/vos/vsprocs.c b/src/libadmin/vos/vsprocs.c index 7b6b5e9..e294a91 100644 --- a/src/libadmin/vos/vsprocs.c +++ b/src/libadmin/vos/vsprocs.c @@ -21,8 +21,6 @@ #include #include -RCSID - ("$Header$"); #include "vsprocs.h" #include "vosutils.h" diff --git a/src/libafs/.cvsignore b/src/libafs/.cvsignore deleted file mode 100644 index 6575904..0000000 --- a/src/libafs/.cvsignore +++ /dev/null @@ -1,19 +0,0 @@ -MODLOAD -MODLOAD-* -MODLOAD32 -MODLOAD64 -Makefile -Makefile.common -MakefileProto.AIX -MakefileProto.DARWIN -MakefileProto.DUX -MakefileProto.FBSD -MakefileProto.HPUX -MakefileProto.IRIX -MakefileProto.LINUX -MakefileProto.OBSD -MakefileProto.SOLARIS -afs -afsint -config -rx diff --git a/src/libafs/.gitignore b/src/libafs/.gitignore index 8ecfa7b..607091f 100644 --- a/src/libafs/.gitignore +++ b/src/libafs/.gitignore @@ -10,6 +10,7 @@ /MakefileProto.* !/MakefileProto.*.in /afs +/afs.x86_darwin_90.plist /afsint /asm /asm-generic diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in index 4533298..c6422fe 100644 --- a/src/libafs/MakefileProto.DARWIN.in +++ b/src/libafs/MakefileProto.DARWIN.in @@ -33,49 +33,36 @@ AFS_OS_NONFSOBJS = osi_vfsops.o KDEFS= DBUG = DEFINES= -D_KERNEL -DKERNEL -DKERNEL_PRIVATE -DDIAGNOSTIC -DUSE_SELECT -DMACH_USER_API -DMACH_KERNEL +KINCLUDES=-I${KROOT}/System/Library/Frameworks/Kernel.framework/Headers + KOPTS_DBUG=-g - + +< x86_darwin_100> +KOPTS_DBUG=-gdwarf-2 + KOPTS_ppc=-static -nostdinc -nostdlib -fno-builtin -finline -fno-keep-inline-functions -msoft-float -mlong-branch -fsigned-bitfields -arch ppc -Dppc -DPPC -D__PPC__ -DPAGE_SIZE_FIXED -mcpu=750 -mmultiple -fschedule-insns -force_cpusubtype_ALL KOPTS_x86=-static -nostdinc -nostdlib -fno-builtin -finline -fno-keep-inline-functions -msoft-float -mlong-branch -fsigned-bitfields -arch i386 -Di386 -DI386 -D__I386__ -DPAGE_SIZE_FIXED -march=i686 -mpreferred-stack-boundary=2 -falign-functions=4 -ARCH_ppc=$(shell echo "${ARCHFLAGS}" | grep -q -w ppc && echo yes) -ARCH_x86=$(shell echo "${ARCHFLAGS}" | grep -q -w i386 && echo yes) -ifeq ($(ARCH_ppc),yes) -ifeq ($(ARCH_x86),yes) -MODLD=$(CC) -static $(KOPTS_DBUG) -nostdlib -arch ppc -arch i386 -CFLAGS_ppc=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS_ppc) $(KOPTS_DBUG) -CFLAGS_x86=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS_x86) $(KOPTS_DBUG) -else -MODLD=$(CC) -static $(KOPTS_DBUG) -nostdlib -arch ppc -KOPTS=$(KOPTS_ppc) -CFLAGS=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS) -endif -else -ifeq ($(ARCH_x86),yes) -MODLD=$(CC) -static $(KOPTS_DBUG) -nostdlib -arch i386 -KOPTS=$(KOPTS_x86) -else -_ARCH=$(shell arch) -MODLD=$(CC) -static $(KOPTS_DBUG) -nostdlib -arch $(_ARCH) -KOPTS=$(KOPTS_$(shell echo $(_ARCH) | sed 's/i386/x86/')) -endif -CFLAGS=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS) -endif - -MODLD=$(LD) -CFLAGS=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS) - -KOPTS=-static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch - -KOPTS=-no-cpp-precomp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch - -KOPTS=-no-precomp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch +KOPTS_amd64=-static -nostdinc -nostdlib -fno-builtin -finline -fno-keep-inline-functions -msoft-float -mlong-branch -fsigned-bitfields -arch x86_64 -Damd64 -DAMD64 -D__AMD64__ -DPAGE_SIZE_FIXED -march=x86-64 -mpreferred-stack-boundary=4 -falign-functions=4 -m64 -mkernel -mno-red-zone +ARCH_ppc=$(shell echo "${ARCHFLAGS}" | grep -q -w ppc && echo yes || echo ${ARCHFLAGS} | egrep -q -w -v 'ppc|i386|x86_64' && arch | grep -q -w ppc && echo yes) +ARCH_x86=$(shell echo "${ARCHFLAGS}" | grep -q -w i386 && echo yes || echo ${ARCHFLAGS} | egrep -q -w -v 'ppc|i386|x86_64' && arch | grep -q -w i386 && echo yes) +ARCH_amd64=$(shell echo "${ARCHFLAGS}" | grep -q -w x86_64 && echo yes || echo ${ARCHFLAGS} | egrep -q -w -v 'ppc|i386|x86_64' && arch | grep -q -w x86_64 && echo yes) +OBJ_ppc=$(shell echo "${ARCH_ppc}" | grep -q -w yes && echo "$@.ppc") +OBJ_x86=$(shell echo "${ARCH_x86}" | grep -q -w yes && echo "$@.x86") +OBJ_amd64=$(shell echo "${ARCH_amd64}" | grep -q -w yes && echo "$@.amd64") + + +MODLD=$(CC) -static $(KOPTS_DBUG) -nostdlib $(ARCHFLAGS) -Xlinker -kext + +MODLD=$(CC) -static $(KOPTS_DBUG) -nostdlib $(ARCHFLAGS) -KINCLUDES=-I${KROOT}/System/Library/Frameworks/Kernel.framework/Headers +CFLAGS_ppc=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS_ppc) $(KOPTS_DBUG) +CFLAGS_x86=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS_x86) $(KOPTS_DBUG) +CFLAGS_amd64=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS_amd64) $(KOPTS_DBUG) + # Name of directory to hold object files and libraries. KOBJ = MODLOAD @@ -86,26 +73,41 @@ DESTDIRS = single_destdir include Makefile.common - -ifeq ($(ARCH_ppc),yes) -ifeq ($(ARCH_x86),yes) + # override suffix rule; unfortunately, this causes a warning message .c.o: - $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS_ppc) $(CFLAGS-$@) -o $(patsubst %.o,%.ppc.o,$@) -c $< - $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS_x86) $(CFLAGS-$@) -o $(patsubst %.o,%.x86.o,$@) -c $< - lipo -create $(patsubst %.o,%.ppc.o,$@) $(patsubst %.o,%.x86.o,$@) -output $@ -CRULE_NOOPT= \ - $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS_ppc) $(CFLAGS-$@) -o $(patsubst %.o,%.ppc.o,$@) -c $? && \ - $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS_x86) $(CFLAGS-$@) -o $(patsubst %.o,%.x86.o,$@) -c $? && \ - lipo -create $(patsubst %.o,%.ppc.o,$@) $(patsubst %.o,%.x86.o,$@) -output $@ -CRULE_OPT= \ - $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(KERN_OPTMZ) $(CFLAGS_ppc) $(CFLAGS-$@) -o $(patsubst %.o,%.ppc.o,$@) -c $? && \ - $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(KERN_OPTMZ) $(CFLAGS_x86) $(CFLAGS-$@) -o $(patsubst %.o,%.x86.o,$@) -c $? && \ - lipo -create $(patsubst %.o,%.ppc.o,$@) $(patsubst %.o,%.x86.o,$@) -output $@ +ifeq ($(ARCH_ppc),yes) + $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS_ppc) $(CFLAGS-$@) -o $(patsubst %.o,%.o.ppc,$@) -c $< endif +ifeq ($(ARCH_x86),yes) + $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS_x86) $(CFLAGS-$@) -o $(patsubst %.o,%.o.x86,$@) -c $< endif - +ifeq ($(ARCH_amd64),yes) + $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS_amd64) $(CFLAGS-$@) -o $(patsubst %.o,%.o.amd64,$@) -c $< +endif + lipo -create ${OBJ_ppc} ${OBJ_x86} ${OBJ_amd64} -output $@; + +CRULE_NOOPT_ppc=$(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS_ppc) $(CFLAGS-$@) -o $(patsubst %.o,%.o.ppc,$@) -c $? +CRULE_NOOPT_x86=$(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS_x86) $(CFLAGS-$@) -o $(patsubst %.o,%.o.x86,$@) -c $? +CRULE_NOOPT_amd64=$(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS_amd64) $(CFLAGS-$@) -o $(patsubst %.o,%.o.amd64,$@) -c $? +CRULE_NOOPT=$(shell echo "${ARCH_ppc}" | grep -q -w yes && echo "${CRULE_NOOPT_ppc};"; echo "${ARCH_x86}" | grep -q -w yes && echo "${CRULE_NOOPT_x86};"; echo "${ARCH_amd64}" | grep -q -w yes && echo "${CRULE_NOOPT_amd64};"; echo "lipo -create ${OBJ_ppc} ${OBJ_x86} ${OBJ_amd64} -output $@") + +CRULE_OPT_ppc=$(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(KERN_OPTMZ) $(CFLAGS_ppc) $(CFLAGS-$@) -o $(patsubst %.o,%.o.ppc,$@) -c $? +CRULE_OPT_x86=$(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(KERN_OPTMZ) $(CFLAGS_x86) $(CFLAGS-$@) -o $(patsubst %.o,%.o.x86,$@) -c $? +CRULE_OPT_amd64=$(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(KERN_OPTMZ) $(CFLAGS_amd64) $(CFLAGS-$@) -o $(patsubst %.o,%.o.amd64,$@) -c $? +CRULE_OPT=$(shell echo "${ARCH_ppc}" | grep -q -w yes && echo "${CRULE_OPT_ppc};"; echo "${ARCH_x86}" | grep -q -w yes && echo "${CRULE_OPT_x86};"; echo "${ARCH_amd64}" | grep -q -w yes && echo "${CRULE_OPT_amd64};"; echo "lipo -create ${OBJ_ppc} ${OBJ_x86} ${OBJ_amd64} -output $@") + +MODLD=$(LD) +CFLAGS=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS) + +KOPTS=-static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch + +KOPTS=-no-cpp-precomp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch + +KOPTS=-no-precomp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch + + setup: -mkdir $(KOBJ) -$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config @@ -145,12 +147,12 @@ dest_libafs: $(LIBAFSNONFS) ; ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS) $(MODLD) -r -o ${LIBAFS} ${AFSAOBJS} ${AFSNFSOBJS} -lcc_kext - + dsymutil -o ${LIBAFS}.dSYM ${LIBAFS} ${LIBAFSNONFS}: $(AFSAOBJS) $(AFSNONFSOBJS) $(MODLD) -r -o ${LIBAFSNONFS} ${AFSAOBJS} ${AFSNONFSOBJS} -lcc_kext - + dsymutil -o ${LIBAFSNONFS}.dSYM ${LIBAFSNONFS} diff --git a/src/libafsauthent/.cvsignore b/src/libafsauthent/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/libafsauthent/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/libafsrpc/.cvsignore b/src/libafsrpc/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/libafsrpc/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/libuafs/.cvsignore b/src/libuafs/.cvsignore deleted file mode 100644 index a2474f6..0000000 --- a/src/libuafs/.cvsignore +++ /dev/null @@ -1,20 +0,0 @@ -Makefile -Makefile.common -MakefileProto.AIX -MakefileProto.DARWIN -MakefileProto.DUX -MakefileProto.FBSD -MakefileProto.HPUX -MakefileProto.IRIX -MakefileProto.LINUX -MakefileProto.NBSD -MakefileProto.OBSD -MakefileProto.SOLARIS -UAFS -JUAFS -afs -afsint -config -des -linktest -rx diff --git a/src/libuafs/linktest.c b/src/libuafs/linktest.c index 5cacb27..d1b8188 100644 --- a/src/libuafs/linktest.c +++ b/src/libuafs/linktest.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/log/.cvsignore b/src/log/.cvsignore deleted file mode 100644 index 5a912f8..0000000 --- a/src/log/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -AFS_component_version_number.c -Makefile -config.log -kseal -tokens -tokens.krb -unlog diff --git a/src/log/kseal.c b/src/log/kseal.c index d42df10..fc48630 100644 --- a/src/log/kseal.c +++ b/src/log/kseal.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/log/test/.cvsignore b/src/log/test/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/log/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/log/test/gettoktest.c b/src/log/test/gettoktest.c index 11bcb1b..1fb3c10 100644 --- a/src/log/test/gettoktest.c +++ b/src/log/test/gettoktest.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/log/test/testlog.c b/src/log/test/testlog.c index 0cb714f..25e7b51 100644 --- a/src/log/test/testlog.c +++ b/src/log/test/testlog.c @@ -23,8 +23,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/log/tokens.c b/src/log/tokens.c index 70dd377..ce12ffc 100644 --- a/src/log/tokens.c +++ b/src/log/tokens.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_AIX32_ENV diff --git a/src/log/unlog.c b/src/log/unlog.c index 7f6477c..42d17a4 100644 --- a/src/log/unlog.c +++ b/src/log/unlog.c @@ -29,8 +29,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/login/getenv.c b/src/login/getenv.c index 7c49bca..8ccd44d 100644 --- a/src/login/getenv.c +++ b/src/login/getenv.c @@ -18,9 +18,6 @@ #include #include -RCSID - ("$Header$"); - #include /* diff --git a/src/login/login.c b/src/login/login.c index cbf9b8a..15ea634 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -39,9 +39,6 @@ #include #include -RCSID - ("$Header$"); - #include #include #include diff --git a/src/login/setenv.c b/src/login/setenv.c index 9b9831c..8fdb1b5 100644 --- a/src/login/setenv.c +++ b/src/login/setenv.c @@ -18,9 +18,6 @@ #include #include -RCSID - ("$Header$"); - #include #include diff --git a/src/login/util_login.c b/src/login/util_login.c index ae71861..91adbbd 100644 --- a/src/login/util_login.c +++ b/src/login/util_login.c @@ -18,9 +18,6 @@ #include #include -RCSID - ("$Header$"); - #include #include #include diff --git a/src/login/util_logout.c b/src/login/util_logout.c index c23e211..787692e 100644 --- a/src/login/util_logout.c +++ b/src/login/util_logout.c @@ -18,9 +18,6 @@ #include #include -RCSID - ("$Header$"); - #include #include #ifdef AFS_SUN5_ENV diff --git a/src/login/util_logwtmp.c b/src/login/util_logwtmp.c index 314bd76..1734054 100644 --- a/src/login/util_logwtmp.c +++ b/src/login/util_logwtmp.c @@ -18,9 +18,6 @@ #include #include -RCSID - ("$Header$"); - #include #include #include diff --git a/src/lwp/.cvsignore b/src/lwp/.cvsignore deleted file mode 100644 index 5b43fe4..0000000 --- a/src/lwp/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -AFS_component_version_number.c -Makefile -config.log -process.ss diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index 2fd7d63..76fca84 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -53,9 +53,11 @@ process.o : process.s process.i386.s process.c ${AS} -ahlns process.ss -o process.o >process.lst; \ $(RM) process.ss ;; \ *_darwin* ) \ - ppc=`echo "${ARCHFLAGS}" | grep -q -w ppc && echo yes` ; \ - i386=`echo "${ARCHFLAGS}" | grep -q -w i386 && echo yes` ; \ - if [ -z "$${ppc}" -a -z "$${i386}" ] ; then \ + $(RM) -f process.o ; \ + ppc=`echo "${ARCHFLAGS}" | grep -q -w ppc && echo process.ppc.o` ; \ + i386=`echo "${ARCHFLAGS}" | grep -q -w i386 && echo process.i386.o` ; \ + amd64=`echo "${ARCHFLAGS}" | grep -q -w x86_64 && echo process.amd64.o` ; \ + if [ -z "$${ppc}" -a -z "$${i386}" -a -z "$${amd64}" ] ; then \ if [ `arch` = ppc ] ; then \ ppc=yes ; \ else \ @@ -63,19 +65,25 @@ process.o : process.s process.i386.s process.c fi ; \ fi ; \ if [ -n "$${ppc}" ] ; then \ - $(CC) ${LWP_DBG} ${LWP_OPTMZ} -c -arch ppc -I${TOP_INCDIR} ${srcdir}/process.s -o process.ppc.o ; \ - if [ -z "$${i386}" ] ; then \ - ${MV} process.ppc.o process.o ; \ + $(CC) ${LWP_DBG} ${LWP_OPTMZ} -c -arch ppc -I${TOP_INCDIR} ${srcdir}/process.s -o "$${ppc}" ; \ + if [ -z "$${i386}" -a -z "$${amd64}" ] ; then \ + ${MV} "$${ppc}" process.o ; \ fi ; \ fi ; \ if [ -n "$${i386}" ] ; then \ - $(CC) -x assembler-with-cpp -c -arch i386 -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s -o process.i386.o ; \ - if [ -z "$${ppc}" ] ; then \ - ${MV} process.i386.o process.o ; \ + $(CC) -x assembler-with-cpp -c -arch i386 -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s -o "$${i386}" ; \ + if [ -z "$${ppc}" -a -z "$${amd64}" ] ; then \ + ${MV} "$${i386}" process.o ; \ fi ; \ fi ; \ - if [ -n "$${ppc}" -a -n "$${i386}" ] ; then \ - lipo -create process.ppc.o process.i386.o -output process.o ;\ + if [ -n "$${amd64}" ] ; then \ + $(CC) -x assembler-with-cpp -c -arch x86_64 -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.amd64.s -o "$${amd64}" ; \ + if [ -z "$${ppc}" -a -z "$${i386}" ] ; then \ + ${MV} "$${amd64}" process.o ; \ + fi ; \ + fi ; \ + if [ ! -f process.o ] ; then \ + lipo -create $${amd64} $${i386} $${ppc} -output process.o ;\ fi ;; \ i386_*bsd*) \ cp ${srcdir}/process.i386.s process.S ; \ diff --git a/src/lwp/fasttime.c b/src/lwp/fasttime.c index 8878378..c55a5f6 100644 --- a/src/lwp/fasttime.c +++ b/src/lwp/fasttime.c @@ -26,8 +26,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/lwp/iomgr.c b/src/lwp/iomgr.c index 38efe0d..9008463 100644 --- a/src/lwp/iomgr.c +++ b/src/lwp/iomgr.c @@ -36,7 +36,6 @@ #include #include -RCSID("$Header$"); #include #include diff --git a/src/lwp/lock.c b/src/lwp/lock.c index 4b9fb22..5286038 100644 --- a/src/lwp/lock.c +++ b/src/lwp/lock.c @@ -25,8 +25,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_PTHREAD_ENV #include diff --git a/src/lwp/lwp.c b/src/lwp/lwp.c index 8f669f6..0a257bd 100644 --- a/src/lwp/lwp.c +++ b/src/lwp/lwp.c @@ -17,7 +17,6 @@ #include #include -RCSID("$Header$"); #include #include diff --git a/src/lwp/lwp_nt.c b/src/lwp/lwp_nt.c index 845d451..4d1633a 100644 --- a/src/lwp/lwp_nt.c +++ b/src/lwp/lwp_nt.c @@ -19,7 +19,6 @@ #include #include -RCSID("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/lwp/preempt.c b/src/lwp/preempt.c index 8901bef..ad2a152 100644 --- a/src/lwp/preempt.c +++ b/src/lwp/preempt.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include "lwp.h" diff --git a/src/lwp/process.amd64.s b/src/lwp/process.amd64.s index 99a7882..4b1ef96 100644 --- a/src/lwp/process.amd64.s +++ b/src/lwp/process.amd64.s @@ -33,8 +33,6 @@ * SUCH DAMAGE. */ -#undef RCSID - /* x86_64 Assembly * * By Harald Barth after looking @@ -85,7 +83,7 @@ ENTRY(savecontext) movq %rsi, area1(%rbp) /* i multiples of 24, so 32 it is) */ movq %rdx, newsp(%rbp) /* and copy them there. */ - movq PRE_Block@GOTPCREL(%rip), %rax + movq _C_LABEL(PRE_Block)@GOTPCREL(%rip), %rax movl $1,(%rax) /* Do not allow any interrupts */ pushq %rsp /* Push all registers onto the stack */ @@ -151,7 +149,7 @@ ENTRY(returnto) popq %rax popq %rsp /* See savecontext */ - movq PRE_Block@GOTPCREL(%rip), %rax + movq _C_LABEL(PRE_Block)@GOTPCREL(%rip), %rax movl $0,(%rax) addq $32, %rsp /* We did rsp-32 above, correct that */ popq %rbp diff --git a/src/lwp/process.c b/src/lwp/process.c index 357bd36..8da1cec 100644 --- a/src/lwp/process.c +++ b/src/lwp/process.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/lwp/rw.c b/src/lwp/rw.c index 15ddf2d..36082c9 100644 --- a/src/lwp/rw.c +++ b/src/lwp/rw.c @@ -17,8 +17,6 @@ Created: 11/1/83, J. Rosenberg #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/lwp/test/.cvsignore b/src/lwp/test/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/lwp/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/lwp/test/selclient.c b/src/lwp/test/selclient.c index 07ea88b..5222702 100644 --- a/src/lwp/test/selclient.c +++ b/src/lwp/test/selclient.c @@ -53,8 +53,6 @@ #include #include -RCSID - ("$Header$"); #include "lwp.h" diff --git a/src/lwp/test/selserver.c b/src/lwp/test/selserver.c index 34b82ee..4540124 100644 --- a/src/lwp/test/selserver.c +++ b/src/lwp/test/selserver.c @@ -54,8 +54,6 @@ #include #include -RCSID - ("$Header$"); #include "lwp.h" diff --git a/src/lwp/test/selsubs.c b/src/lwp/test/selsubs.c index d318fa0..2cba547 100644 --- a/src/lwp/test/selsubs.c +++ b/src/lwp/test/selsubs.c @@ -28,8 +28,6 @@ #include #include -RCSID - ("$Header$"); #include "lwp.h" diff --git a/src/lwp/test/test.c b/src/lwp/test/test.c index 9abf051..d1ddcf2 100644 --- a/src/lwp/test/test.c +++ b/src/lwp/test/test.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/lwp/test/test_key.c b/src/lwp/test/test_key.c index 1eb5f65..2265448 100644 --- a/src/lwp/test/test_key.c +++ b/src/lwp/test/test_key.c @@ -20,8 +20,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/lwp/test/testlwp.c b/src/lwp/test/testlwp.c index 6a8eae3..8c6b343 100644 --- a/src/lwp/test/testlwp.c +++ b/src/lwp/test/testlwp.c @@ -20,7 +20,6 @@ #include #include -RCSID("$Header$"); #define LWP_KERNEL #include "lwp.h" diff --git a/src/lwp/test/testtime.c b/src/lwp/test/testtime.c index d3dbae9..cc9f522 100644 --- a/src/lwp/test/testtime.c +++ b/src/lwp/test/testtime.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/lwp/threadname.c b/src/lwp/threadname.c index 3f7e9be..62a967e 100644 --- a/src/lwp/threadname.c +++ b/src/lwp/threadname.c @@ -22,8 +22,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/lwp/timer.c b/src/lwp/timer.c index cdc2285..aeeb3cb 100644 --- a/src/lwp/timer.c +++ b/src/lwp/timer.c @@ -21,8 +21,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/lwp/waitkey.c b/src/lwp/waitkey.c index e936077..7f29256 100644 --- a/src/lwp/waitkey.c +++ b/src/lwp/waitkey.c @@ -22,8 +22,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/null/.cvsignore b/src/null/.cvsignore deleted file mode 100644 index c6c769e..0000000 --- a/src/null/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -AFS_component_version_number.c -Makefile diff --git a/src/packaging/MacOS/buildpkg.sh.in b/src/packaging/MacOS/buildpkg.sh.in index d70c8fd..681218f 100644 --- a/src/packaging/MacOS/buildpkg.sh.in +++ b/src/packaging/MacOS/buildpkg.sh.in @@ -34,6 +34,9 @@ fi if [ $majorvers -eq 9 ]; then RELNAME="Leopard" fi +if [ $majorvers -eq 10 ]; then + RELNAME="Snowleopard" +fi PKGROOT=$CURDIR/pkgroot PKGRES=$CURDIR/pkgres diff --git a/src/packaging/MacOS/decode-panic b/src/packaging/MacOS/decode-panic index 8cdf3a8..a04f543 100755 --- a/src/packaging/MacOS/decode-panic +++ b/src/packaging/MacOS/decode-panic @@ -18,7 +18,10 @@ my $panic_file = "/Library/Logs/panic.log"; my %crash_info; my $backtrace; my $kextload = "/sbin/kextload"; +my $kextutil = "/usr/bin/kextutil"; +my $kextprog; my $gdb = "/usr/bin/gdb"; +my $gdbarch = ""; my $gdb_file = "gdb.input"; my $temp_dir = tempdir( "afsdebugXXXXXX", DIR => File::Spec->tmpdir, TMPDIR => 1, CLEANUP => 1 ); @@ -50,7 +53,7 @@ if ($option_help) { } # check for necessary programs & panic file -for my $program ( $kextload, $gdb ) { +for my $program ( $gdb, $kextload ) { if ( ! -x $program ) { if ( $option_quiet ) { exit 1; @@ -60,6 +63,12 @@ for my $program ( $kextload, $gdb ) { } } +if ( -x $kextutil ) { + $kextprog = $kextutil; +} else { + $kextprog = $kextload; +} + croak "Can't find panic file: $panic_file!\n" if ( ! -r $panic_file ); read_panic( $panic_file, \%crash_info ); @@ -68,7 +77,19 @@ generate_symbol_files( $crash_info{"afs_kernel_address"}, $temp_dir ); write_gdb_input_file( $temp_dir, $gdb_file, $crash_info{ "backtrace" } ); -my $gdb_output = `$gdb /mach_kernel -batch -x $temp_dir/$gdb_file`; +if ($crash_info{"kernel_version"} =~ /X86_64/ ) { + $gdbarch="-a x86_64"; +} else { + if ($crash_info{"kernel_version"} =~ /I386/ ) { + $gdbarch="-a i386"; + } else { + if ($crash_info{"kernel_version"} =~ /PPC/ ) { + $gdbarch="-a ppc"; + } + } +} + +my $gdb_output = `$gdb $gdbarch /mach_kernel -batch -x $temp_dir/$gdb_file`; croak "gdb failed!\n" if $CHILD_ERROR; write_dump_file( $dump_file, \%crash_info, $gdb_output ); @@ -185,10 +206,11 @@ sub generate_symbol_files { my $kernel_address = shift; my $symbol_write_dir = shift; - system( "/sbin/kextload", - "-s", $temp_dir, - "-a", 'org.openafs.filesystems.afs@' . $kernel_address, - "-n", "/Library/OpenAFS/Tools/root.client/usr/vice/etc/afs.kext/" ); + system( $kextprog, + "-s", $temp_dir, + "-a", 'org.openafs.filesystems.afs@' . $kernel_address, + "-n", "/Library/OpenAFS/Tools/root.client/usr/vice/etc/afs.kext/" ); + if ( $CHILD_ERROR ) { # error croak "kextload failed to run: $OS_ERROR\n"; @@ -285,13 +307,18 @@ Here is an example file that is fed to gdb: x/i 0x2ED1F7C0 x/i 0x2ED0D1A4 +Panic logs can be found in /Library/Logs/panic.log in 10.4 (Tiger), +/Library/Logs/PanicReporter/YYYY-MM-DD-HHMMSS.panic in 10.5 (Leopard), +and /Library/Logs/DiagnosticReports/Kernel_YYYY-MM-DD-HHMMSS.panic in 10.6 +(SnowLeopard). + =head1 DEPENDENCIES -This program needs gdb and kextload. +This program needs gdb and kextload; Starting in SnowLeopard, it needs kextutil. =head1 BUGS AND LIMITATIONS -It clobbers the output file. +decode-panic clobbers the output file. =head1 AUTHOR diff --git a/src/packaging/RedHat/.cvsignore b/src/packaging/RedHat/.cvsignore deleted file mode 100644 index f07c5d2..0000000 --- a/src/packaging/RedHat/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -openafs.spec diff --git a/src/pam/.cvsignore b/src/pam/.cvsignore deleted file mode 100644 index 2acfe89..0000000 --- a/src/pam/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -AFS_component_version_number.c -Makefile -pam_afs.krb.so.1 -pam_afs.so.1 -test_pam diff --git a/src/pam/afs_account.c b/src/pam/afs_account.c index dd12971..56251b3 100644 --- a/src/pam/afs_account.c +++ b/src/pam/afs_account.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/pam/afs_auth.c b/src/pam/afs_auth.c index ee47fbd..8b9d6ae 100644 --- a/src/pam/afs_auth.c +++ b/src/pam/afs_auth.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include @@ -177,8 +175,8 @@ pam_sm_authenticate(pam_handle_t * pamh, int flags, int argc, /* enhanced: use "ignore_uid " to specify the largest uid * which should be ignored by this module */ -#if defined(AFS_HPUX_ENV) -#if defined(AFS_HPUX110_ENV) +#if defined(AFS_HPUX_ENV) || defined(AFS_DARWIN100_ENV) +#if defined(AFS_HPUX110_ENV) || defined(AFS_DARWIN100_ENV) i = getpwnam_r(user, &unix_pwd, upwd_buf, sizeof(upwd_buf), &upwd); #else /* AFS_HPUX110_ENV */ i = getpwnam_r(user, &unix_pwd, upwd_buf, sizeof(upwd_buf)); diff --git a/src/pam/afs_message.c b/src/pam/afs_message.c index b26ed9d..7570bcd 100644 --- a/src/pam/afs_message.c +++ b/src/pam/afs_message.c @@ -19,8 +19,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/pam/afs_pam_msg.c b/src/pam/afs_pam_msg.c index d36bd54..7f066bb 100644 --- a/src/pam/afs_pam_msg.c +++ b/src/pam/afs_pam_msg.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/pam/afs_password.c b/src/pam/afs_password.c index 28ad332..a6a67da 100644 --- a/src/pam/afs_password.c +++ b/src/pam/afs_password.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include #include @@ -121,8 +119,8 @@ pam_sm_chauthtok(pam_handle_t * pamh, int flags, int argc, const char **argv) * and its uid==0, and "ignore_root" was given in pam.conf, * ignore the user. */ -#if defined(AFS_HPUX_ENV) -#if defined(AFS_HPUX110_ENV) +#if defined(AFS_HPUX_ENV) || defined(AFS_DARWIN100_ENV) +#if defined(AFS_HPUX110_ENV) || defined(AFS_DARWIN100_ENV) i = getpwnam_r(user, &unix_pwd, upwd_buf, sizeof(upwd_buf), &upwd); #else /* AFS_HPUX110_ENV */ i = getpwnam_r(user, &unix_pwd, upwd_buf, sizeof(upwd_buf)); diff --git a/src/pam/afs_session.c b/src/pam/afs_session.c index 079e15f..b58cec2 100644 --- a/src/pam/afs_session.c +++ b/src/pam/afs_session.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/pam/afs_setcred.c b/src/pam/afs_setcred.c index bf22b2c..52e0310 100644 --- a/src/pam/afs_setcred.c +++ b/src/pam/afs_setcred.c @@ -19,8 +19,6 @@ #include #include -RCSID - ("$Header$"); #include #include @@ -157,8 +155,8 @@ pam_sm_setcred(pam_handle_t * pamh, int flags, int argc, const char **argv) /* enhanced: use "ignore_uid " to specify the largest uid * which should be ignored by this module */ -#if defined(AFS_HPUX_ENV) -#if defined(AFS_HPUX110_ENV) +#if defined(AFS_HPUX_ENV) || defined(AFS_DARWIN100_ENV) +#if defined(AFS_HPUX110_ENV) || defined(AFS_DARWIN100_ENV) i = getpwnam_r(user, &unix_pwd, upwd_buf, sizeof(upwd_buf), &upwd); #else /* AFS_HPUX110_ENV */ i = getpwnam_r(user, &unix_pwd, upwd_buf, sizeof(upwd_buf)); diff --git a/src/pam/afs_util.c b/src/pam/afs_util.c index 71df5b6..0505cad 100644 --- a/src/pam/afs_util.c +++ b/src/pam/afs_util.c @@ -26,8 +26,6 @@ #endif #endif -RCSID - ("$Header$"); #include "afs_util.h" diff --git a/src/pam/test_pam.c b/src/pam/test_pam.c index 1a98f88..7194804 100644 --- a/src/pam/test_pam.c +++ b/src/pam/test_pam.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/pinstall/install.c b/src/pinstall/install.c index ade1450..59b51fc 100644 --- a/src/pinstall/install.c +++ b/src/pinstall/install.c @@ -49,9 +49,6 @@ Generic install command. Options are: #include #include -RCSID - ("$Header$"); - #include #include #include diff --git a/src/platform/.cvsignore b/src/platform/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/platform/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/platform/AIX/.cvsignore b/src/platform/AIX/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/platform/AIX/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/platform/DARWIN/.cvsignore b/src/platform/DARWIN/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/platform/DARWIN/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/platform/DARWIN/.gitignore b/src/platform/DARWIN/.gitignore new file mode 100644 index 0000000..a15ad26 --- /dev/null +++ b/src/platform/DARWIN/.gitignore @@ -0,0 +1,6 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +afssettings + diff --git a/src/platform/FBSD/.cvsignore b/src/platform/FBSD/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/platform/FBSD/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/platform/HPUX/.cvsignore b/src/platform/HPUX/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/platform/HPUX/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/platform/IRIX/.cvsignore b/src/platform/IRIX/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/platform/IRIX/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/platform/LINUX/.cvsignore b/src/platform/LINUX/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/platform/LINUX/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/platform/NBSD/.cvsignore b/src/platform/NBSD/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/platform/NBSD/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/platform/OBSD/.cvsignore b/src/platform/OBSD/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/platform/OBSD/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/platform/SOLARIS/.cvsignore b/src/platform/SOLARIS/.cvsignore deleted file mode 100644 index e6305d8..0000000 --- a/src/platform/SOLARIS/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -AFS_component_version_number.c -Makefile -fs_conv_sol26 diff --git a/src/procmgmt/.cvsignore b/src/procmgmt/.cvsignore deleted file mode 100644 index c6c769e..0000000 --- a/src/procmgmt/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -AFS_component_version_number.c -Makefile diff --git a/src/procmgmt/afskill.c b/src/procmgmt/afskill.c index 762776f..285a4eb 100644 --- a/src/procmgmt/afskill.c +++ b/src/procmgmt/afskill.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/procmgmt/procmgmt_nt.c b/src/procmgmt/procmgmt_nt.c index 2fa0e81..643c91e 100644 --- a/src/procmgmt/procmgmt_nt.c +++ b/src/procmgmt/procmgmt_nt.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/procmgmt/procmgmt_unix.c b/src/procmgmt/procmgmt_unix.c index f43de5b..2bb222c 100644 --- a/src/procmgmt/procmgmt_unix.c +++ b/src/procmgmt/procmgmt_unix.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/procmgmt/redirect_nt.c b/src/procmgmt/redirect_nt.c index c27551e..897b8a1 100644 --- a/src/procmgmt/redirect_nt.c +++ b/src/procmgmt/redirect_nt.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/procmgmt/test/.cvsignore b/src/procmgmt/test/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/procmgmt/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/procmgmt/test/pmgttest.c b/src/procmgmt/test/pmgttest.c index 18184a8..3f202d8 100644 --- a/src/procmgmt/test/pmgttest.c +++ b/src/procmgmt/test/pmgttest.c @@ -13,8 +13,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/ptserver/.cvsignore b/src/ptserver/.cvsignore deleted file mode 100644 index 6ae1e78..0000000 --- a/src/ptserver/.cvsignore +++ /dev/null @@ -1,19 +0,0 @@ -AFS_component_version_number.c -Kptint.cs.c -Kptint.h -Kptint.xdr.c -Makefile -db_verify -pt_util -pterror.c -pterror.h -ptint.cs.c -ptint.h -ptint.ss.c -ptint.xdr.c -pts -ptserver -readgroup -readpwd -testpt -ptclient diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index 4f9935e..dee0528 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -34,7 +34,6 @@ LIBS=${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libdes.a \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libcom_err.a \ - ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libafsutil.a diff --git a/src/ptserver/db_verify.c b/src/ptserver/db_verify.c index fe5c4ac..f1616ce 100644 --- a/src/ptserver/db_verify.c +++ b/src/ptserver/db_verify.c @@ -11,8 +11,6 @@ #include #include -RCSID - ("$Header$"); /* * (3) Define a structure, idused, instead of an diff --git a/src/ptserver/display.c b/src/ptserver/display.c index 4126831..8dd8875 100644 --- a/src/ptserver/display.c +++ b/src/ptserver/display.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/ptserver/map.c b/src/ptserver/map.c index c0ac98b..e0b5588 100644 --- a/src/ptserver/map.c +++ b/src/ptserver/map.c @@ -31,8 +31,6 @@ #include #include -RCSID - ("$Header$"); #ifdef SUPERGROUPS #include diff --git a/src/ptserver/pt_util.c b/src/ptserver/pt_util.c index f74b6a9..d97fb88 100644 --- a/src/ptserver/pt_util.c +++ b/src/ptserver/pt_util.c @@ -23,8 +23,6 @@ #include #include -RCSID - ("$Header$"); #include /*Command line parsing */ #include diff --git a/src/ptserver/ptclient.c b/src/ptserver/ptclient.c index ba24d62..cfe558a 100644 --- a/src/ptserver/ptclient.c +++ b/src/ptserver/ptclient.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_AIX32_ENV #include diff --git a/src/ptserver/ptprocs.c b/src/ptserver/ptprocs.c index 44ec910..c56d670 100644 --- a/src/ptserver/ptprocs.c +++ b/src/ptserver/ptprocs.c @@ -50,8 +50,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/ptserver/pts.c b/src/ptserver/pts.c index 1a329c1..78cd175 100644 --- a/src/ptserver/pts.c +++ b/src/ptserver/pts.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c index 1a0d3c2..a8dda5c 100644 --- a/src/ptserver/ptserver.c +++ b/src/ptserver/ptserver.c @@ -112,8 +112,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_AIX32_ENV diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c index a5f7d16..8b31447 100644 --- a/src/ptserver/ptuser.c +++ b/src/ptserver/ptuser.c @@ -14,8 +14,6 @@ #include #endif -RCSID - ("$Header$"); #if defined(UKERNEL) #include "afs/sysincludes.h" diff --git a/src/ptserver/ptutils.c b/src/ptserver/ptutils.c index 0b5bba4..865936f 100644 --- a/src/ptserver/ptutils.c +++ b/src/ptserver/ptutils.c @@ -23,8 +23,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/ptserver/readgroup.c b/src/ptserver/readgroup.c index a07e3a2..4fe1bc7 100644 --- a/src/ptserver/readgroup.c +++ b/src/ptserver/readgroup.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/ptserver/readpwd.c b/src/ptserver/readpwd.c index c662ca3..f1f5479 100644 --- a/src/ptserver/readpwd.c +++ b/src/ptserver/readpwd.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/ptserver/testpt.c b/src/ptserver/testpt.c index abdab42..361e323 100644 --- a/src/ptserver/testpt.c +++ b/src/ptserver/testpt.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/ptserver/ubik.c b/src/ptserver/ubik.c index a68a825..d7d479d 100644 --- a/src/ptserver/ubik.c +++ b/src/ptserver/ubik.c @@ -3,8 +3,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/ptserver/utils.c b/src/ptserver/utils.c index 8d77ace..e7de534 100644 --- a/src/ptserver/utils.c +++ b/src/ptserver/utils.c @@ -11,8 +11,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/.cvsignore b/src/rx/.cvsignore deleted file mode 100644 index 3083643..0000000 --- a/src/rx/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -AFS_component_version_number.c -Makefile -RX_component_version_number.c -rxdebug -rxdumptrace -rxperf diff --git a/src/rx/AIX/rx_kmutex.c b/src/rx/AIX/rx_kmutex.c index 1a9d2e4..8e771fb 100644 --- a/src/rx/AIX/rx_kmutex.c +++ b/src/rx/AIX/rx_kmutex.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); /* * Currently everything is implemented in rx_kmutex.h diff --git a/src/rx/AIX/rx_knet.c b/src/rx/AIX/rx_knet.c index d3634c9..6ac9cdf 100644 --- a/src/rx/AIX/rx_knet.c +++ b/src/rx/AIX/rx_knet.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #ifdef AFS_AIX41_ENV #include "rx/rx_kcommon.h" diff --git a/src/rx/DARWIN/rx_kmutex.c b/src/rx/DARWIN/rx_kmutex.c index 98f9ba4..c502536 100644 --- a/src/rx/DARWIN/rx_kmutex.c +++ b/src/rx/DARWIN/rx_kmutex.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #ifndef AFS_DARWIN80_ENV /* diff --git a/src/rx/DARWIN/rx_knet.c b/src/rx/DARWIN/rx_knet.c index 152524b..8f8f623 100644 --- a/src/rx/DARWIN/rx_knet.c +++ b/src/rx/DARWIN/rx_knet.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "rx/rx_kcommon.h" diff --git a/src/rx/DUX/rx_kmutex.c b/src/rx/DUX/rx_kmutex.c index d82ea9c..8f69ed1 100644 --- a/src/rx/DUX/rx_kmutex.c +++ b/src/rx/DUX/rx_kmutex.c @@ -16,9 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); - /* * Currently everything is implemented in rx_kmutex.h */ diff --git a/src/rx/DUX/rx_knet.c b/src/rx/DUX/rx_knet.c index e9d2827..38584f3 100644 --- a/src/rx/DUX/rx_knet.c +++ b/src/rx/DUX/rx_knet.c @@ -10,9 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); - #ifdef AFS_DUX40_ENV #include "rx/rx_kcommon.h" diff --git a/src/rx/FBSD/rx_kmutex.c b/src/rx/FBSD/rx_kmutex.c index 973f5fd..0f96d03 100644 --- a/src/rx/FBSD/rx_kmutex.c +++ b/src/rx/FBSD/rx_kmutex.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); /* * Currently everything is implemented in rx_kmutex.h diff --git a/src/rx/FBSD/rx_knet.c b/src/rx/FBSD/rx_knet.c index 31eea90..51443cc 100644 --- a/src/rx/FBSD/rx_knet.c +++ b/src/rx/FBSD/rx_knet.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #ifdef AFS_FBSD40_ENV #include diff --git a/src/rx/HPUX/rx_kmutex.c b/src/rx/HPUX/rx_kmutex.c index 9e22401..6862ed6 100644 --- a/src/rx/HPUX/rx_kmutex.c +++ b/src/rx/HPUX/rx_kmutex.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); /* * Currently everything is implemented in rx_kmutex.h diff --git a/src/rx/HPUX/rx_knet.c b/src/rx/HPUX/rx_knet.c index 7a4f1aa..aa5c144 100644 --- a/src/rx/HPUX/rx_knet.c +++ b/src/rx/HPUX/rx_knet.c @@ -5,8 +5,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "h/types.h" #include "h/param.h" diff --git a/src/rx/IRIX/rx_kmutex.c b/src/rx/IRIX/rx_kmutex.c index 00816ca..971532d 100644 --- a/src/rx/IRIX/rx_kmutex.c +++ b/src/rx/IRIX/rx_kmutex.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); /* * Currently everything is implemented in rx_kmutex.h diff --git a/src/rx/IRIX/rx_knet.c b/src/rx/IRIX/rx_knet.c index 60098e5..c6a00c1 100644 --- a/src/rx/IRIX/rx_knet.c +++ b/src/rx/IRIX/rx_knet.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "rx/rx_kcommon.h" #include "h/tcp-param.h" diff --git a/src/rx/LINUX/rx_kmutex.c b/src/rx/LINUX/rx_kmutex.c index 0385c5f..9fe1b67 100644 --- a/src/rx/LINUX/rx_kmutex.c +++ b/src/rx/LINUX/rx_kmutex.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "rx/rx_kcommon.h" #include "rx_kmutex.h" diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c index ab1ec2b..ce811db 100644 --- a/src/rx/LINUX/rx_knet.c +++ b/src/rx/LINUX/rx_knet.c @@ -15,8 +15,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include #ifdef AFS_LINUX22_ENV diff --git a/src/rx/NBSD/rx_knet.c b/src/rx/NBSD/rx_knet.c index fee9c37..926c9a7 100644 --- a/src/rx/NBSD/rx_knet.c +++ b/src/rx/NBSD/rx_knet.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "rx/rx_kcommon.h" diff --git a/src/rx/OBSD/rx_knet.c b/src/rx/OBSD/rx_knet.c index e812534..569caac 100644 --- a/src/rx/OBSD/rx_knet.c +++ b/src/rx/OBSD/rx_knet.c @@ -10,8 +10,6 @@ #include #include "../afs/param.h" -RCSID - ("$Header$"); #include "../rx/rx_kcommon.h" diff --git a/src/rx/SOLARIS/rx_kmutex.c b/src/rx/SOLARIS/rx_kmutex.c index 149b7c9..c6dc80f 100644 --- a/src/rx/SOLARIS/rx_kmutex.c +++ b/src/rx/SOLARIS/rx_kmutex.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #if defined(AFS_SUN5_ENV) && defined(KERNEL) diff --git a/src/rx/SOLARIS/rx_knet.c b/src/rx/SOLARIS/rx_knet.c index 450e7ce..335a4aa 100644 --- a/src/rx/SOLARIS/rx_knet.c +++ b/src/rx/SOLARIS/rx_knet.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #ifdef AFS_SUN5_ENV #include "rx/rx_kcommon.h" diff --git a/src/rx/UKERNEL/rx_kmutex.c b/src/rx/UKERNEL/rx_kmutex.c index a0ed6b7..c669b6f 100644 --- a/src/rx/UKERNEL/rx_kmutex.c +++ b/src/rx/UKERNEL/rx_kmutex.c @@ -16,8 +16,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); /* * Currently everything is implemented in rx_kmutex.h diff --git a/src/rx/UKERNEL/rx_knet.c b/src/rx/UKERNEL/rx_knet.c index b2eac23..3139d83 100644 --- a/src/rx/UKERNEL/rx_knet.c +++ b/src/rx/UKERNEL/rx_knet.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "rx/rx_kcommon.h" diff --git a/src/rx/bulk.example/.cvsignore b/src/rx/bulk.example/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/rx/bulk.example/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/rx/bulk.example/bulk_client.c b/src/rx/bulk.example/bulk_client.c index cef110e..96f45d8 100644 --- a/src/rx/bulk.example/bulk_client.c +++ b/src/rx/bulk.example/bulk_client.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/bulk.example/bulk_io.c b/src/rx/bulk.example/bulk_io.c index ed8c3fb..d100127 100644 --- a/src/rx/bulk.example/bulk_io.c +++ b/src/rx/bulk.example/bulk_io.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/bulk.example/bulk_server.c b/src/rx/bulk.example/bulk_server.c index d39ed01..f4bc65c 100644 --- a/src/rx/bulk.example/bulk_server.c +++ b/src/rx/bulk.example/bulk_server.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/bulktest/.cvsignore b/src/rx/bulktest/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/rx/bulktest/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/rx/bulktest/bulk_client.c b/src/rx/bulktest/bulk_client.c index f0f0cc1..87129d0 100644 --- a/src/rx/bulktest/bulk_client.c +++ b/src/rx/bulktest/bulk_client.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/bulktest/bulk_io.c b/src/rx/bulktest/bulk_io.c index 05a0e17..077df74 100644 --- a/src/rx/bulktest/bulk_io.c +++ b/src/rx/bulktest/bulk_io.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/bulktest/bulk_server.c b/src/rx/bulktest/bulk_server.c index 8c04326..505a1fd 100644 --- a/src/rx/bulktest/bulk_server.c +++ b/src/rx/bulktest/bulk_server.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/multi.example/.cvsignore b/src/rx/multi.example/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/rx/multi.example/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/rx/multi.example/sample_client.c b/src/rx/multi.example/sample_client.c index 72a74d3..2aa918a 100644 --- a/src/rx/multi.example/sample_client.c +++ b/src/rx/multi.example/sample_client.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/multi.example/sample_server.c b/src/rx/multi.example/sample_server.c index ae984ef..28be0db 100644 --- a/src/rx/multi.example/sample_server.c +++ b/src/rx/multi.example/sample_server.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/rx.c b/src/rx/rx.c index 7a0d613..4a9a58c 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -16,8 +16,6 @@ #include #endif -RCSID - ("$Header$"); #ifdef KERNEL #include "afs/sysincludes.h" diff --git a/src/rx/rx_clock.c b/src/rx/rx_clock.c index 9d7ca30..64fc6bb 100644 --- a/src/rx/rx_clock.c +++ b/src/rx/rx_clock.c @@ -21,8 +21,6 @@ #include #endif -RCSID - ("$Header$"); #ifdef KERNEL #ifndef UKERNEL diff --git a/src/rx/rx_clock.h b/src/rx/rx_clock.h index 6b13f79..b0f1175 100644 --- a/src/rx/rx_clock.h +++ b/src/rx/rx_clock.h @@ -90,7 +90,7 @@ extern int clock_nUpdates; #if defined(AFS_SGI61_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_LINUX_64BIT_KERNEL) #define clock_GetTime(cv) osi_GetTime((osi_timeval_t *)cv) #else -#if defined(AFS_AIX51_ENV) && defined(AFS_64BIT_KERNEL) +#if (defined(AFS_AIX51_ENV) && defined(AFS_64BIT_KERNEL)) || (defined(AFS_DARWIN100_ENV) && defined(__amd64__)) #define clock_GetTime(cv) \ BEGIN \ struct timeval tv; \ diff --git a/src/rx/rx_clock_nt.c b/src/rx/rx_clock_nt.c index beb188c..acad9c2 100644 --- a/src/rx/rx_clock_nt.c +++ b/src/rx/rx_clock_nt.c @@ -13,8 +13,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/rx/rx_conncache.c b/src/rx/rx_conncache.c index 4754194..d190702 100644 --- a/src/rx/rx_conncache.c +++ b/src/rx/rx_conncache.c @@ -18,8 +18,6 @@ #include #endif -RCSID - ("$Header$"); #ifdef UKERNEL #include "afs/sysincludes.h" diff --git a/src/rx/rx_event.c b/src/rx/rx_event.c index 8f11669..56eed1f 100644 --- a/src/rx/rx_event.c +++ b/src/rx/rx_event.c @@ -18,8 +18,6 @@ #include #endif -RCSID - ("$Header$"); #ifdef KERNEL #ifndef UKERNEL diff --git a/src/rx/rx_getaddr.c b/src/rx/rx_getaddr.c index 39322e6..76c3f35 100644 --- a/src/rx/rx_getaddr.c +++ b/src/rx/rx_getaddr.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifndef AFS_DJGPP_ENV #ifndef KERNEL diff --git a/src/rx/rx_globals.c b/src/rx/rx_globals.c index e198603..3ac89ca 100644 --- a/src/rx/rx_globals.c +++ b/src/rx/rx_globals.c @@ -25,8 +25,6 @@ #include #endif -RCSID - ("$Header$"); /* Enable data initialization when the header file is included */ #define GLOBALSINIT(stuff) = stuff diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index 71b2927..927641b 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -14,8 +14,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "rx/rx_kcommon.h" diff --git a/src/rx/rx_lwp.c b/src/rx/rx_lwp.c index 74bd674..a77e00c 100644 --- a/src/rx/rx_lwp.c +++ b/src/rx/rx_lwp.c @@ -21,8 +21,6 @@ #include #include -RCSID - ("$Header$"); # include /* fd_set on older platforms */ # include diff --git a/src/rx/rx_misc.c b/src/rx/rx_misc.c index eb8167c..cc9c763 100644 --- a/src/rx/rx_misc.c +++ b/src/rx/rx_misc.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef KERNEL #include diff --git a/src/rx/rx_multi.c b/src/rx/rx_multi.c index b8b3f36..59b6d64 100644 --- a/src/rx/rx_multi.c +++ b/src/rx/rx_multi.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef KERNEL #include "afs/sysincludes.h" diff --git a/src/rx/rx_null.c b/src/rx/rx_null.c index d8ff2c1..a62916b 100644 --- a/src/rx/rx_null.c +++ b/src/rx/rx_null.c @@ -14,8 +14,6 @@ #include #endif -RCSID - ("$Header$"); #ifdef KERNEL #ifndef UKERNEL diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c index 9a18390..ba8d426 100644 --- a/src/rx/rx_packet.c +++ b/src/rx/rx_packet.c @@ -14,8 +14,6 @@ #include #endif -RCSID - ("$Header$"); #ifdef KERNEL #if defined(UKERNEL) diff --git a/src/rx/rx_pthread.c b/src/rx/rx_pthread.c index 14e3125..61a1cc6 100644 --- a/src/rx/rx_pthread.c +++ b/src/rx/rx_pthread.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c index c91d8be..3b82279 100644 --- a/src/rx/rx_rdwr.c +++ b/src/rx/rx_rdwr.c @@ -14,8 +14,6 @@ #include #endif -RCSID - ("$Header$"); #ifdef KERNEL #ifndef UKERNEL diff --git a/src/rx/rx_trace.c b/src/rx/rx_trace.c index 37b85d6..d4d5045 100644 --- a/src/rx/rx_trace.c +++ b/src/rx/rx_trace.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef RXDEBUG #include diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c index 4ab3d3b..6630baa 100644 --- a/src/rx/rx_user.c +++ b/src/rx/rx_user.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); # include # include diff --git a/src/rx/rx_xmit_nt.c b/src/rx/rx_xmit_nt.c index dd4201d..323acff 100644 --- a/src/rx/rx_xmit_nt.c +++ b/src/rx/rx_xmit_nt.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #if defined(AFS_NT40_ENV) || defined(AFS_DJGPP_ENV) diff --git a/src/rx/rxdebug.c b/src/rx/rxdebug.c index 30dbaef..ce9f4df 100644 --- a/src/rx/rxdebug.c +++ b/src/rx/rxdebug.c @@ -10,9 +10,6 @@ #include #include -RCSID - ("$Header$"); - #include #include #ifdef AFS_NT40_ENV diff --git a/src/rx/rxperf.c b/src/rx/rxperf.c index 90aca79..f6d71b9 100644 --- a/src/rx/rxperf.c +++ b/src/rx/rxperf.c @@ -41,10 +41,6 @@ nn * We are using getopt since we want it to be possible to link to * transarc libs. */ -#ifdef RCSID -RCSID("$Id$"); -#endif - #include #include #include diff --git a/src/rx/simple.example/.cvsignore b/src/rx/simple.example/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/rx/simple.example/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/rx/simple.example/sample_client.c b/src/rx/simple.example/sample_client.c index 9bc43dd..38a1595 100644 --- a/src/rx/simple.example/sample_client.c +++ b/src/rx/simple.example/sample_client.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/simple.example/sample_server.c b/src/rx/simple.example/sample_server.c index ca2bffe..3342394 100644 --- a/src/rx/simple.example/sample_server.c +++ b/src/rx/simple.example/sample_server.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/test/.cvsignore b/src/rx/test/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/rx/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/rx/test/generator.c b/src/rx/test/generator.c index 2ca38cb..ee38ccf 100644 --- a/src/rx/test/generator.c +++ b/src/rx/test/generator.c @@ -52,8 +52,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/test/kctest.c b/src/rx/test/kctest.c index dba3b43..a9dcc2a 100644 --- a/src/rx/test/kctest.c +++ b/src/rx/test/kctest.c @@ -10,8 +10,6 @@ #include "afs/param.h" #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/test/kstest.c b/src/rx/test/kstest.c index c24dcf5..f40a88d 100644 --- a/src/rx/test/kstest.c +++ b/src/rx/test/kstest.c @@ -10,8 +10,6 @@ #include "afs/param.h" #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/test/tableGen.c b/src/rx/test/tableGen.c index 0c5461c..e74221d 100644 --- a/src/rx/test/tableGen.c +++ b/src/rx/test/tableGen.c @@ -19,8 +19,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/test/testclient.c b/src/rx/test/testclient.c index a053e0f..03b471a 100644 --- a/src/rx/test/testclient.c +++ b/src/rx/test/testclient.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/test/testqueue.c b/src/rx/test/testqueue.c index 5e9fa26..1159c96 100644 --- a/src/rx/test/testqueue.c +++ b/src/rx/test/testqueue.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/rx/test/testserver.c b/src/rx/test/testserver.c index cadc3d2..4c01dc9 100644 --- a/src/rx/test/testserver.c +++ b/src/rx/test/testserver.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rx/xdr.c b/src/rx/xdr.c index 54011e6..1f1abbc 100644 --- a/src/rx/xdr.c +++ b/src/rx/xdr.c @@ -35,8 +35,6 @@ #include #endif -RCSID - ("$Header$"); /* * xdr.c, Generic XDR routines implementation. diff --git a/src/rx/xdr_afsuuid.c b/src/rx/xdr_afsuuid.c index a149cfa..ee05347 100644 --- a/src/rx/xdr_afsuuid.c +++ b/src/rx/xdr_afsuuid.c @@ -14,8 +14,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #if defined(KERNEL) && !defined(UKERNEL) #ifdef AFS_LINUX20_ENV diff --git a/src/rx/xdr_array.c b/src/rx/xdr_array.c index a687df4..3d1174e 100644 --- a/src/rx/xdr_array.c +++ b/src/rx/xdr_array.c @@ -30,8 +30,6 @@ #include #include "rx.h" -RCSID - ("$Header$"); #ifndef NeXT diff --git a/src/rx/xdr_arrayn.c b/src/rx/xdr_arrayn.c index ea7da04..f995869 100644 --- a/src/rx/xdr_arrayn.c +++ b/src/rx/xdr_arrayn.c @@ -30,8 +30,6 @@ #include #include -RCSID - ("$Header$"); #if defined(AFS_OBSD44_ENV) && defined(KERNEL) && !defined(UKERNEL) /* XXX osi_alloc, please find and fix */ diff --git a/src/rx/xdr_float.c b/src/rx/xdr_float.c index eef3bdf..78e2c42 100644 --- a/src/rx/xdr_float.c +++ b/src/rx/xdr_float.c @@ -29,8 +29,6 @@ #include #include -RCSID - ("$Header$"); #ifndef NeXT diff --git a/src/rx/xdr_int32.c b/src/rx/xdr_int32.c index 58231df..eff58db 100644 --- a/src/rx/xdr_int32.c +++ b/src/rx/xdr_int32.c @@ -34,8 +34,6 @@ #include #endif -RCSID - ("$Header$"); #ifndef NeXT diff --git a/src/rx/xdr_int64.c b/src/rx/xdr_int64.c index 460cf39..9aa7445 100644 --- a/src/rx/xdr_int64.c +++ b/src/rx/xdr_int64.c @@ -6,8 +6,6 @@ #include #include -RCSID - ("$Header$"); #if defined(KERNEL) && !defined(UKERNEL) #ifdef AFS_LINUX20_ENV diff --git a/src/rx/xdr_mem.c b/src/rx/xdr_mem.c index 0430f1d..89568c6 100644 --- a/src/rx/xdr_mem.c +++ b/src/rx/xdr_mem.c @@ -29,8 +29,6 @@ #include #include -RCSID - ("$Header$"); #ifndef NeXT diff --git a/src/rx/xdr_rec.c b/src/rx/xdr_rec.c index 4cc014d..0c6bfc8 100644 --- a/src/rx/xdr_rec.c +++ b/src/rx/xdr_rec.c @@ -46,8 +46,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef HAVE_STDLIB_H diff --git a/src/rx/xdr_refernce.c b/src/rx/xdr_refernce.c index f8aa058..d214659 100644 --- a/src/rx/xdr_refernce.c +++ b/src/rx/xdr_refernce.c @@ -30,8 +30,6 @@ #include #include "rx.h" -RCSID - ("$Header$"); #ifndef NeXT diff --git a/src/rx/xdr_rx.c b/src/rx/xdr_rx.c index 4f2a425..0090869 100644 --- a/src/rx/xdr_rx.c +++ b/src/rx/xdr_rx.c @@ -18,8 +18,6 @@ #include #endif -RCSID - ("$Header$"); #ifdef KERNEL #include "afs/sysincludes.h" diff --git a/src/rx/xdr_stdio.c b/src/rx/xdr_stdio.c index bf82ade..1a4e2e2 100644 --- a/src/rx/xdr_stdio.c +++ b/src/rx/xdr_stdio.c @@ -29,8 +29,6 @@ #include #include -RCSID - ("$Header$"); #ifndef NeXT diff --git a/src/rx/xdr_update.c b/src/rx/xdr_update.c index e5c6687..89d402e 100644 --- a/src/rx/xdr_update.c +++ b/src/rx/xdr_update.c @@ -9,8 +9,6 @@ #include #include -RCSID - ("$Header$"); #ifndef NeXT #include "xdr.h" diff --git a/src/rxdebug/.cvsignore b/src/rxdebug/.cvsignore deleted file mode 100644 index afd9a24..0000000 --- a/src/rxdebug/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -rxdebug -rxdumptrace diff --git a/src/rxdebug/rxdebug.c b/src/rxdebug/rxdebug.c index b467aef..40e84bc 100644 --- a/src/rxdebug/rxdebug.c +++ b/src/rxdebug/rxdebug.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rxdebug/rxdumptrace.c b/src/rxdebug/rxdumptrace.c index b223117..c7af576 100644 --- a/src/rxdebug/rxdumptrace.c +++ b/src/rxdebug/rxdumptrace.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef RXDEBUG #include diff --git a/src/rxgen/.cvsignore b/src/rxgen/.cvsignore deleted file mode 100644 index b66d0ef..0000000 --- a/src/rxgen/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -AFS_component_version_number.c -Makefile -rxgen diff --git a/src/rxgen/rpc_clntout.c b/src/rxgen/rpc_clntout.c index 8a3b2aa..bc9bbd3 100644 --- a/src/rxgen/rpc_clntout.c +++ b/src/rxgen/rpc_clntout.c @@ -35,8 +35,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rxgen/rpc_cout.c b/src/rxgen/rpc_cout.c index 92a8645..f05e452 100644 --- a/src/rxgen/rpc_cout.c +++ b/src/rxgen/rpc_cout.c @@ -35,8 +35,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rxgen/rpc_hout.c b/src/rxgen/rpc_hout.c index 412af47..ab391c2 100644 --- a/src/rxgen/rpc_hout.c +++ b/src/rxgen/rpc_hout.c @@ -35,8 +35,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c index 1f3125b..046e000 100644 --- a/src/rxgen/rpc_main.c +++ b/src/rxgen/rpc_main.c @@ -36,8 +36,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c index d1d7e68..1579691 100644 --- a/src/rxgen/rpc_parse.c +++ b/src/rxgen/rpc_parse.c @@ -35,8 +35,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rxgen/rpc_scan.c b/src/rxgen/rpc_scan.c index 9447776..6949dd4 100644 --- a/src/rxgen/rpc_scan.c +++ b/src/rxgen/rpc_scan.c @@ -37,8 +37,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rxgen/rpc_svcout.c b/src/rxgen/rpc_svcout.c index 288e6ea..7df23a8 100644 --- a/src/rxgen/rpc_svcout.c +++ b/src/rxgen/rpc_svcout.c @@ -35,8 +35,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rxgen/rpc_util.c b/src/rxgen/rpc_util.c index 232c1fb..5ff86f1 100644 --- a/src/rxgen/rpc_util.c +++ b/src/rxgen/rpc_util.c @@ -35,8 +35,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rxgk/rxgk_clnt.c b/src/rxgk/rxgk_clnt.c index 5bcb2ce..5c75009 100644 --- a/src/rxgk/rxgk_clnt.c +++ b/src/rxgk/rxgk_clnt.c @@ -33,8 +33,6 @@ #include "rxgk_locl.h" -RCSID("$Id$"); - /* Security object specific client data */ typedef struct rxgk_clnt_class { struct rx_securityClass klass; diff --git a/src/rxgk/rxgk_common.c b/src/rxgk/rxgk_common.c index 7b4b6fd..094f81c 100644 --- a/src/rxgk/rxgk_common.c +++ b/src/rxgk/rxgk_common.c @@ -8,8 +8,6 @@ #include "rxgk_locl.h" -RCSID("$Id$"); - #include #include diff --git a/src/rxgk/rxgk_crkrb.c b/src/rxgk/rxgk_crkrb.c index 805c240..854e8de 100644 --- a/src/rxgk/rxgk_crkrb.c +++ b/src/rxgk/rxgk_crkrb.c @@ -38,8 +38,6 @@ #include "rxgk_locl.h" #include -RCSID("$Id$"); - struct _rxg_key_type { char *name; int enctype; diff --git a/src/rxgk/rxgk_crlha.c b/src/rxgk/rxgk_crlha.c index d034530..406b24a 100644 --- a/src/rxgk/rxgk_crlha.c +++ b/src/rxgk/rxgk_crlha.c @@ -33,8 +33,6 @@ #include "rxgk_locl.h" -RCSID("$Id$"); - #include #include diff --git a/src/rxgk/rxgk_crpc.c b/src/rxgk/rxgk_crpc.c index 09a6608..02b9221 100644 --- a/src/rxgk/rxgk_crpc.c +++ b/src/rxgk/rxgk_crpc.c @@ -8,8 +8,6 @@ #include "rxgk_locl.h" -RCSID("$Id$"); - #include #include "rxgk_proto.h" #include "rxgk_proto.cs.h" diff --git a/src/rxgk/rxgk_info.c b/src/rxgk/rxgk_info.c index 22f5164..32b9569 100644 --- a/src/rxgk/rxgk_info.c +++ b/src/rxgk/rxgk_info.c @@ -33,8 +33,6 @@ #include "rxgk_locl.h" -RCSID("$Id$"); - int32_t rxgk_GetServerInfo(struct rx_connection *con, rxgk_level *level, diff --git a/src/rxgk/rxgk_serv.c b/src/rxgk/rxgk_serv.c index 0f70214..d967ebf 100644 --- a/src/rxgk/rxgk_serv.c +++ b/src/rxgk/rxgk_serv.c @@ -33,8 +33,6 @@ #include "rxgk_locl.h" -RCSID("$Id$"); - #include #include "rxgk_proto.ss.h" diff --git a/src/rxgk/rxgk_srpc.c b/src/rxgk/rxgk_srpc.c index c0090fb..b1a9c87 100644 --- a/src/rxgk/rxgk_srpc.c +++ b/src/rxgk/rxgk_srpc.c @@ -8,8 +8,6 @@ #include "rxgk_locl.h" -RCSID("$Id$"); - #include #include diff --git a/src/rxgk/test_client.c b/src/rxgk/test_client.c index d0e4da9..9c88505 100644 --- a/src/rxgk/test_client.c +++ b/src/rxgk/test_client.c @@ -18,8 +18,6 @@ #include "rxgk_proto.cs.h" #include "test.cs.h" -RCSID("$Id$"); - /* * */ diff --git a/src/rxgk/test_server.c b/src/rxgk/test_server.c index 8b16929..c32c5e2 100644 --- a/src/rxgk/test_server.c +++ b/src/rxgk/test_server.c @@ -17,8 +17,6 @@ #include "rxgk_proto.ss.h" #include "test.ss.h" -RCSID("$Id$"); - /* * */ diff --git a/src/rxkad/.cvsignore b/src/rxkad/.cvsignore deleted file mode 100644 index afd6dab..0000000 --- a/src/rxkad/.cvsignore +++ /dev/null @@ -1,9 +0,0 @@ -AFS_component_version_number.c -Makefile -crypt_conn.c -fcrypt.c -fcrypt.h -rxkad.h -rxkad_errs.c -sboxes.h -fc_test diff --git a/src/rxkad/bg-fcrypt.c b/src/rxkad/bg-fcrypt.c index 2f775e2..3616216 100644 --- a/src/rxkad/bg-fcrypt.c +++ b/src/rxkad/bg-fcrypt.c @@ -37,8 +37,6 @@ #include #endif -RCSID - ("$Header$"); #define DEBUG 0 #ifdef KERNEL diff --git a/src/rxkad/crc.c b/src/rxkad/crc.c index 65a4827..de9cf4d 100644 --- a/src/rxkad/crc.c +++ b/src/rxkad/crc.c @@ -40,8 +40,6 @@ #include #endif -RCSID - ("$Header$"); #if defined(UKERNEL) #include "../afs/sysincludes.h" diff --git a/src/rxkad/domestic/crypt_conn.c b/src/rxkad/domestic/crypt_conn.c index 846d307..b443eda 100644 --- a/src/rxkad/domestic/crypt_conn.c +++ b/src/rxkad/domestic/crypt_conn.c @@ -18,8 +18,6 @@ #include #endif -RCSID - ("$Header$"); #ifdef KERNEL #include "afs/stds.h" diff --git a/src/rxkad/domestic/fcrypt.c b/src/rxkad/domestic/fcrypt.c index efd5613..4de1816 100644 --- a/src/rxkad/domestic/fcrypt.c +++ b/src/rxkad/domestic/fcrypt.c @@ -19,8 +19,6 @@ #include #endif -RCSID - ("$Header$"); #define DEBUG 0 #ifdef KERNEL diff --git a/src/rxkad/domestic/tcrypt.c b/src/rxkad/domestic/tcrypt.c index f103629..712e599 100644 --- a/src/rxkad/domestic/tcrypt.c +++ b/src/rxkad/domestic/tcrypt.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rxkad/md4.c b/src/rxkad/md4.c index 4c61fc1..890426d 100644 --- a/src/rxkad/md4.c +++ b/src/rxkad/md4.c @@ -63,7 +63,6 @@ #include "rxkad.h" #endif /* defined(UKERNEL) */ -RCSID("$Id$"); diff --git a/src/rxkad/md5.c b/src/rxkad/md5.c index 0e9fcf2..d699c19 100644 --- a/src/rxkad/md5.c +++ b/src/rxkad/md5.c @@ -62,7 +62,6 @@ #include "rxkad.h" #endif /* defined(UKERNEL) */ -RCSID("$Id$"); diff --git a/src/rxkad/rxkad_client.c b/src/rxkad/rxkad_client.c index 7caaf4e..26ef6df 100644 --- a/src/rxkad/rxkad_client.c +++ b/src/rxkad/rxkad_client.c @@ -18,8 +18,6 @@ #include #endif -RCSID - ("$Header$"); #ifdef KERNEL #include "afs/stds.h" diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c index 0d1351d..383bb56 100644 --- a/src/rxkad/rxkad_common.c +++ b/src/rxkad/rxkad_common.c @@ -22,8 +22,6 @@ #define INCLUDE_RXKAD_PRIVATE_DECLS -RCSID - ("$Header$"); #ifdef KERNEL #ifndef UKERNEL diff --git a/src/rxkad/rxkad_server.c b/src/rxkad/rxkad_server.c index c87478e..3a15a7b 100644 --- a/src/rxkad/rxkad_server.c +++ b/src/rxkad/rxkad_server.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rxkad/test/.cvsignore b/src/rxkad/test/.cvsignore deleted file mode 100644 index e8759a0..0000000 --- a/src/rxkad/test/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -Makefile -stress.h -stress.xdr.c -stress.cs.c -stress.ss.c -stress_errs.h -stress_errs.c diff --git a/src/rxkad/test/stress.c b/src/rxkad/test/stress.c index ba3aec4..1536d05 100644 --- a/src/rxkad/test/stress.c +++ b/src/rxkad/test/stress.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rxkad/test/stress_c.c b/src/rxkad/test/stress_c.c index 0b41a53..a9a131a 100644 --- a/src/rxkad/test/stress_c.c +++ b/src/rxkad/test/stress_c.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rxkad/test/stress_s.c b/src/rxkad/test/stress_s.c index fcc9cc9..673f773 100644 --- a/src/rxkad/test/stress_s.c +++ b/src/rxkad/test/stress_s.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/rxkad/ticket.c b/src/rxkad/ticket.c index 54bb3cd..4e0864b 100644 --- a/src/rxkad/ticket.c +++ b/src/rxkad/ticket.c @@ -14,8 +14,6 @@ #include #endif -RCSID - ("$Header$"); #if defined(UKERNEL) #include "afs/sysincludes.h" diff --git a/src/rxkad/ticket5.c b/src/rxkad/ticket5.c index 264153f..a83f7fe 100644 --- a/src/rxkad/ticket5.c +++ b/src/rxkad/ticket5.c @@ -61,8 +61,6 @@ #include #endif -RCSID - ("$Header$"); #if defined(UKERNEL) #include "../afs/sysincludes.h" diff --git a/src/rxstat/.cvsignore b/src/rxstat/.cvsignore deleted file mode 100644 index 528d581..0000000 --- a/src/rxstat/.cvsignore +++ /dev/null @@ -1,9 +0,0 @@ -AFS_component_version_number.c -Krxstat.cs.c -Krxstat.ss.c -Krxstat.xdr.c -Makefile -rxstat.cs.c -rxstat.h -rxstat.ss.c -rxstat.xdr.c diff --git a/src/rxstat/rxstat.c b/src/rxstat/rxstat.c index d224c22..11a821c 100644 --- a/src/rxstat/rxstat.c +++ b/src/rxstat/rxstat.c @@ -14,8 +14,6 @@ #endif #include -RCSID - ("$Header$"); #ifdef UKERNEL #include "afs/sysincludes.h" diff --git a/src/scout/.cvsignore b/src/scout/.cvsignore deleted file mode 100644 index 87fb35d..0000000 --- a/src/scout/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -AFS_component_version_number.c -Makefile -scout diff --git a/src/scout/scout.c b/src/scout/scout.c index c2a9118..d95f24d 100644 --- a/src/scout/scout.c +++ b/src/scout/scout.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #undef IN #ifdef AFS_AIX32_ENV diff --git a/src/sgistuff/.cvsignore b/src/sgistuff/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/sgistuff/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/sgistuff/herror.c b/src/sgistuff/herror.c index bd47f45..ae28c64 100644 --- a/src/sgistuff/herror.c +++ b/src/sgistuff/herror.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #ifndef AFS_DARWIN_ENV #include diff --git a/src/sgistuff/rcmd.c b/src/sgistuff/rcmd.c index d18f253..acb76a2 100644 --- a/src/sgistuff/rcmd.c +++ b/src/sgistuff/rcmd.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #ifdef aiws /*AIX*/ #include diff --git a/src/sgistuff/sgi_auth.c b/src/sgistuff/sgi_auth.c index ee26c7c..d0917ff 100644 --- a/src/sgistuff/sgi_auth.c +++ b/src/sgistuff/sgi_auth.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #if defined(AFS_SGI_ENV) diff --git a/src/sgistuff/ta-rauth.c b/src/sgistuff/ta-rauth.c index 700c7da..49fa6f2 100644 --- a/src/sgistuff/ta-rauth.c +++ b/src/sgistuff/ta-rauth.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/shlibafsauthent/.cvsignore b/src/shlibafsauthent/.cvsignore deleted file mode 100644 index b318ac5..0000000 --- a/src/shlibafsauthent/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -libafsauthent.so.1.0 diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in index e5e867d..c2a03a8 100644 --- a/src/shlibafsauthent/Makefile.in +++ b/src/shlibafsauthent/Makefile.in @@ -1,7 +1,7 @@ # API version. When something changes, increment as appropriate. # Ignore at your own risk. LIBAFSAUTHENTMAJOR=1 -LIBAFSAUTHENTMINOR=0 +LIBAFSAUTHENTMINOR=1 # Copyright 2000, International Business Machines Corporation and others. # All Rights Reserved. @@ -123,6 +123,12 @@ ${LIBAFSAUTHENT}: ${LIBOBJS} audit.o: ${AUDIT}/audit.c ${CCRULE} +audit-file.o: ${AUDIT}/audit-file.c + ${CCRULE} + +audit-sysvmq.o: ${AUDIT}/audit-sysvmq.c + ${CCRULE} + cellconfig.o: ${AUTH}/cellconfig.c ${CCRULE} diff --git a/src/shlibafsauthent/afsauthent.exp b/src/shlibafsauthent/afsauthent.exp index b5f8247..b7f34af 100644 --- a/src/shlibafsauthent/afsauthent.exp +++ b/src/shlibafsauthent/afsauthent.exp @@ -47,6 +47,7 @@ ktc_GetToken ktc_ListTokens ktc_OldPioctl ktc_SetToken +ktc_curpag ubik_Call ubik_Call_New ubik_CallIter diff --git a/src/shlibafsauthent/mapfile b/src/shlibafsauthent/mapfile index 7bf00c0..9dd026d 100644 --- a/src/shlibafsauthent/mapfile +++ b/src/shlibafsauthent/mapfile @@ -57,6 +57,7 @@ ktc_ListTokens; ktc_OldPioctl; ktc_SetToken; + ktc_curpag; ubik_Call; ubik_Call_New; ubik_CallIter; diff --git a/src/shlibafsrpc/.cvsignore b/src/shlibafsrpc/.cvsignore deleted file mode 100644 index ca4b2c5..0000000 --- a/src/shlibafsrpc/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -libafsrpc.so.1.1 diff --git a/src/sia/siad.c b/src/sia/siad.c index 01aa8e0..6555984 100644 --- a/src/sia/siad.c +++ b/src/sia/siad.c @@ -14,9 +14,6 @@ #include #include -RCSID - ("$Header$"); - #include #include #include diff --git a/src/sia/test-reauth.c b/src/sia/test-reauth.c index fd8ec1d..2c5e376 100644 --- a/src/sia/test-reauth.c +++ b/src/sia/test-reauth.c @@ -12,9 +12,6 @@ #include #include -RCSID - ("$Header$"); - #include #include #include diff --git a/src/sys/.cvsignore b/src/sys/.cvsignore deleted file mode 100644 index d1a117f..0000000 --- a/src/sys/.cvsignore +++ /dev/null @@ -1,13 +0,0 @@ -AFS_component_version_number.c -Makefile -libafssetpag.* -pagsh -pagsh.krb -picobj -rmtsys.cs.c -rmtsys.h -rmtsys.ss.c -rmtsys.xdr.c -rmtsysd -afs.exp -afsl.exp diff --git a/src/sys/afssyscalls.c b/src/sys/afssyscalls.c index e2335d4..852d5d2 100644 --- a/src/sys/afssyscalls.c +++ b/src/sys/afssyscalls.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include @@ -307,33 +305,6 @@ iwrite(int dev, int inode, int inode_p1, unsigned int offset, char *cbuf, #endif /* AFS_NAMEI_ENV */ -#if defined(AFS_DARWIN80_ENV) -int ioctl_afs_syscall(long syscall, long param1, long param2, long param3, - long param4, long param5, long param6, int *rval) { - struct afssysargs syscall_data; - int code; - int fd = open(SYSCALL_DEV_FNAME, O_RDWR); - if(fd < 0) - return -1; - - syscall_data.syscall = syscall; - syscall_data.param1 = param1; - syscall_data.param2 = param2; - syscall_data.param3 = param3; - syscall_data.param4 = param4; - syscall_data.param5 = param5; - syscall_data.param6 = param6; - - code = ioctl(fd, VIOC_SYSCALL, &syscall_data); - - close(fd); - if (code) - return code; - *rval=syscall_data.retval; - return 0; -} -#endif - int lpioctl(char *path, int cmd, char *cmarg, int follow) { @@ -352,7 +323,13 @@ lpioctl(char *path, int cmd, char *cmarg, int follow) if (rval) errcode = rval; #else + /* As kauth/user.c says, handle smoothly the case where no AFS system call + * exists (yet). */ + void (*old)() = signal(SIGSYS, SIG_IGN); + errcode = syscall(AFS_SYSCALL, AFSCALL_PIOCTL, path, cmd, cmarg, follow); + + signal(SIGSYS, old); #endif return (errcode); diff --git a/src/sys/fixit.c b/src/sys/fixit.c index 23e617a..9d472f6 100644 --- a/src/sys/fixit.c +++ b/src/sys/fixit.c @@ -32,8 +32,6 @@ to the free list when the files are removed from lost+found #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/sys/glue.c b/src/sys/glue.c index fd6cec6..518b499 100644 --- a/src/sys/glue.c +++ b/src/sys/glue.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include #include @@ -53,3 +51,55 @@ int proc_afs_syscall(long syscall, long param1, long param2, long param3, return 0; } #endif + +#if defined(AFS_DARWIN80_ENV) +int ioctl_afs_syscall(long syscall, long param1, long param2, long param3, + long param4, long param5, long param6, int *rval) { + struct afssysargs syscall_data; + void *ioctldata; + int code; + int fd = open(SYSCALL_DEV_FNAME, O_RDWR); + int syscallnum; +#ifdef AFS_DARWIN100_ENV + struct afssysargs64 syscall64_data; + if (sizeof(param1) == 8) { + syscallnum = VIOC_SYSCALL64; + ioctldata = &syscall64_data; + syscall64_data.syscall = (int)syscall; + syscall64_data.param1 = param1; + syscall64_data.param2 = param2; + syscall64_data.param3 = param3; + syscall64_data.param4 = param4; + syscall64_data.param5 = param5; + syscall64_data.param6 = param6; + } else { +#endif + syscallnum = VIOC_SYSCALL; + ioctldata = &syscall_data; + syscall_data.syscall = syscall; + syscall_data.param1 = param1; + syscall_data.param2 = param2; + syscall_data.param3 = param3; + syscall_data.param4 = param4; + syscall_data.param5 = param5; + syscall_data.param6 = param6; +#ifdef AFS_DARWIN100_ENV + } +#endif + if(fd >= 0) { + code = ioctl(fd, syscallnum, ioctldata); + close(fd); + } else + code = -1; + + if (code) + return code; +#ifdef AFS_DARWIN100_ENV + if (sizeof(param1) == 8) + *rval=syscall64_data.retval; + else +#endif + *rval=syscall_data.retval; + return 0; +} +#endif diff --git a/src/sys/icreate.c b/src/sys/icreate.c index 0680ec9..3b18484 100644 --- a/src/sys/icreate.c +++ b/src/sys/icreate.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include "AFS_component_version_number.c" diff --git a/src/sys/idec.c b/src/sys/idec.c index 583285b..3520580 100644 --- a/src/sys/idec.c +++ b/src/sys/idec.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/sys/iinc.c b/src/sys/iinc.c index e9400ec..11ebea4 100644 --- a/src/sys/iinc.c +++ b/src/sys/iinc.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/sys/iopen.c b/src/sys/iopen.c index dace6ff..6fbc689 100644 --- a/src/sys/iopen.c +++ b/src/sys/iopen.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/sys/iread.c b/src/sys/iread.c index a1d4bbc..413310e 100644 --- a/src/sys/iread.c +++ b/src/sys/iread.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/sys/istat.c b/src/sys/istat.c index 59a58db..2f54f9f 100644 --- a/src/sys/istat.c +++ b/src/sys/istat.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/sys/iwrite.c b/src/sys/iwrite.c index 9e4b6fc..3188b50 100644 --- a/src/sys/iwrite.c +++ b/src/sys/iwrite.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/sys/pagsh.c b/src/sys/pagsh.c index 6087e59..116fe94 100644 --- a/src/sys/pagsh.c +++ b/src/sys/pagsh.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_AIX32_ENV #include diff --git a/src/sys/pioctl_nt.c b/src/sys/pioctl_nt.c index 3a3f83e..e2c2c6f 100644 --- a/src/sys/pioctl_nt.c +++ b/src/sys/pioctl_nt.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/sys/rmtsysc.c b/src/sys/rmtsysc.c index 83e7bf9..553eb30 100644 --- a/src/sys/rmtsysc.c +++ b/src/sys/rmtsysc.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/sys/rmtsysd.c b/src/sys/rmtsysd.c index aceb44b..67d12f4 100644 --- a/src/sys/rmtsysd.c +++ b/src/sys/rmtsysd.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_AIX32_ENV #include diff --git a/src/sys/rmtsysnet.c b/src/sys/rmtsysnet.c index 4430b38..db8e2d3 100644 --- a/src/sys/rmtsysnet.c +++ b/src/sys/rmtsysnet.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/sys/rmtsyss.c b/src/sys/rmtsyss.c index 2cb68a9..d410958 100644 --- a/src/sys/rmtsyss.c +++ b/src/sys/rmtsyss.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/sys/setpag.c b/src/sys/setpag.c index 3e2e8c8..1f57738 100644 --- a/src/sys/setpag.c +++ b/src/sys/setpag.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #include #if defined(AFS_SUN_ENV) && !defined(AFS_SUN5_ENV) @@ -55,6 +53,8 @@ lsetpag(void) if(rval) errcode = syscall(AFS_SYSCALL, AFSCALL_SETPAG); +#elif defined(AFS_DARWIN80_ENV) + errcode = ioctl_afs_syscall(AFSCALL_SETPAG,0,0,0,0,0,0,&errcode); #else errcode = syscall(AFS_SYSCALL, AFSCALL_SETPAG); #endif diff --git a/src/tbutc/.cvsignore b/src/tbutc/.cvsignore deleted file mode 100644 index a61d2f6..0000000 --- a/src/tbutc/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -AFS_component_version_number.c -Makefile -butc diff --git a/src/tests/.cvsignore b/src/tests/.cvsignore deleted file mode 100644 index 033612b..0000000 --- a/src/tests/.cvsignore +++ /dev/null @@ -1,71 +0,0 @@ -xf_errs.c -xf_errs.h -OS.pm -Dirpath.pm -Makefile -afsdump_dirlist -afsdump_extract -afsdump_scan -append-over-page -asu -blocks-new-file -create-dirs -create-files -create-remove -create-stat -create-symlinks -dumpscan_errs.c -dumpscan_errs.h -dumptool -dup2-and-unlog -echo-n -exit-wo-close -fchmod -fsx -hardlink1 -hardlink2 -hardlink4 -hello-world -intr-read -kill-softer -kill-softly -large-dir -large-dir2 -large-dir3 -make-page -mkdir2 -mkdir3 -mmap-and-read -mmap-cat -mmap-shared-write -mmap-vs-read -mmap-vs-read2 -mountpoint -pine -read-vs-mmap -read-vs-mmap2 -read-write -readdir-vs-lstat -rename-under-feet -rename5 -rename6 -rm-rf -run-tests -still-there-p -strange-characters-c -symlink -test-parallel1 -test-parallel2 -test-setgroups -test-setpag -truncate -truncate-files -utime-dir -utime-file -write-closed -write-closed2 -write-large -write-rand -write-ro-file -write-ucc -write3 diff --git a/src/tests/OpenAFS/.cvsignore b/src/tests/OpenAFS/.cvsignore deleted file mode 100644 index f1dbfb1..0000000 --- a/src/tests/OpenAFS/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Dirpath.pm diff --git a/src/tests/apwd.c b/src/tests/apwd.c index 16e21f8..2921d1f 100644 --- a/src/tests/apwd.c +++ b/src/tests/apwd.c @@ -56,7 +56,6 @@ #endif #endif -RCSID("$Id$"); static int verbose_flag; static FILE *verbose_fp = NULL; diff --git a/src/tests/asu.c b/src/tests/asu.c index 33b2002..ec300b3 100644 --- a/src/tests/asu.c +++ b/src/tests/asu.c @@ -33,7 +33,6 @@ #ifdef HAVE_CONFIG_H #include -RCSID("$Id$"); #endif #include diff --git a/src/tests/create-dirs.c b/src/tests/create-dirs.c index 3e587c0..956c78b 100644 --- a/src/tests/create-dirs.c +++ b/src/tests/create-dirs.c @@ -46,10 +46,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static int creat_dirs(int count) { diff --git a/src/tests/create-files.c b/src/tests/create-files.c index 4e2aac7..30e69b7 100644 --- a/src/tests/create-files.c +++ b/src/tests/create-files.c @@ -51,10 +51,6 @@ #undef min #define min(a,b) ((a) < (b) ? (a) : (b)) -#ifdef RCSID -RCSID("$Id$"); -#endif - static int creat_files(int count, long startsize) { diff --git a/src/tests/create-remove.c b/src/tests/create-remove.c index 416bbcb..3923d45 100644 --- a/src/tests/create-remove.c +++ b/src/tests/create-remove.c @@ -46,10 +46,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static int creat_dir(const char *name) { diff --git a/src/tests/create-stat.c b/src/tests/create-stat.c index f3f2d9c..8b088b0 100644 --- a/src/tests/create-stat.c +++ b/src/tests/create-stat.c @@ -55,10 +55,6 @@ struct VenusFid { struct AFSFid Fid; }; -#ifdef RCSID -RCSID("$Id$"); -#endif - static void usage(int ret) { diff --git a/src/tests/create-symlinks.c b/src/tests/create-symlinks.c index c2829aa..d6089a8 100644 --- a/src/tests/create-symlinks.c +++ b/src/tests/create-symlinks.c @@ -47,10 +47,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - #define CONTENT_STRING "kaka" static FILE *verbose_fp = NULL; diff --git a/src/tests/err.c b/src/tests/err.c index fdb6ca2..00a9da7 100644 --- a/src/tests/err.c +++ b/src/tests/err.c @@ -33,7 +33,6 @@ #ifdef HAVE_CONFIG_H #include -RCSID("$Id$"); #endif #include "err.h" diff --git a/src/tests/errx.c b/src/tests/errx.c index 57cacc9..14ea051 100644 --- a/src/tests/errx.c +++ b/src/tests/errx.c @@ -33,7 +33,6 @@ #ifdef HAVE_CONFIG_H #include -RCSID("$Id$"); #endif #include "err.h" diff --git a/src/tests/exit-wo-close.c b/src/tests/exit-wo-close.c index ed23e8d..bb2005a 100644 --- a/src/tests/exit-wo-close.c +++ b/src/tests/exit-wo-close.c @@ -46,10 +46,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static int child(const char *filename) { diff --git a/src/tests/fhbench.c b/src/tests/fhbench.c index 13bb8d5..0f58c97 100644 --- a/src/tests/fhbench.c +++ b/src/tests/fhbench.c @@ -54,7 +54,6 @@ #include #include -RCSID("$Id$"); struct fhb_handle { char data[512]; diff --git a/src/tests/ga-test.c b/src/tests/ga-test.c index 8a2faa4..6e1fde8 100644 --- a/src/tests/ga-test.c +++ b/src/tests/ga-test.c @@ -45,7 +45,6 @@ #include -RCSID("$Id$"); typedef struct { int style; diff --git a/src/tests/hardlink1.c b/src/tests/hardlink1.c index 0a29d03..04dd47f 100644 --- a/src/tests/hardlink1.c +++ b/src/tests/hardlink1.c @@ -43,10 +43,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - int main(int argc, char *argv[]) { diff --git a/src/tests/hardlink2.c b/src/tests/hardlink2.c index e3424ff..210d90f 100644 --- a/src/tests/hardlink2.c +++ b/src/tests/hardlink2.c @@ -43,10 +43,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - int main(int argc, char *argv[]) { diff --git a/src/tests/hardlink4.c b/src/tests/hardlink4.c index ec76e63..83daa74 100644 --- a/src/tests/hardlink4.c +++ b/src/tests/hardlink4.c @@ -43,10 +43,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - int main(int argc, char *argv[]) { diff --git a/src/tests/invalidate-file.c b/src/tests/invalidate-file.c index 9006ce6..1fdcb78 100644 --- a/src/tests/invalidate-file.c +++ b/src/tests/invalidate-file.c @@ -52,7 +52,6 @@ #include -RCSID("$Id$"); #ifndef MAP_FAILED #define MAP_FAILED ((void *)-1) diff --git a/src/tests/kill-softer.c b/src/tests/kill-softer.c index 9487b2b..104aaf2 100644 --- a/src/tests/kill-softer.c +++ b/src/tests/kill-softer.c @@ -46,10 +46,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static FILE *verbose; struct entry { diff --git a/src/tests/kill-softly.c b/src/tests/kill-softly.c index 4d397ce..e19c2ec 100644 --- a/src/tests/kill-softly.c +++ b/src/tests/kill-softly.c @@ -46,10 +46,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - struct entry { char *name; int status; diff --git a/src/tests/large-dir.c b/src/tests/large-dir.c index ce4e49c..1c35635 100644 --- a/src/tests/large-dir.c +++ b/src/tests/large-dir.c @@ -46,10 +46,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static int creat_files(const char *dirname, int count) { diff --git a/src/tests/large-dir2.c b/src/tests/large-dir2.c index e1d165d..0679713 100644 --- a/src/tests/large-dir2.c +++ b/src/tests/large-dir2.c @@ -46,10 +46,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static int creat_files(const char *dirname, int count) { diff --git a/src/tests/large-dir3.c b/src/tests/large-dir3.c index 6eaf5a8..bf5c27d 100644 --- a/src/tests/large-dir3.c +++ b/src/tests/large-dir3.c @@ -46,10 +46,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static int creat_files(const char *dirname, int count) { diff --git a/src/tests/mkdir2.c b/src/tests/mkdir2.c index ffbf24c..39bf04e 100644 --- a/src/tests/mkdir2.c +++ b/src/tests/mkdir2.c @@ -43,10 +43,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - int main(int argc, char *argv[]) { diff --git a/src/tests/mkdir3.c b/src/tests/mkdir3.c index a048fcc..3be7900 100644 --- a/src/tests/mkdir3.c +++ b/src/tests/mkdir3.c @@ -43,10 +43,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - int main(int argc, char *argv[]) { diff --git a/src/tests/mmap-and-read.c b/src/tests/mmap-and-read.c index b818ee6..3cf3a22 100644 --- a/src/tests/mmap-and-read.c +++ b/src/tests/mmap-and-read.c @@ -46,10 +46,6 @@ #include #include -#ifdef RCSID -RCSID("$Id$"); -#endif - #ifndef MAP_FAILED #define MAP_FAILED ((void *)-1) #endif diff --git a/src/tests/mmap-shared-write.c b/src/tests/mmap-shared-write.c index 9755553..d292192 100644 --- a/src/tests/mmap-shared-write.c +++ b/src/tests/mmap-shared-write.c @@ -50,10 +50,6 @@ #define MAP_FAILED ((void *)-1) #endif -#ifdef RCSID -RCSID("$Id$"); -#endif - static int doit(const char *filename) { diff --git a/src/tests/mmap-vs-read.c b/src/tests/mmap-vs-read.c index 01780d5..e4879b3 100644 --- a/src/tests/mmap-vs-read.c +++ b/src/tests/mmap-vs-read.c @@ -46,10 +46,6 @@ #include #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static int debug = 0; static void diff --git a/src/tests/mmap-vs-read2.c b/src/tests/mmap-vs-read2.c index f9cb737..5cc7416 100644 --- a/src/tests/mmap-vs-read2.c +++ b/src/tests/mmap-vs-read2.c @@ -46,10 +46,6 @@ #include #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static int debug = 0; static void diff --git a/src/tests/read-vs-mmap.c b/src/tests/read-vs-mmap.c index 30cbc69..5302afd 100644 --- a/src/tests/read-vs-mmap.c +++ b/src/tests/read-vs-mmap.c @@ -46,10 +46,6 @@ #include #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static int debug = 0; static void diff --git a/src/tests/read-vs-mmap2.c b/src/tests/read-vs-mmap2.c index 8d87429..4381681 100644 --- a/src/tests/read-vs-mmap2.c +++ b/src/tests/read-vs-mmap2.c @@ -46,10 +46,6 @@ #include #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static void generate_random_file(const char *filename, size_t sz) { diff --git a/src/tests/read-write.c b/src/tests/read-write.c index 06a507b..07d9140 100644 --- a/src/tests/read-write.c +++ b/src/tests/read-write.c @@ -46,10 +46,6 @@ #include #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static char * write_random_file(int fd, size_t sz) { diff --git a/src/tests/readdir-vs-lstat.c b/src/tests/readdir-vs-lstat.c index dee889a..7566baf 100644 --- a/src/tests/readdir-vs-lstat.c +++ b/src/tests/readdir-vs-lstat.c @@ -47,10 +47,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static int verify_inodes(const char *dirname) { diff --git a/src/tests/rm-rf.c b/src/tests/rm-rf.c index 779dc03..d5045e4 100644 --- a/src/tests/rm-rf.c +++ b/src/tests/rm-rf.c @@ -46,10 +46,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static void kill_one(const char *filename); diff --git a/src/tests/snprintf.c b/src/tests/snprintf.c index 4990cca..dcf560a 100644 --- a/src/tests/snprintf.c +++ b/src/tests/snprintf.c @@ -33,7 +33,6 @@ #ifdef HAVE_CONFIG_H #include -RCSID("$Id$"); #endif #include #include diff --git a/src/tests/strange-characters-c.c b/src/tests/strange-characters-c.c index c131b99..ce1bd85 100644 --- a/src/tests/strange-characters-c.c +++ b/src/tests/strange-characters-c.c @@ -43,10 +43,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static void creat_file(char *name) { diff --git a/src/tests/symlink.c b/src/tests/symlink.c index fdd5492..9726510 100644 --- a/src/tests/symlink.c +++ b/src/tests/symlink.c @@ -46,10 +46,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - int main(int argc, char **argv) { diff --git a/src/tests/test-parallel1.c b/src/tests/test-parallel1.c index c27bf9e..dd208c6 100644 --- a/src/tests/test-parallel1.c +++ b/src/tests/test-parallel1.c @@ -45,10 +45,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - #define WORKER_TIMES 100 #define NUM_WORKER 10 diff --git a/src/tests/test-parallel2.c b/src/tests/test-parallel2.c index 9cb8b4d..1606f3a 100644 --- a/src/tests/test-parallel2.c +++ b/src/tests/test-parallel2.c @@ -46,10 +46,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - #define WORKER_TIMES 1000 #define NUM_WORKER 100 diff --git a/src/tests/test-setgroups.c b/src/tests/test-setgroups.c index 40283c4..72730d7 100644 --- a/src/tests/test-setgroups.c +++ b/src/tests/test-setgroups.c @@ -44,10 +44,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - #if !defined(NGROUPS) && defined(NGROUPS_MAX) #define NGROUPS NGROUPS_MAX #endif diff --git a/src/tests/test-setpag.c b/src/tests/test-setpag.c index b8d3b76..d929498 100644 --- a/src/tests/test-setpag.c +++ b/src/tests/test-setpag.c @@ -45,10 +45,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - #if !defined(NGROUPS) && defined(NGROUPS_MAX) #define NGROUPS NGROUPS_MAX #endif diff --git a/src/tests/truncate-files.c b/src/tests/truncate-files.c index d14e96a..b55df55 100644 --- a/src/tests/truncate-files.c +++ b/src/tests/truncate-files.c @@ -46,10 +46,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static void do_dir(const char *); static void repeat_dir(const char *); diff --git a/src/tests/utime-file.c b/src/tests/utime-file.c index 6a09d32..2594b67 100644 --- a/src/tests/utime-file.c +++ b/src/tests/utime-file.c @@ -35,10 +35,6 @@ #include #endif -#ifdef RCSID -RCSID("$Id$"); -#endif - #include #include #include diff --git a/src/tests/verr.c b/src/tests/verr.c index aab4e44..099a063 100644 --- a/src/tests/verr.c +++ b/src/tests/verr.c @@ -33,7 +33,6 @@ #ifdef HAVE_CONFIG_H #include -RCSID("$Id$"); #endif #include diff --git a/src/tests/verrx.c b/src/tests/verrx.c index c45cd7c..68c9b5d 100644 --- a/src/tests/verrx.c +++ b/src/tests/verrx.c @@ -33,7 +33,6 @@ #ifdef HAVE_CONFIG_H #include -RCSID("$Id$"); #endif #include diff --git a/src/tests/vwarn.c b/src/tests/vwarn.c index 3f0561f..37744e5 100644 --- a/src/tests/vwarn.c +++ b/src/tests/vwarn.c @@ -33,7 +33,6 @@ #ifdef HAVE_CONFIG_H #include -RCSID("$Id$"); #endif #include diff --git a/src/tests/vwarnx.c b/src/tests/vwarnx.c index acfd0f2..0d83957 100644 --- a/src/tests/vwarnx.c +++ b/src/tests/vwarnx.c @@ -33,7 +33,6 @@ #ifdef HAVE_CONFIG_H #include -RCSID("$Id$"); #endif #include diff --git a/src/tests/warn.c b/src/tests/warn.c index 967b71c..5611293 100644 --- a/src/tests/warn.c +++ b/src/tests/warn.c @@ -33,7 +33,6 @@ #ifdef HAVE_CONFIG_H #include -RCSID("$Id$"); #endif #include "err.h" diff --git a/src/tests/warnerr.c b/src/tests/warnerr.c index 821e99e..f001548 100644 --- a/src/tests/warnerr.c +++ b/src/tests/warnerr.c @@ -33,7 +33,6 @@ #ifdef HAVE_CONFIG_H #include -RCSID("$Id$"); #endif #include "err.h" diff --git a/src/tests/warnx.c b/src/tests/warnx.c index 8d66e08..8d9ddfa 100644 --- a/src/tests/warnx.c +++ b/src/tests/warnx.c @@ -33,7 +33,6 @@ #ifdef HAVE_CONFIG_H #include -RCSID("$Id$"); #endif #include "err.h" diff --git a/src/tests/write-rand.c b/src/tests/write-rand.c index 8330bfe..1891f98 100644 --- a/src/tests/write-rand.c +++ b/src/tests/write-rand.c @@ -46,10 +46,6 @@ #include #include -#ifdef RCSID -RCSID("$Id$"); -#endif - static char * write_random_file(int fd, size_t sz) { diff --git a/src/tests/write-ro-file.c b/src/tests/write-ro-file.c index ee5e7f7..1fe7255 100644 --- a/src/tests/write-ro-file.c +++ b/src/tests/write-ro-file.c @@ -41,10 +41,6 @@ #include -#ifdef RCSID -RCSID("$Id$"); -#endif - int main(int argc, char *argv[]) { diff --git a/src/tsm41/.cvsignore b/src/tsm41/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/tsm41/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/tsm41/aix41_auth.c b/src/tsm41/aix41_auth.c index f74cba9..58fa888 100644 --- a/src/tsm41/aix41_auth.c +++ b/src/tsm41/aix41_auth.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #if defined(AFS_AIX41_ENV) && !defined(AFS_AIX51_ENV) #include diff --git a/src/tsm41/aix41_ident.c b/src/tsm41/aix41_ident.c index 80062dd..3541b17 100644 --- a/src/tsm41/aix41_ident.c +++ b/src/tsm41/aix41_ident.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #if defined(AFS_AIX41_ENV) && !defined(AFS_AIX51_ENV) #include diff --git a/src/tsm41/aix5_auth.c b/src/tsm41/aix5_auth.c index bd5c55c..cdbff33 100644 --- a/src/tsm41/aix5_auth.c +++ b/src/tsm41/aix5_auth.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #if defined(AFS_AIX51_ENV) #include diff --git a/src/tsm41/aix_aklog.c b/src/tsm41/aix_aklog.c index 457ed8e..1ebdd26 100644 --- a/src/tsm41/aix_aklog.c +++ b/src/tsm41/aix_aklog.c @@ -11,9 +11,6 @@ #include #include -RCSID - ("$Header$"); - #if defined(AFS_AIX51_ENV) #include #include diff --git a/src/tsm41/aix_auth_common.c b/src/tsm41/aix_auth_common.c index 5f9ab3a..b0013b5 100644 --- a/src/tsm41/aix_auth_common.c +++ b/src/tsm41/aix_auth_common.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #if defined(AFS_AIX41_ENV) #include diff --git a/src/tsm41/aix_ktc.c b/src/tsm41/aix_ktc.c index 946cce9..22b2683 100644 --- a/src/tsm41/aix_ktc.c +++ b/src/tsm41/aix_ktc.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #if defined(AFS_AIX41_ENV) #include diff --git a/src/tviced/.cvsignore b/src/tviced/.cvsignore deleted file mode 100644 index c89db7d..0000000 --- a/src/tviced/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -fileserver diff --git a/src/tvolser/.cvsignore b/src/tvolser/.cvsignore deleted file mode 100644 index 8aea0ea..0000000 --- a/src/tvolser/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -AFS_component_version_number.c -Makefile -volserver diff --git a/src/ubik/.cvsignore b/src/ubik/.cvsignore deleted file mode 100644 index 1dd0937..0000000 --- a/src/ubik/.cvsignore +++ /dev/null @@ -1,18 +0,0 @@ -AFS_component_version_number.c -Kubik_int.cs.c -Kubik_int.h -Kubik_int.xdr.c -Makefile -ubik.h -ubik_int.cs.c -ubik_int.h -ubik_int.ss.c -ubik_int.xdr.c -udebug -uerrors.c -utst_client -utst_int.cs.c -utst_int.h -utst_int.ss.c -utst_int.xdr.c -utst_server diff --git a/src/ubik/beacon.c b/src/ubik/beacon.c index 734ee0c..4540afe 100644 --- a/src/ubik/beacon.c +++ b/src/ubik/beacon.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/ubik/disk.c b/src/ubik/disk.c index 2fab5b7..b1925ff 100644 --- a/src/ubik/disk.c +++ b/src/ubik/disk.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/ubik/lock.c b/src/ubik/lock.c index 06c6f1a..96d24b5 100644 --- a/src/ubik/lock.c +++ b/src/ubik/lock.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifndef AFS_NT40_ENV diff --git a/src/ubik/phys.c b/src/ubik/phys.c index 917a919..202eedb 100644 --- a/src/ubik/phys.c +++ b/src/ubik/phys.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c index 5a2f767..33b95a3 100644 --- a/src/ubik/recovery.c +++ b/src/ubik/recovery.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/ubik/remote.c b/src/ubik/remote.c index 3d543d4..4547585 100644 --- a/src/ubik/remote.c +++ b/src/ubik/remote.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/ubik/ubik.c b/src/ubik/ubik.c index bc08ca2..cb8f1c9 100644 --- a/src/ubik/ubik.c +++ b/src/ubik/ubik.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/ubik/ubikclient.c b/src/ubik/ubikclient.c index f83f77f..750998f 100644 --- a/src/ubik/ubikclient.c +++ b/src/ubik/ubikclient.c @@ -14,8 +14,6 @@ #include #endif -RCSID - ("$Header$"); #if defined(UKERNEL) #include "afs/sysincludes.h" diff --git a/src/ubik/ubikcmd.c b/src/ubik/ubikcmd.c index 06cfca3..6fa7bbc 100644 --- a/src/ubik/ubikcmd.c +++ b/src/ubik/ubikcmd.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/ubik/udebug.c b/src/ubik/udebug.c index 6c24746..e71606e 100644 --- a/src/ubik/udebug.c +++ b/src/ubik/udebug.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/ubik/uinit.c b/src/ubik/uinit.c index be1306e..45a7216 100644 --- a/src/ubik/uinit.c +++ b/src/ubik/uinit.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/ubik/utst_client.c b/src/ubik/utst_client.c index 9387a35..b454a5a 100644 --- a/src/ubik/utst_client.c +++ b/src/ubik/utst_client.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/ubik/utst_server.c b/src/ubik/utst_server.c index eab0cef..a47a25d 100644 --- a/src/ubik/utst_server.c +++ b/src/ubik/utst_server.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/ubik/vote.c b/src/ubik/vote.c index d61ef05..f3c83c8 100644 --- a/src/ubik/vote.c +++ b/src/ubik/vote.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/update/.cvsignore b/src/update/.cvsignore deleted file mode 100644 index ef3b341..0000000 --- a/src/update/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -AFS_component_version_number.c -Makefile -upclient -update.cs.c -update.h -update.ss.c -update.xdr.c -upserver diff --git a/src/update/client.c b/src/update/client.c index 583c781..7ab657f 100644 --- a/src/update/client.c +++ b/src/update/client.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_AIX32_ENV diff --git a/src/update/server.c b/src/update/server.c index f66edc0..2c211c5 100644 --- a/src/update/server.c +++ b/src/update/server.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_AIX32_ENV diff --git a/src/update/utils.c b/src/update/utils.c index ae65ab4..073c84e 100644 --- a/src/update/utils.c +++ b/src/update/utils.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/usd/.cvsignore b/src/usd/.cvsignore deleted file mode 100644 index c6c769e..0000000 --- a/src/usd/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -AFS_component_version_number.c -Makefile diff --git a/src/usd/test/.cvsignore b/src/usd/test/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/usd/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/usd/test/usd_test.c b/src/usd/test/usd_test.c index 7e18c8b..f388a44 100644 --- a/src/usd/test/usd_test.c +++ b/src/usd/test/usd_test.c @@ -13,8 +13,6 @@ */ #include #include - RCSID - ("$Header$"); #include #include diff --git a/src/usd/usd_file.c b/src/usd/usd_file.c index 93279b4..bfb01b5 100644 --- a/src/usd/usd_file.c +++ b/src/usd/usd_file.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include @@ -28,7 +26,9 @@ RCSID #if defined(AFS_DUX40_ENV) || defined(AFS_OBSD_ENV) || defined(AFS_NBSD_ENV) #include #endif +#ifndef AFS_DARWIN100_ENV #include +#endif #endif /* AFS_AIX_ENV */ #include @@ -211,6 +211,9 @@ usd_FileIoctl(usd_handle_t usd, int req, void *arg) case USD_IOCTL_TAPEOPERATION: { +#ifdef AFS_DARWIN100_ENV + code = EOPNOTSUPP; +#else usd_tapeop_t *tapeOpp = (usd_tapeop_t *) arg; #if defined(AFS_AIX_ENV) struct stop os_tapeop; @@ -257,7 +260,7 @@ usd_FileIoctl(usd_handle_t usd, int req, void *arg) code = ioctl(fd, MTIOCTOP, &os_tapeop); #endif /* AFS_AIX_ENV */ - +#endif if (code == -1) { code = errno; } else { diff --git a/src/usd/usd_nt.c b/src/usd/usd_nt.c index 5abc0a5..c5b2216 100644 --- a/src/usd/usd_nt.c +++ b/src/usd/usd_nt.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/uss/.cvsignore b/src/uss/.cvsignore deleted file mode 100644 index 67bc787..0000000 --- a/src/uss/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -AFS_component_version_number.c -Makefile -lex.yy.c -uss -y.tab.c -y.tab.h diff --git a/src/uss/lex.l b/src/uss/lex.l index 213588f..976211f 100644 --- a/src/uss/lex.l +++ b/src/uss/lex.l @@ -11,9 +11,6 @@ #include #include -RCSID("$Header$"); - - #include #include "y.tab.h" diff --git a/src/uss/uss.c b/src/uss/uss.c index 2c66fee..d614575 100644 --- a/src/uss/uss.c +++ b/src/uss/uss.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_AIX32_ENV #include diff --git a/src/uss/uss_acl.c b/src/uss/uss_acl.c index 7347426..1a8b255 100644 --- a/src/uss/uss_acl.c +++ b/src/uss/uss_acl.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include "uss_acl.h" #include "uss_common.h" diff --git a/src/uss/uss_common.c b/src/uss/uss_common.c index 7cf2a99..c078f36 100644 --- a/src/uss/uss_common.c +++ b/src/uss/uss_common.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include "uss_common.h" /*Interface definitions */ #include /*MAXKTCREALMLEN & MAXKTCNAMELEN */ diff --git a/src/uss/uss_fs.c b/src/uss/uss_fs.c index 3b87470..ccbe118 100644 --- a/src/uss/uss_fs.c +++ b/src/uss/uss_fs.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include "uss_fs.h" /*Interface to this module */ #include diff --git a/src/uss/uss_kauth.c b/src/uss/uss_kauth.c index d735088..ed4d5f3 100644 --- a/src/uss/uss_kauth.c +++ b/src/uss/uss_kauth.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include "uss_kauth.h" /*Module interface */ #include "uss_common.h" /*Common defs & operations */ diff --git a/src/uss/uss_procs.c b/src/uss/uss_procs.c index df9f49a..bde95db 100644 --- a/src/uss/uss_procs.c +++ b/src/uss/uss_procs.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include "uss_procs.h" /*Module interface */ #include "uss_common.h" /*Common defs & operations */ diff --git a/src/uss/uss_ptserver.c b/src/uss/uss_ptserver.c index 901ac63..e72cc86 100644 --- a/src/uss/uss_ptserver.c +++ b/src/uss/uss_ptserver.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include "uss_ptserver.h" /*Module interface */ #include /*Protection Server client interface */ diff --git a/src/uss/uss_vol.c b/src/uss/uss_vol.c index 63110d2..18578c1 100644 --- a/src/uss/uss_vol.c +++ b/src/uss/uss_vol.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include "uss_vol.h" /*Interface to this module */ #include "uss_common.h" /*Common definitions */ diff --git a/src/util/.cvsignore b/src/util/.cvsignore deleted file mode 100644 index 0a663e1..0000000 --- a/src/util/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -AFS_component_version_number.c -Makefile -dirpath.h -sys diff --git a/src/util/afs_atomlist.c b/src/util/afs_atomlist.c index 2ed863b..6b41f27 100644 --- a/src/util/afs_atomlist.c +++ b/src/util/afs_atomlist.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef KERNEL #include "afs_atomlist.h" diff --git a/src/util/afs_lhash.c b/src/util/afs_lhash.c index 5f76ff2..de3c821 100644 --- a/src/util/afs_lhash.c +++ b/src/util/afs_lhash.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include "afs_atomlist.h" #include "afs_lhash.h" diff --git a/src/util/assert.c b/src/util/assert.c index a6b5ba7..e8f6d56 100644 --- a/src/util/assert.c +++ b/src/util/assert.c @@ -16,8 +16,6 @@ #endif #include -RCSID - ("$Header$"); #include #include "afsutil.h" diff --git a/src/util/base32.c b/src/util/base32.c index 3494c3c..70b85d8 100644 --- a/src/util/base32.c +++ b/src/util/base32.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include "afsutil.h" diff --git a/src/util/base64.c b/src/util/base64.c index 8c7efdb..5e483ea 100644 --- a/src/util/base64.c +++ b/src/util/base64.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_SGI_XFS_IOPS_ENV diff --git a/src/util/casestrcpy.c b/src/util/casestrcpy.c index 8e8e0ce..e8caafc 100644 --- a/src/util/casestrcpy.c +++ b/src/util/casestrcpy.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/util/dirpath.c b/src/util/dirpath.c index df1ce74..a40041f 100644 --- a/src/util/dirpath.c +++ b/src/util/dirpath.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/util/errmap_nt.c b/src/util/errmap_nt.c index a9ec2bd..de70626 100644 --- a/src/util/errmap_nt.c +++ b/src/util/errmap_nt.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/util/fileutil.c b/src/util/fileutil.c index e7e0c2d..b4bac78 100644 --- a/src/util/fileutil.c +++ b/src/util/fileutil.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/util/flipbase64.c b/src/util/flipbase64.c index 1b6d098..22aaf11 100644 --- a/src/util/flipbase64.c +++ b/src/util/flipbase64.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #if defined(AFS_NAMEI_ENV) diff --git a/src/util/get_krbrlm.c b/src/util/get_krbrlm.c index 21950b9..6196225 100644 --- a/src/util/get_krbrlm.c +++ b/src/util/get_krbrlm.c @@ -6,8 +6,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/util/hostparse.c b/src/util/hostparse.c index 448eda2..745a9d9 100644 --- a/src/util/hostparse.c +++ b/src/util/hostparse.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #ifdef UKERNEL #include "afs/sysincludes.h" diff --git a/src/util/hputil.c b/src/util/hputil.c index b9f8561..e540c9e 100644 --- a/src/util/hputil.c +++ b/src/util/hputil.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_HPUX_ENV #include diff --git a/src/util/isathing.c b/src/util/isathing.c index 6a724f5..952ce88 100644 --- a/src/util/isathing.c +++ b/src/util/isathing.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/util/kreltime.c b/src/util/kreltime.c index e89775a..1a24678 100644 --- a/src/util/kreltime.c +++ b/src/util/kreltime.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/util/ktime.c b/src/util/ktime.c index 49e3945..cdf7b60 100644 --- a/src/util/ktime.c +++ b/src/util/ktime.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/util/netutils.c b/src/util/netutils.c index 63d2995..766e24b 100644 --- a/src/util/netutils.c +++ b/src/util/netutils.c @@ -19,8 +19,6 @@ #include #endif -RCSID - ("$Header$"); #include #include diff --git a/src/util/netutils.h b/src/util/netutils.h index 3bb2c66..702a10e 100644 --- a/src/util/netutils.h +++ b/src/util/netutils.h @@ -7,10 +7,6 @@ * directory or online at http://www.openafs.org/dl/license10.html */ -/* - * RCSID("$Header") - */ - #ifndef OPENAFS_NETUTILS_H #define OPENAFS_NETUTILS_H diff --git a/src/util/pthread_glock.c b/src/util/pthread_glock.c index e6e6f78..3ab164c 100644 --- a/src/util/pthread_glock.c +++ b/src/util/pthread_glock.c @@ -10,12 +10,11 @@ #include #include -RCSID - ("$Header$"); #if defined(AFS_NT40_ENV) && defined(AFS_PTHREAD_ENV) #define AFS_GRMUTEX_DECLSPEC __declspec(dllexport) #endif +#ifdef AFS_PTHREAD_ENV #include #include @@ -85,3 +84,4 @@ pthread_recursive_mutex_unlock(pthread_recursive_mutex_t * mut) } return rc; } +#endif diff --git a/src/util/readdir_nt.c b/src/util/readdir_nt.c index cd2b68f..55d4729 100644 --- a/src/util/readdir_nt.c +++ b/src/util/readdir_nt.c @@ -19,8 +19,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/util/regex.c b/src/util/regex.c index 2d92d65..403a1d1 100644 --- a/src/util/regex.c +++ b/src/util/regex.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); /* * routines to do regular expression matching diff --git a/src/util/secutil_nt.c b/src/util/secutil_nt.c index f952304..14220b1 100644 --- a/src/util/secutil_nt.c +++ b/src/util/secutil_nt.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/util/serverLog.c b/src/util/serverLog.c index f41246c..d9dc0c0 100644 --- a/src/util/serverLog.c +++ b/src/util/serverLog.c @@ -19,8 +19,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/util/snprintf.c b/src/util/snprintf.c index 8236e65..e4caaf8 100644 --- a/src/util/snprintf.c +++ b/src/util/snprintf.c @@ -3,8 +3,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/util/strlcat.c b/src/util/strlcat.c index f9de844..340063b 100644 --- a/src/util/strlcat.c +++ b/src/util/strlcat.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #ifndef HAVE_STRLCAT diff --git a/src/util/strlcpy.c b/src/util/strlcpy.c index 0d92d00..fe189c4 100644 --- a/src/util/strlcpy.c +++ b/src/util/strlcpy.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #ifndef HAVE_STRLCPY diff --git a/src/util/sys.c b/src/util/sys.c index 40f18d8..95ae146 100644 --- a/src/util/sys.c +++ b/src/util/sys.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/util/test/.cvsignore b/src/util/test/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/util/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/util/test/b32.c b/src/util/test/b32.c index 849b932..37e17f4 100644 --- a/src/util/test/b32.c +++ b/src/util/test/b32.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #if !defined(AFS_NT40_ENV) diff --git a/src/util/test/b64.c b/src/util/test/b64.c index 9116f8c..36909d8 100644 --- a/src/util/test/b64.c +++ b/src/util/test/b64.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #if !defined(AFS_NT40_ENV) diff --git a/src/util/test/dirpath_test.c b/src/util/test/dirpath_test.c index b0584b7..5813dc1 100644 --- a/src/util/test/dirpath_test.c +++ b/src/util/test/dirpath_test.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/util/test/dtest.c b/src/util/test/dtest.c index 2c1c9cf..e1721d0 100644 --- a/src/util/test/dtest.c +++ b/src/util/test/dtest.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include "ktime.h" diff --git a/src/util/test/fb64.c b/src/util/test/fb64.c index 71ccfc0..580fc47 100644 --- a/src/util/test/fb64.c +++ b/src/util/test/fb64.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #if !defined(AFS_NAMEI_ENV) diff --git a/src/util/test/ktest.c b/src/util/test/ktest.c index fe79a8c..8dbb9ee 100644 --- a/src/util/test/ktest.c +++ b/src/util/test/ktest.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include "ktime.h" diff --git a/src/util/test/test_ktime.c b/src/util/test/test_ktime.c index e4ae73b..dd37298 100644 --- a/src/util/test/test_ktime.c +++ b/src/util/test/test_ktime.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include "ktime.h" diff --git a/src/util/test/treaddir.c b/src/util/test/treaddir.c index 63fcbf5..61e37e8 100644 --- a/src/util/test/treaddir.c +++ b/src/util/test/treaddir.c @@ -19,8 +19,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/util/uuid.c b/src/util/uuid.c index 3972aaa..4fc3ad0 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -49,8 +49,6 @@ #include #endif -RCSID - ("$Header$"); #ifdef KERNEL #include "afs/sysincludes.h" diff --git a/src/util/volparse.c b/src/util/volparse.c index a358da7..ffbd2e1 100644 --- a/src/util/volparse.c +++ b/src/util/volparse.c @@ -10,9 +10,6 @@ #include #include -RCSID - ("$Header$"); - #include #ifdef HAVE_STDLIB_H #include diff --git a/src/util/winsock_nt.c b/src/util/winsock_nt.c index 075a687..c17644a 100644 --- a/src/util/winsock_nt.c +++ b/src/util/winsock_nt.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/venus/.cvsignore b/src/venus/.cvsignore deleted file mode 100644 index 709f7e5..0000000 --- a/src/venus/.cvsignore +++ /dev/null @@ -1,10 +0,0 @@ -AFS_component_version_number.c -Makefile -cmdebug -fs -fstrace -kdump-* -up -kdump -kdump64 -livesys diff --git a/src/venus/cacheout.c b/src/venus/cacheout.c index 58a33e6..21a9087 100644 --- a/src/venus/cacheout.c +++ b/src/venus/cacheout.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/venus/cmdebug.c b/src/venus/cmdebug.c index 1685113..07de69b 100644 --- a/src/venus/cmdebug.c +++ b/src/venus/cmdebug.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/venus/fs.c b/src/venus/fs.c index 6006607..d9fe1f7 100644 --- a/src/venus/fs.c +++ b/src/venus/fs.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/venus/fstrace.c b/src/venus/fstrace.c index 43634c9..a3f6bce 100644 --- a/src/venus/fstrace.c +++ b/src/venus/fstrace.c @@ -13,8 +13,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/venus/gcpags.c b/src/venus/gcpags.c index a861433..e46aafb 100644 --- a/src/venus/gcpags.c +++ b/src/venus/gcpags.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/venus/kdump.c b/src/venus/kdump.c index 5701e8c..ec060e0 100644 --- a/src/venus/kdump.c +++ b/src/venus/kdump.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/venus/livesys.c b/src/venus/livesys.c index cde3204..4c86b03 100644 --- a/src/venus/livesys.c +++ b/src/venus/livesys.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/venus/test/.cvsignore b/src/venus/test/.cvsignore deleted file mode 100644 index 3298ea6..0000000 --- a/src/venus/test/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -fulltest -getinitparams -idtest -owntest diff --git a/src/venus/test/fulltest.c b/src/venus/test/fulltest.c index 49da1bd..f9475ce 100644 --- a/src/venus/test/fulltest.c +++ b/src/venus/test/fulltest.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/venus/test/getinitparams.c b/src/venus/test/getinitparams.c index 89f4800..5132c37 100644 --- a/src/venus/test/getinitparams.c +++ b/src/venus/test/getinitparams.c @@ -10,8 +10,6 @@ /* Get CM initialization parameters. */ #include -RCSID - ("$Header$"); #include #include diff --git a/src/venus/test/idtest.c b/src/venus/test/idtest.c index 9261f28..cb69119 100644 --- a/src/venus/test/idtest.c +++ b/src/venus/test/idtest.c @@ -11,8 +11,6 @@ #include #include -RCSID - ("$Header$"); main(argc, argv) { diff --git a/src/venus/test/owntest.c b/src/venus/test/owntest.c index a22b604..0bc08a7 100644 --- a/src/venus/test/owntest.c +++ b/src/venus/test/owntest.c @@ -14,8 +14,6 @@ #endif #include -RCSID - ("$Header$"); #include #include diff --git a/src/venus/twiddle.c b/src/venus/twiddle.c index bbcce21..48ece82 100644 --- a/src/venus/twiddle.c +++ b/src/venus/twiddle.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/venus/up.c b/src/venus/up.c index f35814e..8dee78e 100644 --- a/src/venus/up.c +++ b/src/venus/up.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); /* missing type from C language */ diff --git a/src/venus/whatfid.c b/src/venus/whatfid.c index 4b8462c..0250c04 100644 --- a/src/venus/whatfid.c +++ b/src/venus/whatfid.c @@ -13,8 +13,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vfsck/.cvsignore b/src/vfsck/.cvsignore deleted file mode 100644 index 932b9cc..0000000 --- a/src/vfsck/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -AFS_component_version_number.c -Makefile -vfsck diff --git a/src/vfsck/dir.c b/src/vfsck/dir.c index 29792eb..5594593 100644 --- a/src/vfsck/dir.c +++ b/src/vfsck/dir.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #define VICE /* allow us to put our changes in at will */ #include diff --git a/src/vfsck/dirutils.c b/src/vfsck/dirutils.c index 9b32466..31b2584 100644 --- a/src/vfsck/dirutils.c +++ b/src/vfsck/dirutils.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vfsck/inode.c b/src/vfsck/inode.c index c93e451..cff72ad 100644 --- a/src/vfsck/inode.c +++ b/src/vfsck/inode.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #define VICE /* control whether AFS changes are present */ #include diff --git a/src/vfsck/main.c b/src/vfsck/main.c index ee034f2..a6275b3 100644 --- a/src/vfsck/main.c +++ b/src/vfsck/main.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #define VICE /* allow us to put our changes in at will */ #include diff --git a/src/vfsck/pass1.c b/src/vfsck/pass1.c index 876f8f8..0ecb2b1 100644 --- a/src/vfsck/pass1.c +++ b/src/vfsck/pass1.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #define VICE #include diff --git a/src/vfsck/pass1b.c b/src/vfsck/pass1b.c index dd0eca1..dfd48e1 100644 --- a/src/vfsck/pass1b.c +++ b/src/vfsck/pass1b.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #define VICE #include diff --git a/src/vfsck/pass2.c b/src/vfsck/pass2.c index 59f4524..47e6c48 100644 --- a/src/vfsck/pass2.c +++ b/src/vfsck/pass2.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #define VICE #include diff --git a/src/vfsck/pass3.c b/src/vfsck/pass3.c index 34d0861..50751ad 100644 --- a/src/vfsck/pass3.c +++ b/src/vfsck/pass3.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #define VICE #include diff --git a/src/vfsck/pass4.c b/src/vfsck/pass4.c index 37f57ce..d4c54db 100644 --- a/src/vfsck/pass4.c +++ b/src/vfsck/pass4.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #define VICE #include diff --git a/src/vfsck/pass5.c b/src/vfsck/pass5.c index ab78313..96c762b 100644 --- a/src/vfsck/pass5.c +++ b/src/vfsck/pass5.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #define VICE #include diff --git a/src/vfsck/proplist.c b/src/vfsck/proplist.c index 8d0f74e..7b7b422 100644 --- a/src/vfsck/proplist.c +++ b/src/vfsck/proplist.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #define VICE /* control whether AFS changes are present */ diff --git a/src/vfsck/setup.c b/src/vfsck/setup.c index 87a99d2..4db9fd8 100644 --- a/src/vfsck/setup.c +++ b/src/vfsck/setup.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vfsck/ufs_subr.c b/src/vfsck/ufs_subr.c index c44141d..c8cb465 100644 --- a/src/vfsck/ufs_subr.c +++ b/src/vfsck/ufs_subr.c @@ -20,8 +20,6 @@ #include #include -RCSID - ("$Header$"); #define VICE diff --git a/src/vfsck/ufs_tables.c b/src/vfsck/ufs_tables.c index 6629f0b..522aedd 100644 --- a/src/vfsck/ufs_tables.c +++ b/src/vfsck/ufs_tables.c @@ -20,8 +20,6 @@ #include #include -RCSID - ("$Header$"); #ifdef KERNEL #include "param.h" diff --git a/src/vfsck/utilities.c b/src/vfsck/utilities.c index 4d42aa4..9d794d6 100644 --- a/src/vfsck/utilities.c +++ b/src/vfsck/utilities.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include #define VICE /* allow us to put our changes in at will */ diff --git a/src/vfsck/vprintf.c b/src/vfsck/vprintf.c index 849451d..243dc63 100644 --- a/src/vfsck/vprintf.c +++ b/src/vfsck/vprintf.c @@ -13,8 +13,6 @@ #include #include -RCSID - ("$Header$"); #define VICE /* allow us to put our changes in at will */ #include diff --git a/src/viced/.cvsignore b/src/viced/.cvsignore deleted file mode 100644 index 0c0c4c5..0000000 --- a/src/viced/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -AFS_component_version_number.c -Makefile -cbd -check_sysid -fileserver -fsprobe diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c index 987c633..bf1adc5 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -28,8 +28,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/viced/callback.c b/src/viced/callback.c index c6b05c2..b667995 100644 --- a/src/viced/callback.c +++ b/src/viced/callback.c @@ -82,8 +82,6 @@ #include #include -RCSID - ("$Header$"); #include #include /* for malloc() */ diff --git a/src/viced/check_sysid.c b/src/viced/check_sysid.c index b37b544..1f07b36 100644 --- a/src/viced/check_sysid.c +++ b/src/viced/check_sysid.c @@ -15,8 +15,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/viced/fsprobe.c b/src/viced/fsprobe.c index 326361b..a4ecc8c 100644 --- a/src/viced/fsprobe.c +++ b/src/viced/fsprobe.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/viced/host.c b/src/viced/host.c index 36614c4..1b6366b 100644 --- a/src/viced/host.c +++ b/src/viced/host.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/viced/physio.c b/src/viced/physio.c index 678e2bd..1d9b158 100644 --- a/src/viced/physio.c +++ b/src/viced/physio.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/viced/profile.c b/src/viced/profile.c index c643c05..f57afc0 100644 --- a/src/viced/profile.c +++ b/src/viced/profile.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/viced/viced.c b/src/viced/viced.c index d669ab2..84a76d0 100644 --- a/src/viced/viced.c +++ b/src/viced/viced.c @@ -19,8 +19,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vlserver/.cvsignore b/src/vlserver/.cvsignore deleted file mode 100644 index 09b149d..0000000 --- a/src/vlserver/.cvsignore +++ /dev/null @@ -1,14 +0,0 @@ -AFS_component_version_number.c -Kvldbint.cs.c -Kvldbint.xdr.c -Makefile -cnvldb -vl_errors.c -vlclient -vldb_check -vldbint.cs.c -vldbint.h -vldbint.ss.c -vldbint.xdr.c -vlserver -vlserver.h diff --git a/src/vlserver/cnvldb.c b/src/vlserver/cnvldb.c index c03dbd7..857e9ea 100644 --- a/src/vlserver/cnvldb.c +++ b/src/vlserver/cnvldb.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vlserver/sascnvldb.c b/src/vlserver/sascnvldb.c index e54cdcc..03adbfa 100644 --- a/src/vlserver/sascnvldb.c +++ b/src/vlserver/sascnvldb.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vlserver/vlclient.c b/src/vlserver/vlclient.c index fff95ed..c18874c 100644 --- a/src/vlserver/vlclient.c +++ b/src/vlserver/vlclient.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vlserver/vldb_check.c b/src/vlserver/vldb_check.c index 3602425..35719a1 100644 --- a/src/vlserver/vldb_check.c +++ b/src/vlserver/vldb_check.c @@ -46,8 +46,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vlserver/vlprocs.c b/src/vlserver/vlprocs.c index 5e0f125..de2e5d0 100644 --- a/src/vlserver/vlprocs.c +++ b/src/vlserver/vlprocs.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include @@ -180,9 +178,8 @@ SVL_CreateEntry(rxcall, newentry) VLog(1, ("OCreate Volume %d %s\n", newentry->volumeId[RWVOL], rxinfo(rxcall))); - /* XXX shouldn't we check to see if the r/o volume is duplicated? */ - if (newentry->volumeId[RWVOL] - && FindByID(trans, newentry->volumeId[RWVOL], RWVOL, &tentry, &errorcode)) { /* entry already exists, we fail */ + if (EntryIDExists(trans, newentry->volumeId, MAXTYPES, &errorcode)) { + /* at least one of the specified IDs already exists; we fail */ errorcode = VL_IDEXIST; goto abort; } else if (errorcode) { @@ -255,9 +252,8 @@ SVL_CreateEntryN(rxcall, newentry) VLog(1, ("Create Volume %d %s\n", newentry->volumeId[RWVOL], rxinfo(rxcall))); - /* XXX shouldn't we check to see if the r/o volume is duplicated? */ - if (newentry->volumeId[RWVOL] - && FindByID(trans, newentry->volumeId[RWVOL], RWVOL, &tentry, &errorcode)) { /* entry already exists, we fail */ + if (EntryIDExists(trans, newentry->volumeId, MAXTYPES, &errorcode)) { + /* at least one of the specified IDs already exists; we fail */ errorcode = VL_IDEXIST; goto abort; } else if (errorcode) { @@ -559,7 +555,7 @@ SVL_GetNewVolumeId(rxcall, Maxvolidbump, newvolumeid) afs_int32 Maxvolidbump; afs_int32 *newvolumeid; { - register afs_int32 errorcode, maxvolumeid; + afs_int32 errorcode, maxvolumeid; struct ubik_trans *trans; COUNT_REQ(VLGETNEWVOLUMEID); @@ -572,7 +568,12 @@ SVL_GetNewVolumeId(rxcall, Maxvolidbump, newvolumeid) if (errorcode = Init_VLdbase(&trans, LOCKWRITE, this_op)) goto end; - *newvolumeid = maxvolumeid = ntohl(cheader.vital_header.MaxVolumeId); + *newvolumeid = maxvolumeid = NextUnusedID(trans, + ntohl(cheader.vital_header.MaxVolumeId), Maxvolidbump, &errorcode); + if (errorcode) { + goto abort; + } + maxvolumeid += Maxvolidbump; VLog(1, ("GetNewVolid newmax=%d %s\n", maxvolumeid, rxinfo(rxcall))); cheader.vital_header.MaxVolumeId = htonl(maxvolumeid); @@ -609,6 +610,7 @@ SVL_ReplaceEntry(rxcall, volid, voltype, newentry, releasetype) int hashnewname; int hashVol[MAXTYPES]; struct nvlentry tentry; + afs_uint32 checkids[MAXTYPES]; COUNT_REQ(VLREPLACEENTRY); for (typeindex = 0; typeindex < MAXTYPES; typeindex++) @@ -642,6 +644,29 @@ SVL_ReplaceEntry(rxcall, volid, voltype, newentry, releasetype) ABORT(VL_BADENTRY); } + /* make sure none of the IDs we are changing to are already in use */ + memset(&checkids, 0, sizeof(checkids)); + for (typeindex = ROVOL; typeindex < MAXTYPES; typeindex++) { + if (tentry.volumeId[typeindex] != newentry->volumeId[typeindex]) { + checkids[typeindex] = newentry->volumeId[typeindex]; + } + } + if (EntryIDExists(trans, checkids, MAXTYPES, &errorcode)) { + ABORT(VL_IDEXIST); + } else if (errorcode) { + goto abort; + } + + /* make sure the name we're changing to doesn't already exist */ + if (strcmp(newentry->name, tentry.name)) { + struct nvlentry tmp_entry; + if (FindByName(trans, newentry->name, &tmp_entry, &errorcode)) { + ABORT(VL_NAMEEXIST); + } else if (errorcode) { + goto abort; + } + } + /* unhash volid entries if they're disappearing or changing. * Remember if we need to hash in the new value (we don't have to * rehash if volid stays same */ @@ -2686,10 +2711,41 @@ get_vldbupdateentry(trans, blockindex, updateentry, VlEntry) struct nvlentry *VlEntry; { int i, j, errorcode, serverindex; + struct vldbentry checkentry; + afs_uint32 checkids[MAXTYPES]; + + /* check if any specified new IDs are already present in the db. Do + * this check before doing anything else, so we don't get a half- + * updated entry. */ + memset(&checkids, 0, sizeof(checkids)); + if (updateentry->Mask & VLUPDATE_RWID) { + checkids[RWVOL] = updateentry->spares3; /* rw id */ + } + if (updateentry->Mask & VLUPDATE_READONLYID) { + checkids[ROVOL] = updateentry->ReadOnlyId; + } + if (updateentry->Mask & VLUPDATE_BACKUPID) { + checkids[BACKVOL] = updateentry->BackupId; + } + + if (EntryIDExists(trans, checkids, MAXTYPES, &errorcode)) { + return VL_IDEXIST; + } else if (errorcode) { + return errorcode; + } if (updateentry->Mask & VLUPDATE_VOLUMENAME) { + struct nvlentry tentry; + if (InvalidVolname(updateentry->name)) return VL_BADNAME; + + if (FindByName(trans, updateentry->name, &tentry, &errorcode)) { + return VL_NAMEEXIST; + } else if (errorcode) { + return errorcode; + } + if (errorcode = UnhashVolname(trans, blockindex, VlEntry)) return errorcode; strncpy(VlEntry->name, updateentry->name, sizeof(VlEntry->name)); diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c index 914058f..7b5dca7 100644 --- a/src/vlserver/vlserver.c +++ b/src/vlserver/vlserver.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vlserver/vlutils.c b/src/vlserver/vlutils.c index ce6a9a4..bf1d232 100644 --- a/src/vlserver/vlutils.c +++ b/src/vlserver/vlutils.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include @@ -680,6 +678,83 @@ FindByName(trans, volname, tentry, error) return 0; /* no such entry */ } +/** + * Returns whether or not any of the supplied volume IDs already exist + * in the vldb. + * + * @param trans the ubik transaction + * @param ids an array of volume IDs + * @param ids_len the number of elements in the 'ids' array + * @param error filled in with an error code in case of error + * + * @return whether any of the volume IDs are already used + * @retval 1 at least one of the volume IDs is already used + * @retval 0 none of the volume IDs are used, or an error occurred + */ +int +EntryIDExists(struct ubik_trans *trans, const afs_uint32 *ids, + afs_int32 ids_len, afs_int32 *error) +{ + afs_int32 typeindex; + struct nvlentry tentry; + + *error = 0; + + for (typeindex = 0; typeindex < ids_len; typeindex++) { + if (ids[typeindex] + && FindByID(trans, ids[typeindex], -1, &tentry, error)) { + + return 1; + } else if (*error) { + return 0; + } + } + + return 0; +} + +/** + * Finds the next range of unused volume IDs in the vldb. + * + * @param trans the ubik transaction + * @param maxvolid the current max vol ID, and where to start looking + * for an unused volume ID range + * @param bump how many volume IDs we need to be unused + * @param error filled in with an error code in case of error + * + * @return the next volume ID 'volid' such that the range + * [volid, volid+bump) of volume IDs is unused, or 0 if there's + * an error + */ +afs_uint32 +NextUnusedID(struct ubik_trans *trans, afs_uint32 maxvolid, afs_uint32 bump, + afs_int32 *error) +{ + struct nvlentry tentry; + afs_uint32 id; + afs_uint32 nfree; + + *error = 0; + + /* we simply start at the given maxvolid, keep a running tally of + * how many free volume IDs we've seen in a row, and return when + * we've seen 'bump' unused IDs in a row */ + for (id = maxvolid, nfree = 0; nfree < bump; ++id) { + if (FindByID(trans, id, -1, &tentry, error)) { + nfree = 0; + } else if (*error) { + return 0; + } else { + ++nfree; + } + } + + /* 'id' is now at the end of the [maxvolid,maxvolid+bump) range, + * but we need to return the first unused id, so subtract the + * number of current running free IDs to get the beginning */ + return id - nfree; +} + int HashNDump(trans, hashindex) struct ubik_trans *trans; diff --git a/src/vol/.cvsignore b/src/vol/.cvsignore deleted file mode 100644 index 154e50f..0000000 --- a/src/vol/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -AFS_component_version_number.c -Makefile -salvager -volinfo -gi -fs_conv_sol26 diff --git a/src/vol/clone.c b/src/vol/clone.c index b4fdeed..d4beec1 100644 --- a/src/vol/clone.c +++ b/src/vol/clone.c @@ -18,8 +18,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/common.c b/src/vol/common.c index af4d543..8fd922f 100644 --- a/src/vol/common.c +++ b/src/vol/common.c @@ -19,8 +19,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/vol/devname.c b/src/vol/devname.c index c06544a..920b295 100644 --- a/src/vol/devname.c +++ b/src/vol/devname.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/fs_conv_411.c b/src/vol/fs_conv_411.c index 0562038..cc0b20f 100644 --- a/src/vol/fs_conv_411.c +++ b/src/vol/fs_conv_411.c @@ -10,9 +10,6 @@ #include #include -RCSID - ("$Header$"); - #if defined(AFS_DUX40_ENV) || (defined(AFS_SUN_ENV) && !defined(AFS_SUN5_ENV)) || defined(AFS_SUN54_ENV) #if defined AFS_DUX40_ENV #define OSVERS "DUX 4.0D" diff --git a/src/vol/fssync.c b/src/vol/fssync.c index ad5830f..34d93f8 100644 --- a/src/vol/fssync.c +++ b/src/vol/fssync.c @@ -50,9 +50,6 @@ static int newVLDB = 1; #include #include -RCSID - ("$Header$"); - #include #include #ifdef AFS_NT40_ENV diff --git a/src/vol/gi.c b/src/vol/gi.c index a3dd45f..94beebb 100644 --- a/src/vol/gi.c +++ b/src/vol/gi.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/ihandle.c b/src/vol/ihandle.c index b5ef684..1106fc0 100644 --- a/src/vol/ihandle.c +++ b/src/vol/ihandle.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/listinodes.c b/src/vol/listinodes.c index c5afe70..ccc7ef2 100644 --- a/src/vol/listinodes.c +++ b/src/vol/listinodes.c @@ -22,8 +22,6 @@ #include -RCSID - ("$Header$"); #ifndef AFS_NAMEI_ENV #if defined(AFS_LINUX20_ENV) || defined(AFS_SUN4_ENV) diff --git a/src/vol/namei_ops.c b/src/vol/namei_ops.c index af12fd9..f9f3aff 100644 --- a/src/vol/namei_ops.c +++ b/src/vol/namei_ops.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NAMEI_ENV #include diff --git a/src/vol/ntops.c b/src/vol/ntops.c index 1daa3fb..698977b 100644 --- a/src/vol/ntops.c +++ b/src/vol/ntops.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/vol/nuke.c b/src/vol/nuke.c index 5cfea85..c08bef7 100644 --- a/src/vol/nuke.c +++ b/src/vol/nuke.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/partition.c b/src/vol/partition.c index f3ba3ab..373a34c 100644 --- a/src/vol/partition.c +++ b/src/vol/partition.c @@ -20,8 +20,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/physio.c b/src/vol/physio.c index c463a4e..76cf673 100644 --- a/src/vol/physio.c +++ b/src/vol/physio.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/purge.c b/src/vol/purge.c index 0ed5c47..055242d 100644 --- a/src/vol/purge.c +++ b/src/vol/purge.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/vol/test/.cvsignore b/src/vol/test/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/src/vol/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/src/vol/test/ilist_nt.c b/src/vol/test/ilist_nt.c index 8598bcd..45f8b34 100644 --- a/src/vol/test/ilist_nt.c +++ b/src/vol/test/ilist_nt.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/test/listVicepx.c b/src/vol/test/listVicepx.c index 7cb53d7..3c14d8a 100644 --- a/src/vol/test/listVicepx.c +++ b/src/vol/test/listVicepx.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/test/ltlist.c b/src/vol/test/ltlist.c index f6d47a6..ed23bdc 100644 --- a/src/vol/test/ltlist.c +++ b/src/vol/test/ltlist.c @@ -12,8 +12,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/vol/test/nicreate.c b/src/vol/test/nicreate.c index 68a1b79..fb377ed 100644 --- a/src/vol/test/nicreate.c +++ b/src/vol/test/nicreate.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NAMEI_ENV #include diff --git a/src/vol/test/nilist.c b/src/vol/test/nilist.c index d994e8e..2850652 100644 --- a/src/vol/test/nilist.c +++ b/src/vol/test/nilist.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/vol/test/nincdec.c b/src/vol/test/nincdec.c index bd8283c..c0f82a3 100644 --- a/src/vol/test/nincdec.c +++ b/src/vol/test/nincdec.c @@ -14,8 +14,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NAMEI_ENV #include diff --git a/src/vol/test/nino.c b/src/vol/test/nino.c index 9a1e225..d86a6ce 100644 --- a/src/vol/test/nino.c +++ b/src/vol/test/nino.c @@ -13,8 +13,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/test/nsubr.c b/src/vol/test/nsubr.c index 1516176..d0f9b52 100644 --- a/src/vol/test/nsubr.c +++ b/src/vol/test/nsubr.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NAMEI_ENV #include diff --git a/src/vol/test/testpart.c b/src/vol/test/testpart.c index 18c22c1..f591294 100644 --- a/src/vol/test/testpart.c +++ b/src/vol/test/testpart.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/vol/test/updateDirInode.c b/src/vol/test/updateDirInode.c index 1ebbcda..1d847d1 100644 --- a/src/vol/test/updateDirInode.c +++ b/src/vol/test/updateDirInode.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/test/utilities.c b/src/vol/test/utilities.c index b5fb1b8..21858ec 100644 --- a/src/vol/test/utilities.c +++ b/src/vol/test/utilities.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/vnode.c b/src/vol/vnode.c index dfd159d..6968aab 100644 --- a/src/vol/vnode.c +++ b/src/vol/vnode.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/vol-bless.c b/src/vol/vol-bless.c index f7bc372..67f9f65 100644 --- a/src/vol/vol-bless.c +++ b/src/vol/vol-bless.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include diff --git a/src/vol/vol-info.c b/src/vol/vol-info.c index b5893dc..ebcbcda 100644 --- a/src/vol/vol-info.c +++ b/src/vol/vol-info.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c index 6fa0721..1785355 100644 --- a/src/vol/vol-salvage.c +++ b/src/vol/vol-salvage.c @@ -91,8 +91,6 @@ Vnodes with 0 inode pointers in RW volumes are now deleted. #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/volume.c b/src/vol/volume.c index ffdaf9d..d305b06 100644 --- a/src/vol/volume.c +++ b/src/vol/volume.c @@ -19,8 +19,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/vutil.c b/src/vol/vutil.c index 6d2f21f..2981606 100644 --- a/src/vol/vutil.c +++ b/src/vol/vutil.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/vol/xfs_size_check.c b/src/vol/xfs_size_check.c index 38cd0ee..77d5d80 100644 --- a/src/vol/xfs_size_check.c +++ b/src/vol/xfs_size_check.c @@ -11,7 +11,6 @@ * attribute for AFS inode parameters. Check all the mounted /vicep partitions. #include -RCSID("$Header$"); */ #include diff --git a/src/volser/.cvsignore b/src/volser/.cvsignore deleted file mode 100644 index 4d410a4..0000000 --- a/src/volser/.cvsignore +++ /dev/null @@ -1,12 +0,0 @@ -AFS_component_version_number.c -Makefile -restorevol -volerr.c -volint.cs.c -volint.h -volint.ss.c -volint.xdr.c -volser.h -volserver -vos -voldump diff --git a/src/volser/common.c b/src/volser/common.c index f7a8a17..211e52f 100644 --- a/src/volser/common.c +++ b/src/volser/common.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c index c34aff4..f1c5b38 100644 --- a/src/volser/dumpstuff.c +++ b/src/volser/dumpstuff.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/volser/lockprocs.c b/src/volser/lockprocs.c index 1c28756..a2a65d0 100644 --- a/src/volser/lockprocs.c +++ b/src/volser/lockprocs.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/volser/physio.c b/src/volser/physio.c index f285d74..254354d 100644 --- a/src/volser/physio.c +++ b/src/volser/physio.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #ifdef AFS_NT40_ENV diff --git a/src/volser/restorevol.c b/src/volser/restorevol.c index 0af8807..c39a858 100644 --- a/src/volser/restorevol.c +++ b/src/volser/restorevol.c @@ -42,8 +42,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/volser/vol-dump.c b/src/volser/vol-dump.c index 484482c..eff4561 100644 --- a/src/volser/vol-dump.c +++ b/src/volser/vol-dump.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/volser/volmain.c b/src/volser/volmain.c index 581e81c..be51c79 100644 --- a/src/volser/volmain.c +++ b/src/volser/volmain.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/volser/volprocs.c b/src/volser/volprocs.c index e38c7ec..93b7b8a 100644 --- a/src/volser/volprocs.c +++ b/src/volser/volprocs.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/volser/volser_prototypes.h b/src/volser/volser_prototypes.h index 50fbe0f..dfb2bde 100644 --- a/src/volser/volser_prototypes.h +++ b/src/volser/volser_prototypes.h @@ -32,6 +32,11 @@ extern int UV_CreateVolume2(afs_int32 aserver, afs_int32 apart, char *aname, afs_int32 aquota, afs_int32 aspare1, afs_int32 aspare2, afs_int32 aspare3, afs_int32 aspare4, afs_int32 * anewid); +extern int UV_CreateVolume3(afs_int32 aserver, afs_int32 apart, char *aname, + afs_int32 aquota, afs_int32 aspare1, + afs_int32 aspare2, afs_int32 aspare3, + afs_int32 aspare4, afs_uint32 * anewid, + afs_uint32 * aroid, afs_uint32 * abkid); extern int UV_AddVLDBEntry(afs_int32 aserver, afs_int32 apart, char *aname, afs_int32 aid); extern int UV_DeleteVolume(afs_int32 aserver, afs_int32 apart, @@ -59,6 +64,8 @@ extern int UV_RestoreVolume2(afs_int32 toserver, afs_int32 topart, afs_int32 tov afs_int32(*WriteData) (), char *rock); extern int UV_LockRelease(afs_int32 volid); extern int UV_AddSite(afs_int32 server, afs_int32 part, afs_int32 volid, afs_int32 valid); +extern int UV_AddSite2(afs_int32 server, afs_int32 part, afs_uint32 volid, + afs_uint32 rovolid, afs_int32 valid); extern int UV_RemoveSite(afs_int32 server, afs_int32 part, afs_int32 volid); extern int UV_ChangeLocation(afs_int32 server, afs_int32 part, afs_int32 volid); diff --git a/src/volser/voltrans.c b/src/volser/voltrans.c index 4791957..a3ff40f 100644 --- a/src/volser/voltrans.c +++ b/src/volser/voltrans.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #ifdef AFS_NT40_ENV #include diff --git a/src/volser/vos.c b/src/volser/vos.c index 51d776c..e4aa5dd 100644 --- a/src/volser/vos.c +++ b/src/volser/vos.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include @@ -534,13 +532,12 @@ DisplayFormat(pntr, server, part, totalOK, totalNotOK, totalBusy, fast, #endif if (!pntr->updateDate) fprintf(STDOUT, " Last Update Never\n"); - else { + else fprintf(STDOUT, " Last Update %s", vos_ctime( & pntr->updateDate)); - fprintf(STDOUT, - " %d accesses in the past day (i.e., vnode references)\n", - pntr->dayUse); - } + fprintf(STDOUT, + " %d accesses in the past day (i.e., vnode references)\n", + pntr->dayUse); } else if (pntr->status == VBUSY) { *totalBusy += 1; qPut(&busyHead, pntr->volid); @@ -691,13 +688,12 @@ XDisplayFormat(a_xInfoP, a_servID, a_partID, a_totalOKP, a_totalNotOKP, #endif if (!a_xInfoP->updateDate) fprintf(STDOUT, " Last Update Never\n"); - else { + else fprintf(STDOUT, " Last Update %s", vos_ctime( & a_xInfoP->updateDate)); - fprintf(STDOUT, - " %d accesses in the past day (i.e., vnode references)\n", - a_xInfoP->dayUse); - } + fprintf(STDOUT, + " %d accesses in the past day (i.e., vnode references)\n", + a_xInfoP->dayUse); /* * Print all the read/write and authorship stats. @@ -1874,11 +1870,15 @@ CreateVolume(register struct cmd_syndesc *as, void *arock) { afs_int32 pnum; char part[10]; - afs_int32 volid, code; + afs_uint32 volid = 0, rovolid = 0, bkvolid = 0; + afs_uint32 *arovolid; + afs_int32 code; struct nvldbentry entry; afs_int32 vcode; afs_int32 quota; + arovolid = &rovolid; + quota = 5000; tserver = GetServer(as->parms[0].items->data); if (!tserver) { @@ -1940,9 +1940,41 @@ CreateVolume(register struct cmd_syndesc *as, void *arock) } } + if (as->parms[4].items) { + if (!IsNumeric(as->parms[4].items->data)) { + fprintf(STDERR, "vos: Given volume ID %s should be numeric.\n", + as->parms[4].items->data); + return EINVAL; + } + + code = util_GetInt32(as->parms[4].items->data, &volid); + if (code) { + fprintf(STDERR, "vos: bad integer specified for volume ID.\n"); + return code; + } + } + + if (as->parms[5].items) { + if (!IsNumeric(as->parms[5].items->data)) { + fprintf(STDERR, "vos: Given RO volume ID %s should be numeric.\n", + as->parms[5].items->data); + return EINVAL; + } + + code = util_GetInt32(as->parms[5].items->data, &rovolid); + if (code) { + fprintf(STDERR, "vos: bad integer specified for volume ID.\n"); + return code; + } + + if (rovolid == 0) { + arovolid = NULL; + } + } + code = - UV_CreateVolume2(tserver, pnum, as->parms[2].items->data, quota, 0, - 0, 0, 0, &volid); + UV_CreateVolume3(tserver, pnum, as->parms[2].items->data, quota, 0, + 0, 0, 0, &volid, arovolid, &bkvolid); if (code) { PrintDiagnostics("create", code); return code; @@ -3215,7 +3247,7 @@ LockReleaseCmd(register struct cmd_syndesc *as, void *arock) static int AddSite(register struct cmd_syndesc *as, void *arock) { - afs_int32 avolid, aserver, apart, code, err, valid = 0; + afs_int32 avolid, aserver, apart, code, err, arovolid, valid = 0; char apartName[10], avolname[VOLSER_MAXVOLNAME + 1]; vsu_ExtractName(avolname, as->parms[2].items->data);; @@ -3228,6 +3260,16 @@ AddSite(register struct cmd_syndesc *as, void *arock) as->parms[2].items->data); exit(1); } + arovolid = 0; + if (as->parms[3].items) { + vsu_ExtractName(avolname, as->parms[3].items->data); + arovolid = vsu_GetVolumeID(avolname, cstruct, &err); + if (!arovolid) { + fprintf(STDERR, "vos: invalid ro volume id '%s'\n", + as->parms[3].items->data); + exit(1); + } + } aserver = GetServer(as->parms[0].items->data); if (aserver == 0) { fprintf(STDERR, "vos: server '%s' not found in host table\n", @@ -3249,10 +3291,10 @@ AddSite(register struct cmd_syndesc *as, void *arock) as->parms[1].items->data); exit(1); } - if (as->parms[3].items) { + if (as->parms[4].items) { valid = 1; } - code = UV_AddSite(aserver, apart, avolid, valid); + code = UV_AddSite2(aserver, apart, avolid, arovolid, valid); if (code) { PrintDiagnostics("addsite", code); exit(1); @@ -5696,6 +5738,8 @@ main(argc, argv) cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "volume name"); cmd_AddParm(ts, "-maxquota", CMD_SINGLE, CMD_OPTIONAL, "initial quota (KB)"); + cmd_AddParm(ts, "-id", CMD_SINGLE, CMD_OPTIONAL, "volume ID"); + cmd_AddParm(ts, "-roid", CMD_SINGLE, CMD_OPTIONAL, "readonly volume ID"); #ifdef notdef cmd_AddParm(ts, "-minquota", CMD_SINGLE, CMD_OPTIONAL, ""); #endif @@ -5840,6 +5884,7 @@ main(argc, argv) cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name for new site"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); + cmd_AddParm(ts, "-roid", CMD_SINGLE, CMD_OPTIONAL, "volume name or ID for RO"); cmd_AddParm(ts, "-valid", CMD_FLAG, CMD_OPTIONAL, "publish as an up-to-date site in VLDB"); COMMONPARMS; diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c index e839f9f..c2fe6c8 100644 --- a/src/volser/vsprocs.c +++ b/src/volser/vsprocs.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include @@ -627,29 +625,57 @@ UV_PartitionInfo64(afs_int32 server, char *pname, return code; } -/* old interface to create volume */ +/* old interface to create volumes */ int UV_CreateVolume(afs_int32 aserver, afs_int32 apart, char *aname, afs_int32 * anewid) { afs_int32 code; + *anewid = 0; code = UV_CreateVolume2(aserver, apart, aname, 5000, 0, 0, 0, 0, anewid); return code; } -/* create a volume, given a server, partition number, volume name --> sends -* back new vol id in */ +/* less old interface to create volumes */ int UV_CreateVolume2(afs_int32 aserver, afs_int32 apart, char *aname, afs_int32 aquota, afs_int32 aspare1, afs_int32 aspare2, afs_int32 aspare3, afs_int32 aspare4, afs_int32 * anewid) { + afs_uint32 roid = 0, bkid = 0; + return UV_CreateVolume3(aserver, apart, aname, aquota, aspare1, aspare2, + aspare3, aspare4, anewid, &roid, &bkid); +} +/** + * Create a volume on the given server and partition + * + * @param aserver server to create volume on + * @param spart partition to create volume on + * @param aname name of new volume + * @param aquota quota for new volume + * @param anewid contains the desired volume id for the new volume. If + * *anewid == 0, a new id will be chosen, and will be placed + * in *anewid when UV_CreateVolume3 returns. + * @param aroid contains the desired RO volume id. If NULL, the RO id entry + * will be unset. If *aroid == 0, an id will be chosen, and + * will be placed in *anewid when UV_CreateVolume3 returns. + * @param abkid same as aroid, except for the BK volume id instead of the + * RO volume id. + * @return 0 on success, error code otherwise. + */ +int +UV_CreateVolume3(afs_int32 aserver, afs_int32 apart, char *aname, + afs_int32 aquota, afs_int32 aspare1, afs_int32 aspare2, + afs_int32 aspare3, afs_int32 aspare4, afs_uint32 * anewid, + afs_uint32 * aroid, afs_uint32 * abkid) +{ register struct rx_connection *aconn; afs_int32 tid; register afs_int32 code; afs_int32 error; afs_int32 rcode, vcode; + afs_int32 lastid; struct nvldbentry entry, storeEntry; /*the new vldb entry */ struct volintInfo tstatus; @@ -661,13 +687,49 @@ UV_CreateVolume2(afs_int32 aserver, afs_int32 apart, char *aname, tstatus.maxquota = aquota; aconn = UV_Bind(aserver, AFSCONF_VOLUMEPORT); - /* next the next 3 available ids from the VLDB */ - vcode = ubik_VL_GetNewVolumeId(cstruct, 0, 3, anewid); - EGOTO1(cfail, vcode, "Could not get an Id for volume %s\n", aname); + + if (aroid && *aroid) { + VPRINT1("Using RO volume ID %d.\n", *aroid); + } + if (abkid && *abkid) { + VPRINT1("Using BK volume ID %d.\n", *abkid); + } + + if (*anewid) { + vcode = VLDB_GetEntryByID(*anewid, -1, &entry); + if (!vcode) { + fprintf(STDERR, "Volume ID %d already exists\n", *anewid); + return VVOLEXISTS; + } + VPRINT1("Using volume ID %d.\n", *anewid); + } else { + vcode = ubik_VL_GetNewVolumeId(cstruct, 0, 1, anewid); + EGOTO1(cfail, vcode, "Could not get an Id for volume %s\n", aname); + + if (aroid && *aroid == 0) { + vcode = ubik_VL_GetNewVolumeId(cstruct, 0, 1, aroid); + EGOTO1(cfail, vcode, "Could not get an RO Id for volume %s\n", aname); + } + + if (abkid && *abkid == 0) { + vcode = ubik_VL_GetNewVolumeId(cstruct, 0, 1, abkid); + EGOTO1(cfail, vcode, "Could not get a BK Id for volume %s\n", aname); + } + } + + /* rw,ro, bk id are related in the default case */ + /* If caller specified RW id, but not RO/BK ids, have them be RW+1 and RW+2 */ + lastid = *anewid; + if (aroid && *aroid == 0) { + *aroid = ++lastid; + } + if (abkid && *abkid == 0) { + *abkid = ++lastid; + } code = AFSVolCreateVolume(aconn, apart, aname, volser_RW, 0, anewid, &tid); - EGOTO2(cfail, vcode, "Failed to create the volume %s %u \n", aname, + EGOTO2(cfail, code, "Failed to create the volume %s %u \n", aname, *anewid); code = AFSVolSetInfo(aconn, tid, &tstatus); @@ -675,7 +737,7 @@ UV_CreateVolume2(afs_int32 aserver, afs_int32 apart, char *aname, EPRINT(code, "Could not change quota, continuing...\n"); code = AFSVolSetFlags(aconn, tid, 0); /* bring it online (mark it InService */ - EGOTO2(cfail, vcode, "Could not bring the volume %s %u online \n", aname, + EGOTO2(cfail, code, "Could not bring the volume %s %u online \n", aname, *anewid); VPRINT2("Volume %s %u created and brought online\n", aname, *anewid); @@ -690,8 +752,8 @@ UV_CreateVolume2(afs_int32 aserver, afs_int32 apart, char *aname, entry.flags = RW_EXISTS; /* this records that rw volume exists */ entry.serverFlags[0] = ITSRWVOL; /*this rep site has rw vol */ entry.volumeId[RWVOL] = *anewid; - entry.volumeId[ROVOL] = *anewid + 1; /* rw,ro, bk id are related in the default case */ - entry.volumeId[BACKVOL] = *anewid + 2; + entry.volumeId[ROVOL] = aroid ? *aroid : 0; + entry.volumeId[BACKVOL] = abkid ? *abkid : 0; entry.cloneId = 0; /*map into right byte order, before passing to xdr, the stuff has to be in host * byte order. Xdr converts it into network order */ @@ -4614,13 +4676,21 @@ UV_LockRelease(afs_int32 volid) } +/* old interface to add rosites */ +int +UV_AddSite(afs_int32 server, afs_int32 part, afs_int32 volid, afs_int32 valid) +{ + return UV_AddSite2(server, part, volid, 0, valid); +} + /*adds and as a readonly replication site for *in vldb */ int -UV_AddSite(afs_int32 server, afs_int32 part, afs_int32 volid, afs_int32 valid) +UV_AddSite2(afs_int32 server, afs_int32 part, afs_uint32 volid, + afs_uint32 rovolid, afs_int32 valid) { int j, nro = 0, islocked = 0; - struct nvldbentry entry, storeEntry; + struct nvldbentry entry, storeEntry, entry2; afs_int32 vcode, error = 0; char apartName[10]; @@ -4687,6 +4757,25 @@ UV_AddSite(afs_int32 server, afs_int32 part, afs_int32 volid, afs_int32 valid) goto asfail; } + /* if rovolid == 0, we leave the RO volume id alone. If the volume doesn't + * have an RO volid at this point (i.e. entry.volumeId[ROVOL] == + * INVALID_BID) and we leave it alone, it gets an RO volid at release-time. + */ + if (rovolid) { + if (entry.volumeId[ROVOL] == INVALID_BID) { + vcode = VLDB_GetEntryByID(rovolid, -1, &entry2); + if (!vcode) { + fprintf(STDERR, "Volume ID %d already exists\n", rovolid); + return VVOLEXISTS; + } + VPRINT1("Using RO volume id %d.\n", rovolid); + entry.volumeId[ROVOL] = rovolid; + } else { + fprintf(STDERR, "Ignoring given RO id %d, since volume already has RO id %d\n", + rovolid, entry.volumeId[ROVOL]); + } + } + VPRINT("Adding a new site ..."); entry.serverNumber[entry.nServers] = server; entry.serverPartition[entry.nServers] = part; diff --git a/src/volser/vsutils.c b/src/volser/vsutils.c index 33bdb1f..e8c47f1 100644 --- a/src/volser/vsutils.c +++ b/src/volser/vsutils.c @@ -10,8 +10,6 @@ #include #include -RCSID - ("$Header$"); #include #include diff --git a/src/xstat/.cvsignore b/src/xstat/.cvsignore deleted file mode 100644 index c1350c8..0000000 --- a/src/xstat/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -AFS_component_version_number.c -Makefile -xstat_cm_test -xstat_fs_test diff --git a/src/xstat/xstat_cm.c b/src/xstat/xstat_cm.c index d89daa2..895c2a0 100644 --- a/src/xstat/xstat_cm.c +++ b/src/xstat/xstat_cm.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #include "xstat_cm.h" /*Interface for this module */ #include /*Lightweight process package */ diff --git a/src/xstat/xstat_cm_test.c b/src/xstat/xstat_cm_test.c index acebb6e..b332565 100644 --- a/src/xstat/xstat_cm_test.c +++ b/src/xstat/xstat_cm_test.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include "xstat_cm.h" /*Interface for xstat_cm module */ #include /*Command line interpreter */ diff --git a/src/xstat/xstat_fs.c b/src/xstat/xstat_fs.c index c582312..876ab50 100644 --- a/src/xstat/xstat_fs.c +++ b/src/xstat/xstat_fs.c @@ -17,8 +17,6 @@ #include #include -RCSID - ("$Header$"); #include "xstat_fs.h" /*Interface for this module */ #include /*Lightweight process package */ diff --git a/src/xstat/xstat_fs_callback.c b/src/xstat/xstat_fs_callback.c index c1f78b0..1e581ec 100644 --- a/src/xstat/xstat_fs_callback.c +++ b/src/xstat/xstat_fs_callback.c @@ -29,8 +29,6 @@ #include #endif -RCSID - ("$Header$"); #include #include /*Standard I/O stuff */ diff --git a/src/xstat/xstat_fs_test.c b/src/xstat/xstat_fs_test.c index c922c13..df6b47d 100644 --- a/src/xstat/xstat_fs_test.c +++ b/src/xstat/xstat_fs_test.c @@ -16,8 +16,6 @@ #include #include -RCSID - ("$Header$"); #include "xstat_fs.h" /*Interface for xstat_fs module */ #include /*Command line interpreter */