which included commits to RCS files with non-trunk default branches.
AC_INIT(Makefile.common)
-AM_INIT_AUTOMAKE(openafs-libafs,1.2.10)
+AM_INIT_AUTOMAKE(openafs-libafs,1.2.11)
AC_CONFIG_HEADER(config/afsconfig.h)
define(OPENAFS_CONFIGURE_LIBAFS)
+/*
+ * Portions Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ */
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/DARWIN/osi_vfsops.c,v 1.1.1.6 2003/07/30 17:08:05 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/afs/DARWIN/osi_vfsops.c,v 1.1.1.7 2004/01/10 20:52:50 hartmans Exp $");
#include <afs/sysincludes.h> /* Standard vendor system headers */
#include <afs/afsincludes.h> /* Afs-based standard headers */
#include <sys/namei.h>
#include <sys/conf.h>
#include <sys/syscall.h>
+#include <sys/sysctl.h>
+#include "../afs/sysctl.h"
struct vcache *afs_globalVp = 0;
struct mount *afs_globalVFS = 0;
return 0;
}
-int afs_sysctl() {
- return EOPNOTSUPP;
+u_int32_t afs_darwin_realmodes = 0;
+
+int afs_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
+int *name;
+u_int namelen;
+void *oldp;
+size_t *oldlenp;
+void *newp;
+size_t newlen;
+struct proc *p;
+{
+ int error;
+
+ switch (name[0]) {
+ case AFS_SC_ALL:
+ /* nothing defined */
+ break;
+ case AFS_SC_DARWIN:
+ if (namelen < 3)
+ return ENOENT;
+ switch (name[1]) {
+ case AFS_SC_DARWIN_ALL:
+ switch (name[2]) {
+ case AFS_SC_DARWIN_ALL_REALMODES:
+ return sysctl_int(oldp, oldlenp, newp, newlen,
+ &afs_darwin_realmodes);
+ }
+ break;
+ /* darwin version specific sysctl's goes here */
+ }
+ break;
+ }
+ return EOPNOTSUPP;
}
+/*
+ * Portions Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ */
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/DARWIN/osi_vnodeops.c,v 1.1.1.9 2003/07/30 17:08:05 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/afs/DARWIN/osi_vnodeops.c,v 1.1.1.10 2004/01/10 20:52:51 hartmans Exp $");
#include <afs/sysincludes.h> /* Standard vendor system headers */
#include <afs/afsincludes.h> /* Afs-based standard headers */
#include <sys/malloc.h>
#include <sys/namei.h>
#include <sys/ubc.h>
+#if defined(AFS_DARWIN70_ENV)
+#include <vfs/vfs_support.h>
+#endif /* defined(AFS_DARWIN70_ENV) */
int afs_vop_lookup(struct vop_lookup_args *);
int afs_vop_create(struct vop_create_args *);
int afs_vop_symlink(struct vop_symlink_args *);
int afs_vop_readdir(struct vop_readdir_args *);
int afs_vop_readlink(struct vop_readlink_args *);
+#if !defined(AFS_DARWIN70_ENV)
extern int ufs_abortop(struct vop_abortop_args *);
+#endif /* !defined(AFS_DARWIN70_ENV) */
int afs_vop_inactive(struct vop_inactive_args *);
int afs_vop_reclaim(struct vop_reclaim_args *);
int afs_vop_lock(struct vop_lock_args *);
{ &vop_symlink_desc, afs_vop_symlink }, /* symlink */
{ &vop_readdir_desc, afs_vop_readdir }, /* readdir */
{ &vop_readlink_desc, afs_vop_readlink }, /* readlink */
+#if defined(AFS_DARWIN70_ENV)
+ { &vop_abortop_desc, nop_abortop }, /* abortop */
+#else /* ! defined(AFS_DARWIN70_ENV) */
/* Yes, we use the ufs_abortop call. It just releases the namei
buffer stuff */
{ &vop_abortop_desc, ufs_abortop }, /* abortop */
+#endif /* defined(AFS_DARWIN70_ENV) */
{ &vop_inactive_desc, afs_vop_inactive }, /* inactive */
{ &vop_reclaim_desc, afs_vop_reclaim }, /* reclaim */
{ &vop_lock_desc, afs_vop_lock }, /* lock */
} */ *ap;
{
int error;
- struct vcache *vc = VTOAFS(ap->a_vp);
+ struct vnode *vp = ap->a_vp;
+ struct vcache *vc = VTOAFS(vp);
+#ifdef AFS_DARWIN14_ENV
+ int didhold = 0;
+ /*----------------------------------------------------------------
+ * osi_VM_TryReclaim() removes the ubcinfo of a vnode, but that vnode
+ * can later be passed to vn_open(), which will skip the call to
+ * ubc_hold(), and when the ubcinfo is later added, the ui_refcount
+ * will be off. So we compensate by calling ubc_hold() ourselves
+ * when ui_refcount is less than 2. If an error occurs in afs_open()
+ * we must call ubc_rele(), which is what vn_open() would do if it
+ * was able to call ubc_hold() in the first place.
+ *----------------------------------------------------------------*/
+ if (vp->v_type == VREG && !(vp->v_flag & VSYSTEM)
+ && vp->v_ubcinfo->ui_refcount < 2)
+ didhold = ubc_hold(vp);
+#endif /* AFS_DARWIN14_ENV */
AFS_GLOCK();
error = afs_open(&vc, ap->a_mode, ap->a_cred);
#ifdef DIAGNOSTIC
- if (AFSTOV(vc) != ap->a_vp)
+ if (AFSTOV(vc) != vp)
panic("AFS open changed vnode!");
#endif
afs_BozonLock(&vc->pvnLock, vc);
osi_FlushPages(vc, ap->a_cred);
afs_BozonUnlock(&vc->pvnLock, vc);
AFS_GUNLOCK();
+#ifdef AFS_DARWIN14_ENV
+ if (error && didhold)
+ ubc_rele(vp);
+#endif /* AFS_DARWIN14_ENV */
return error;
}
case _PC_PIPE_BUF:
return EINVAL;
break;
+#if defined(AFS_DARWIN70_ENV)
+ case _PC_NAME_CHARS_MAX:
+ *ap->a_retval = NAME_MAX;
+ break;
+ case _PC_CASE_SENSITIVE:
+ *ap->a_retval = 1;
+ break;
+ case _PC_CASE_PRESERVING:
+ *ap->a_retval = 1;
+ break;
+#endif /* defined(AFS_DARWIN70_ENV) */
default:
return EINVAL;
}
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include "../afs/param.h"
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/VNOPS/afs_vnop_attrs.c,v 1.1.1.12 2003/07/30 17:08:13 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/afs/VNOPS/afs_vnop_attrs.c,v 1.1.1.13 2004/01/10 20:52:57 hartmans Exp $");
#include "../afs/sysincludes.h" /* Standard vendor system headers */
#include "../afs/afsincludes.h" /* Afs-based standard headers */
attrs->va_mode &= ~(VSUID|VSGID);
}
#if defined(AFS_DARWIN_ENV)
- /* Mac OS X uses the mode bits to determine whether a file or directory
- * is accessible, and believes them, even though under AFS they're almost
- * assuredly wrong, especially if the local uid does not match the AFS
- * ID. So we set the mode bits conservatively.
- */
- if (S_ISDIR(attrs->va_mode)) {
- /* all access bits need to be set for directories, since even
- * a mode 0 directory can still be used normally.
- */
- attrs->va_mode |= ACCESSPERMS;
- } else {
- /* for other files, replicate the user bits to group and other */
- mode_t ubits = (attrs->va_mode & S_IRWXU) >> 6;
- attrs->va_mode |= ubits | (ubits << 3);
+ {
+ extern u_int32_t afs_darwin_realmodes;
+ if (!afs_darwin_realmodes) {
+ /* Mac OS X uses the mode bits to determine whether a file or
+ * directory is accessible, and believes them, even though under
+ * AFS they're almost assuredly wrong, especially if the local uid
+ * does not match the AFS ID. So we set the mode bits
+ * conservatively.
+ */
+ if (S_ISDIR(attrs->va_mode)) {
+ /* all access bits need to be set for directories, since even
+ * a mode 0 directory can still be used normally.
+ */
+ attrs->va_mode |= ACCESSPERMS;
+ } else {
+ /* for other files, replicate the user bits to group and other */
+ mode_t ubits = (attrs->va_mode & S_IRWXU) >> 6;
+ attrs->va_mode |= ubits | (ubits << 3);
+ }
+ }
}
#endif /* AFS_DARWIN_ENV */
attrs->va_uid = fakedir ? 0 : avc->m.Owner;
#ifdef AFS_OSF_ENV
attrs->va_fsid = avc->v.v_mount->m_stat.f_fsid.val[0];
#else
+#ifdef AFS_DARWIN70_ENV
+ attrs->va_fsid = avc->v.v_mount->mnt_stat.f_fsid.val[0];
+#else /* ! AFS_DARWIN70_ENV */
attrs->va_fsid = 1;
+#endif /* AFS_DARWIN70_ENV */
#endif
#endif
#endif /* AFS_SUN56_ENV */
#include <afsconfig.h>
#include "../afs/param.h"
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_segments.c,v 1.1.1.7 2002/06/10 11:39:56 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_segments.c,v 1.1.1.8 2004/01/10 20:52:47 hartmans Exp $");
#include "../afs/sysincludes.h" /*Standard vendor system headers*/
#include "../afs/afsincludes.h" /*AFS-based standard headers*/
# This software has been released under the terms of the IBM Public
# License. For details, see the LICENSE file in the top-level source
# directory or online at http://www.openafs.org/dl/license10.html
+#
+# Portions Copyright (c) 2003 Apple Computer, Inc.
# afsd makefile
DEST=@DEST@
${CC} ${CFLAGS} -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib/libdwarf.a /usr/lib/libelf.a ;; \
sgi_64 | sgi_65 ) \
${CC} ${CFLAGS} -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib32/libdwarf.a /usr/lib32/libelf.a ;; \
- ppc_darwin* ) \
+ *_darwin_* ) \
${CC} ${CFLAGS} -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} -F/System/Library/PrivateFrameworks -framework DiskArbitration ;; \
* ) \
${CC} ${CFLAGS} -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} ;; \
*linux* ) \
${INSTALLex} -f afs.rc.linux ${DEST}/root.client/usr/vice/etc/afs.rc; \
${INSTALL} -f afs.conf.linux ${DEST}/root.client/usr/vice/etc/afs.conf ;; \
- ppc_darwin*) \
+ *_darwin_*) \
${INSTALLex} -f afs.rc.darwin ${DEST}/root.client/usr/vice/etc/afs.rc ; \
${INSTALL} -f afs.rc.darwin.plist ${DEST}/root.client/usr/vice/etc/StartupParameters.plist ;; \
*fbsd*) \
# This software has been released under the terms of the IBM Public
# License. For details, see the LICENSE file in the top-level source
# directory or online at http://www.openafs.org/dl/license10.html
+#
+# Portions Copyright (c) 2003 Apple Computer, Inc.
. /etc/rc.common
echo "Starting afsd"
$AFSD $OPTIONS
+#
+# Call afssettings (if it exists) to set customizable parameters
+#
+if [ -x $VICEETC/config/afssettings ]; then
+ sleep 2
+ $VICEETC/config/afssettings
+fi
+
#
# Run package to update the disk
#
# This software has been released under the terms of the IBM Public
# License. For details, see the LICENSE file in the top-level source
# directory or online at http://www.openafs.org/dl/license10.html
+#
+# Portions Copyright (c) 2003 Apple Computer, Inc.
DEST=@DEST@
TOP_INCDIR=@TOP_INCDIR@
@case ${SYS_NAME} in \
alpha_dux*|sgi_*|sun*|rs_aix4*|*linux*|hp_ux*) \
echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
+ *_darwin_[1-6][0-9]) \
+ echo ${INSTALL} butc ${DESTDIR}${sbindir}/butc ; \
+ ${INSTALL} butc ${DESTDIR}${sbindir}/butc ;; \
+ *_darwin_*) \
+ echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
*) \
echo ${INSTALL} butc ${DESTDIR}${sbindir}/butc ; \
${INSTALL} butc ${DESTDIR}${sbindir}/butc ;; \
@case ${SYS_NAME} in \
alpha_dux*|sgi_*|sun*|rs_aix4*|*linux*|hp_ux*) \
echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
+ *_darwin_[1-6][0-9]) \
+ echo ${INSTALL} butc ${DEST}/etc/butc ; \
+ ${INSTALL} butc ${DEST}/etc/butc ;; \
+ *_darwin_*) \
+ echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
*) \
echo ${INSTALL} butc ${DEST}/etc/butc ; \
${INSTALL} butc ${DEST}/etc/butc ;; \
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/butc/lwps.c,v 1.1.1.5 2001/09/11 14:31:48 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/butc/lwps.c,v 1.1.1.6 2004/01/10 20:56:07 hartmans Exp $");
#include <sys/types.h>
#ifdef AFS_NT40_ENV
if ( time(0) > start+BELLTIME )
{
start = time(0);
- FFlushInput(stdin);
+ FFlushInput();
putchar(BELLCHAR);
fflush(stdout);
}
*/
r = res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
return 0;
-res_close();
],
ac_cv_func_res_search=yes)
-])
\ No newline at end of file
+])
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
#define SYS_NAME_ID_i386_umlinux2 2700
#define SYS_NAME_ID_ppc_darwin_13 504
#define SYS_NAME_ID_ppc_darwin_14 505
#define SYS_NAME_ID_ppc_darwin_60 506
+#define SYS_NAME_ID_ppc_darwin_70 507
#define SYS_NAME_ID_next_mach20 601
#define SYS_NAME_ID_next_mach30 602
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/cm_client_config.c,v 1.1.1.4 2001/07/14 22:22:34 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/cm_client_config.c,v 1.1.1.5 2004/01/10 20:56:45 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
void Usage()
{
fprintf(stderr,
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/cm_list_cells.c,v 1.1.1.4 2001/07/14 22:22:33 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/cm_list_cells.c,v 1.1.1.5 2004/01/10 20:56:45 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
void Usage()
{
fprintf(stderr,
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/cm_local_cell.c,v 1.1.1.4 2001/07/14 22:22:35 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/cm_local_cell.c,v 1.1.1.5 2004/01/10 20:56:46 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
void Usage()
{
fprintf(stderr,
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/cm_server_prefs.c,v 1.1.1.4 2001/07/14 22:22:35 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/cm_server_prefs.c,v 1.1.1.5 2004/01/10 20:56:46 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
void Usage()
{
fprintf(stderr,
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxdebug_basic_stats.c,v 1.1.1.4 2001/07/14 22:22:35 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxdebug_basic_stats.c,v 1.1.1.5 2004/01/10 20:56:46 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
void Usage()
{
fprintf(stderr,
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxdebug_conns.c,v 1.1.1.4 2001/07/14 22:22:35 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxdebug_conns.c,v 1.1.1.5 2004/01/10 20:56:46 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
void Usage()
{
fprintf(stderr,
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxdebug_peers.c,v 1.1.1.4 2001/07/14 22:22:35 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxdebug_peers.c,v 1.1.1.5 2004/01/10 20:56:46 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
void Usage()
{
fprintf(stderr,
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxdebug_rx_stats.c,v 1.1.1.4 2001/07/14 22:22:36 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxdebug_rx_stats.c,v 1.1.1.5 2004/01/10 20:56:46 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
void Usage()
{
fprintf(stderr,
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxdebug_supported_stats.c,v 1.1.1.4 2001/07/14 22:22:36 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxdebug_supported_stats.c,v 1.1.1.5 2004/01/10 20:56:46 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
void Usage()
{
fprintf(stderr,
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxdebug_version.c,v 1.1.1.4 2001/07/14 22:22:36 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxdebug_version.c,v 1.1.1.5 2004/01/10 20:56:46 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
void Usage()
{
fprintf(stderr,
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_clear_peer.c,v 1.1.1.4 2001/07/14 22:22:36 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_clear_peer.c,v 1.1.1.5 2004/01/10 20:56:46 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
extern int RXSTATS_ClearPeerRPCStats();
void Usage()
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_clear_process.c,v 1.1.1.4 2001/07/14 22:22:36 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_clear_process.c,v 1.1.1.5 2004/01/10 20:56:46 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
extern int RXSTATS_ClearProcessRPCStats();
void Usage()
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_disable_peer.c,v 1.1.1.4 2001/07/14 22:22:37 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_disable_peer.c,v 1.1.1.5 2004/01/10 20:56:46 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
extern int RXSTATS_DisablePeerRPCStats();
void Usage()
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_disable_process.c,v 1.1.1.4 2001/07/14 22:22:37 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_disable_process.c,v 1.1.1.5 2004/01/10 20:56:47 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
extern int RXSTATS_DisableProcessRPCStats();
void Usage()
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_enable_peer.c,v 1.1.1.4 2001/07/14 22:22:37 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_enable_peer.c,v 1.1.1.5 2004/01/10 20:56:47 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
extern int RXSTATS_EnablePeerRPCStats();
void Usage()
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_enable_process.c,v 1.1.1.4 2001/07/14 22:22:37 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_enable_process.c,v 1.1.1.5 2004/01/10 20:56:47 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
extern int RXSTATS_EnableProcessRPCStats();
void Usage()
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_get_peer.c,v 1.1.1.4 2001/07/14 22:22:38 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_get_peer.c,v 1.1.1.5 2004/01/10 20:56:47 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_AdminErrors.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
#include <rx/rxstat.h>
#include <afs/afsint.h>
#define FSINT_COMMON_XG
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_get_process.c,v 1.1.1.4 2001/07/14 22:22:38 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_get_process.c,v 1.1.1.5 2004/01/10 20:56:47 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_AdminErrors.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
#include <rx/rxstat.h>
#include <afs/afsint.h>
#define FSINT_COMMON_XG
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_get_version.c,v 1.1.1.5 2001/07/14 22:22:38 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_get_version.c,v 1.1.1.6 2004/01/10 20:56:47 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
void Usage()
{
fprintf(stderr,
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_query_peer.c,v 1.1.1.4 2001/07/14 22:22:38 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_query_peer.c,v 1.1.1.5 2004/01/10 20:56:47 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
extern int RXSTATS_QueryPeerRPCStats();
void Usage()
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/*
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_query_process.c,v 1.1.1.4 2001/07/14 22:22:39 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/samples/rxstat_query_process.c,v 1.1.1.5 2004/01/10 20:56:47 hartmans Exp $");
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#include <afs/afs_clientAdmin.h>
#include <afs/afs_utilAdmin.h>
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
+
extern int RXSTATS_QueryProcessRPCStats();
void Usage()
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
/* Test driver for admin functions. */
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/test/afscp.c,v 1.1.1.4 2001/07/14 22:22:39 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/test/afscp.c,v 1.1.1.5 2004/01/10 20:56:48 hartmans Exp $");
#include <afs/stds.h>
void *cellHandle;
void *tokenHandle;
+#ifdef AFS_DARWIN_ENV
+pthread_mutex_t des_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* AFS_DARWIN_ENV */
/*
* Before processing any command, process the common arguments and
#/* Copyright (C) 1995, 1989 Transarc Corporation - All rights reserved */
-# $Header: /tmp/cvstemp/openafs/src/libafs/MakefileProto.DARWIN.in,v 1.1.1.6 2002/09/26 19:06:44 hartmans Exp $
+#/* Portions Copyright (c) 2003 Apple Computer, Inc. */
+# $Header: /tmp/cvstemp/openafs/src/libafs/MakefileProto.DARWIN.in,v 1.1.1.7 2004/01/10 20:56:51 hartmans Exp $
#
# MakefileProto for Digital Unix systems
#
KDEFS=
DBUG =
DEFINES= -D_KERNEL -DKERNEL -DKERNEL_PRIVATE -DDIAGNOSTIC -DUSE_SELECT -DMACH_USER_API -DMACH_KERNEL
+<ppc_darwin_70>
+KOPTS=-static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch
<ppc_darwin_60>
KOPTS=-no-cpp-precomp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch
<ppc_darwin_14 ppc_darwin_13 ppc_darwin_12>
# This software has been released under the terms of the IBM Public
# License. For details, see the LICENSE file in the top-level source
# directory or online at http://www.openafs.org/dl/license10.html
+#
+# Portions Copyright (c) 2003 Apple Computer, Inc.
# This is a pthread safe library containing rx, rxkad and des.
#
# $ what /opt/langtools/bin/pxdb32
# /opt/langtools/bin/pxdb32:
-# HP92453-02 A.10.0A HP-UX SYMBOLIC DEBUGGER (PXDB) $Revision: 1.1.1.4 $
+# HP92453-02 A.10.0A HP-UX SYMBOLIC DEBUGGER (PXDB) $Revision: 1.1.1.5 $
#
# The problem occurs when -g and -O are both used when compiling des.c.
# The simplest way to work around the problem is to leave out either -g or -O.
/usr/ccs/lib/cpp ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
as -o syscall.o syscall.ss; \
$(RM) syscall.ss;; \
- sgi_* | ppc_darwin* ) \
+ sgi_* | *_darwin_* ) \
${CC} ${CFLAGS} -c ${SYS}/syscall.s;; \
alpha_dux?? ) \
${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${SYS}/syscall.s; \
#!/bin/sh
+# Portions Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
if [ -d /afs -a ! -h /afs ]; then
rmdir /afs
fi
-mkdir -p /Network/afs
-if [ ! -h /afs ]; then
- ln -s /Network/afs /afs
+majorvers=`uname -r | sed 's/\..*//'`
+if [ $majorvers -ge 7 ]; then
+ # /Network is now readonly, so put AFS in /afs; make sure /afs is a directory
+ if [ -e /afs ]; then
+ if [ -h /afs -o ! -d /afs ]; then
+ rm -f /afs
+ mkdir /afs
+ fi
+ else
+ mkdir /afs
+ fi
+else
+ mkdir -p /Network/afs
+ if [ ! -h /afs ]; then
+ ln -s /Network/afs /afs
+ fi
fi
cd /var/db/openafs/etc
cp CellServDB.master CellServDB
fi
fi
+
+if [ $majorvers -ge 7 ]; then
+ # make config/settings.plist if it doesn't exist
+ if [ ! -e config/settings.plist -a -e config/settings.plist.orig ]; then
+ cp config/settings.plist.orig config/settings.plist
+ fi
+elif [ -e config/afssettings ]; then
+ # turn off execution of afssettings
+ chmod a-x config/afssettings
+fi
#!/bin/sh
+# Portions Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
if [ -z "$1" ]; then
echo Usage: buildpkg binary-dir
fi
BINDEST=$1
RESSRC=`pwd`
-if [ ! -f /usr/bin/package ]; then
- echo "/usr/bin/package does not exist. Please run this script on a MacOS X system"
- echo "with the BSD subsystem installed"
- exit 1
-fi
-if grep -q 'set resDir = ""' /usr/bin/package ; then
- echo /usr/bin/package is buggy.
- echo remove the line \''set resDir = ""'\' from /usr/bin/package and try again
- exit 1
+majorvers=`uname -r | sed 's/\..*//'`
+if [ $majorvers -ge 7 ]; then
+ SEP=:
+ package=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
+ if [ ! -x $package ]; then
+ echo "PackageMaker does not exist. Please run this script on a MacOS X system"
+ echo "with the DeveloperTools package installed"
+ exit 1
+ fi
+else
+ SEP=.
+ package=/usr/bin/package
+ if [ ! -f $package ]; then
+ echo "$package does not exist. Please run this script on a MacOS X system"
+ echo "with the BSD subsystem installed"
+ exit 1
+ fi
+ if grep -q 'set resDir = ""' $package ; then
+ echo $package is buggy.
+ echo remove the line \''set resDir = ""'\' from $package and try again
+ exit 1
+ fi
fi
if [ -x /usr/bin/curl ]; then
mkdir -p $PKGROOT $PKGRES
mkdir $PKGROOT/Library
-chown -R root.admin $PKGROOT
+chown -R root${SEP}admin $PKGROOT
chmod -R 775 $PKGROOT
mkdir $PKGROOT/Library/OpenAFS $PKGROOT/Library/OpenAFS/Tools
cd $BINDEST
pax -rw * $PKGROOT/Library/OpenAFS/Tools
cd $RESSRC
-mkdir $PKGROOT/Library
mkdir $PKGROOT/Library/StartupItems
mkdir $PKGROOT/Library/StartupItems/OpenAFS
cp $BINDEST/root.client/usr/vice/etc/afs.rc $PKGROOT/Library/StartupItems/OpenAFS/OpenAFS
chmod a+x $PKGROOT/Library/StartupItems/OpenAFS/OpenAFS
cp $BINDEST/root.client/usr/vice/etc/StartupParameters.plist $PKGROOT/Library/StartupItems/OpenAFS/StartupParameters.plist
-chown -R root.admin $PKGROOT/Library
+chown -R root${SEP}admin $PKGROOT/Library
chmod -R o-w $PKGROOT/Library
chmod -R g+w $PKGROOT/Library
-chown -R root.wheel $PKGROOT/Library/OpenAFS/Tools
+chown -R root${SEP}wheel $PKGROOT/Library/OpenAFS/Tools
chmod -R og-w $PKGROOT/Library/OpenAFS/Tools
mkdir $PKGROOT/private $PKGROOT/private/var $PKGROOT/private/var/db
mkdir $PKGROOT/private/var/db/openafs/etc $PKGROOT/private/var/db/openafs/etc/config
cp $RESSRC/CellServDB $PKGROOT/private/var/db/openafs/etc/CellServDB.master
echo andrew.cmu.edu > $PKGROOT/private/var/db/openafs/etc/ThisCell.sample
-echo /Network/afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample
+if [ $majorvers -ge 7 ]; then
+ echo /afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample
+ make AFSINCLUDE=$BINDEST/include
+ cp afssettings $PKGROOT/private/var/db/openafs/etc/config
+ cp settings.plist $PKGROOT/private/var/db/openafs/etc/config/settings.plist.orig
+ make clean
+else
+ echo /Network/afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample
+fi
#echo '-stat 2000 -dcache 800 -daemons 3 -volumes 70 -rootvol root.afs.local' > $PKGROOT/private/var/db/openafs/etc/config/afsd.options.sample
strip -X -S $PKGROOT/Library/OpenAFS/Tools/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs
cp -RP $PKGROOT/Library/OpenAFS/Tools/root.client/usr/vice/etc/afs.kext $PKGROOT/private/var/db/openafs/etc
-chown -R root.wheel $PKGROOT/private
+chown -R root${SEP}wheel $PKGROOT/private
chmod -R og-w $PKGROOT/private
chmod og-rx $PKGROOT/private/var/db/openafs/cache
ln -s ../../Library/OpenAFS/Tools/root.client/usr/vice/etc/afsd $PKGROOT/usr/sbin/afsd
-chown -R root.wheel $PKGROOT/usr
+chown -R root${SEP}wheel $PKGROOT/usr
chmod -R og-w $PKGROOT/usr
-cp License.rtf ReadMe.rtf OpenAFS.post_install OpenAFS.pre_upgrade $PKGRES
-cp OpenAFS.post_install $PKGRES/OpenAFS.post_upgrade
-chmod a+x $PKGRES/OpenAFS.post_install $PKGRES/OpenAFS.post_upgrade $PKGRES/OpenAFS.pre_upgrade
+if [ $majorvers -ge 7 ]; then
+ cp OpenAFS.post_install $PKGRES/postinstall
+ cp OpenAFS.pre_upgrade $PKGRES/preupgrade
+ cp OpenAFS.post_install $PKGRES/postupgrade
+ chmod a+x $PKGRES/postinstall $PKGRES/postupgrade $PKGRES/preupgrade
+else
+ cp OpenAFS.post_install OpenAFS.pre_upgrade $PKGRES
+ cp OpenAFS.post_install $PKGRES/OpenAFS.post_upgrade
+ chmod a+x $PKGRES/OpenAFS.post_install $PKGRES/OpenAFS.post_upgrade $PKGRES/OpenAFS.pre_upgrade
+fi
+cp License.rtf ReadMe.rtf $PKGRES
cp csrvdbmerge.pl $PKGRES
chmod a+x $PKGRES/csrvdbmerge.pl
cp CellServDB.list $PKGRES
-chown -R root.wheel $PKGRES
+chown -R root${SEP}wheel $PKGRES
rm -rf OpenAFS.pkg
-echo /usr/bin/package $PKGROOT OpenAFS.info -r $PKGRES
-/usr/bin/package $PKGROOT OpenAFS.info -r $PKGRES
-#old versions of package didn't handle this properly
-if [ ! -r OpenAFS.pkg/Contents ]; then
- mkdir OpenAFS.pkg/Contents OpenAFS.pkg/Contents/Resources
- mv OpenAFS.pkg/OpenAFS.* OpenAFS.pkg/Contents/Resources
- mv OpenAFS.pkg/*.rtf OpenAFS.pkg/Contents/Resources
- mv OpenAFS.pkg/csrvdbmerge.pl OpenAFS.pkg/Contents/Resources
- mv OpenAFS.pkg/CellServDB* OpenAFS.pkg/Contents/Resources
+if [ $majorvers -ge 7 ]; then
+ echo $package -build -p $RESSRC/OpenAFS.pkg -f $PKGROOT -r $PKGRES \
+ -i OpenAFS.Info.plist -d OpenAFS.Description.plist
+ $package -build -p $RESSRC/OpenAFS.pkg -f $PKGROOT -r $PKGRES \
+ -i OpenAFS.Info.plist -d OpenAFS.Description.plist
+else
+ echo $package $PKGROOT OpenAFS.info -r $PKGRES
+ $package $PKGROOT OpenAFS.info -r $PKGRES
+ #old versions of package didn't handle this properly
+ if [ ! -r OpenAFS.pkg/Contents ]; then
+ mkdir OpenAFS.pkg/Contents OpenAFS.pkg/Contents/Resources
+ mv OpenAFS.pkg/OpenAFS.* OpenAFS.pkg/Contents/Resources
+ mv OpenAFS.pkg/*.rtf OpenAFS.pkg/Contents/Resources
+ mv OpenAFS.pkg/csrvdbmerge.pl OpenAFS.pkg/Contents/Resources
+ mv OpenAFS.pkg/CellServDB* OpenAFS.pkg/Contents/Resources
+ fi
fi
rm -rf pkgroot pkgres
* rpc_scan.c, Scanner for the RPC protocol compiler
* Copyright (C) 1987, Sun Microsystems, Inc.
*/
+
+/* Portions Copyright (c) 2003 Apple Computer, Inc. */
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/rxgen/rpc_scan.c,v 1.1.1.5 2001/09/11 14:34:40 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/rxgen/rpc_scan.c,v 1.1.1.6 2004/01/10 20:57:25 hartmans Exp $");
#include <stdio.h>
#include <stdlib.h>
if (commenting) {
break;
} else if (cppline(curline)) {
+#if defined(AFS_DARWIN_ENV)
+ if (strncmp(curline, "#pragma", 7) == 0)
+ continue;
+#endif /* defined(AFS_DARWIN_ENV) */
docppline(curline, &linenum,
&infilename);
} else if (directive(curline)) {
# This software has been released under the terms of the IBM Public
# License. For details, see the LICENSE file in the top-level source
# directory or online at http://www.openafs.org/dl/license10.html
+#
+# Portions Copyright (c) 2003 Apple Computer, Inc.
# This is a pthread safe library containing rx, rxkad and des.
#
# $ what /opt/langtools/bin/pxdb32
# /opt/langtools/bin/pxdb32:
-# HP92453-02 A.10.0A HP-UX SYMBOLIC DEBUGGER (PXDB) $Revision: 1.1.1.3 $
+# HP92453-02 A.10.0A HP-UX SYMBOLIC DEBUGGER (PXDB) $Revision: 1.1.1.4 $
#
# The problem occurs when -g and -O are both used when compiling des.c.
# The simplest way to work around the problem is to leave out either -g or -O.
/usr/ccs/lib/cpp ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
as -o syscall.o syscall.ss; \
$(RM) syscall.ss;; \
- sgi_* | ppc_darwin* ) \
+ sgi_* | *_darwin_* ) \
${CC} ${CFLAGS} -c ${SYS}/syscall.s;; \
alpha_dux?? ) \
${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${SYS}/syscall.s; \
# This software has been released under the terms of the IBM Public
# License. For details, see the LICENSE file in the top-level source
# directory or online at http://www.openafs.org/dl/license10.html
+#
+# Portions Copyright (c) 2003 Apple Computer, Inc.
DEST=@DEST@
TOP_INCDIR=@TOP_INCDIR@
DIROBJS=buffer.o dir.o salvage.o
VOLOBJS= vnode.o volume.o vutil.o partition.o fssync.o purge.o \
- clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o
+ clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o \
+ ${EXTRA_VLIBOBJS}
FSINTOBJS= afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o
devname.o: ${VOL}/devname.c
${COMPILE}
+# only for darwin
+fstab.o: ${VOL}/fstab.c
+ ${COMPILE}
+
common.o: ${VOL}/common.c
${COMPILE}
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/ubik/beacon.c,v 1.1.1.12 2003/07/30 17:13:20 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/ubik/beacon.c,v 1.1.1.13 2004/01/10 20:57:50 hartmans Exp $");
#include <sys/types.h>
#ifdef AFS_NT40_ENV
/* now analyze return codes, counting up our votes */
yesVotes = 0; /* count how many to ensure we have quorum */
- oldestYesVote = 0x3fffffff; /* time quorum expires */
+ oldestYesVote = 0x7fffffff; /* time quorum expires */
syncsite= ubeacon_AmSyncSite();
startTime = FT_ApproxTime();
/*
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/util/flipbase64.c,v 1.1.1.6 2001/07/14 22:24:21 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/util/flipbase64.c,v 1.1.1.7 2004/01/10 20:57:55 hartmans Exp $");
#if defined(AFS_NAMEI_ENV)
*/
/* This table needs to be in lexical order to efficiently map back from
* characters to the numerical value.
+ *
+ * In c_reverse, we use 99 to represent an illegal value, rather than -1
+ * which would assume "char" is signed.
*/
+#ifdef AFS_DARWIN_ENV
+static char c_xlate[80] =
+ "!\"#$%&()*+,-0123456789:;<=>?@[]^_`abcdefghijklmnopqrstuvwxyz{|}~";
+static char c_reverse[] = {
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 0, 1, 2, 3, 4, 5, 99, 6, 7, 8, 9, 10, 11, 99, 99,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 29, 99, 30, 31, 32,
+ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99
+};
+#else /* AFS_DARWIN_ENV */
static char c_xlate[80] =
"+=0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+static char c_reverse[] = {
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 0, 99, 99, 99, 99,
+ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 99, 99, 99, 1, 99, 99,
+ 99, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 99, 99, 99, 99, 99,
+ 99, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99
+};
+#endif /* AFS_DARWIN_ENV */
/* int_to_base64
* Create a base 64 string representation of a number.
}
-/* Mapping: +=0, ==1, 0-9 = 2-11, A-Z = 12-37, a-z = 38-63 */
#ifdef AFS_64BIT_ENV
afs_int64 flipbase64_to_int64(char *s)
#else
#endif
int shift;
- for (shift = 0; *s; s++, shift += 6) {
- if (*s == '+') n = 0;
- else if (*s == '=') n = 1;
- else if (*s <= '9') {
- n = 2 + (int)(*s - '0');
- }
- else if (*s <= 'Z') {
- n = 12 + (int)(*s - 'A');
- }
- else if (*s <= 'z') {
- n = 38 + (int)(*s - 'a');
- }
+ for (shift = 0; *s; s++) {
+ n = c_reverse[*(unsigned char *)s];
+ if (n >= 64) /* should never happen */
+ continue;
n <<= shift;
result |= n ;
+ shift += 6;
}
return result;
}
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.
*/
+#include <afsconfig.h>
+#include <afs/param.h>
+
#define _POSIX_PTHREAD_SEMANTICS
#include <assert.h>
#include <stdio.h>
#include "pthread_nosigs.h"
+/*------------------------------------------------------------------------
+ * Under Darwin 6.x (including 7.0), sigwait() is broken, so we use
+ * sigsuspend() instead. We also don't block signals we don't know
+ * about, so they should kill us, rather than us returning zero status.
+ *------------------------------------------------------------------------*/
+
static pthread_t softsig_tid;
static struct {
void (*handler) (int);
int pending;
+#if !defined(AFS_DARWIN60_ENV)
int fatal;
+#endif /* !defined(AFS_DARWIN60_ENV) */
int inited;
} softsig_sigs[NSIG];
pthread_sigmask (SIG_BLOCK, &ss, &os);
pthread_sigmask (SIG_SETMASK, &os, NULL);
sigaddset (&ss, SIGUSR1);
+#if defined(AFS_DARWIN60_ENV)
+ pthread_sigmask (SIG_BLOCK, &ss, NULL);
+ sigdelset (&os, SIGUSR1);
+#else /* !defined(AFS_DARWIN60_ENV) */
for (i = 0; i < NSIG; i++) {
if (!sigismember(&os, i) && i != SIGSTOP && i != SIGKILL) {
sigaddset(&ss, i);
softsig_sigs[i].fatal = 1;
}
}
+#endif /* defined(AFS_DARWIN60_ENV) */
while (1) {
void (*h) (int) = NULL;
for (i = 0; i < NSIG; i++) {
if (softsig_sigs[i].handler && !softsig_sigs[i].inited) {
sigaddset(&ss, i);
+#if defined(AFS_DARWIN60_ENV)
+ pthread_sigmask (SIG_BLOCK, &ss, NULL);
+ sigdelset (&os, i);
+#endif /* defined(AFS_DARWIN60_ENV) */
softsig_sigs[i].inited = 1;
}
if (softsig_sigs[i].pending) {
}
}
if (i == NSIG) {
+#if defined(AFS_DARWIN60_ENV)
+ sigsuspend (&os);
+#else /* !defined(AFS_DARWIN60_ENV) */
sigwait (&ss, &sigw);
if (sigw != SIGUSR1) {
if (softsig_sigs[sigw].fatal)
exit(0);
softsig_sigs[sigw].pending=1;
}
+#endif /* defined(AFS_DARWIN60_ENV) */
} else if (h)
h (i);
}
}
+#if defined(AFS_DARWIN60_ENV)
+static void
+softsig_usr1 (int signo)
+{
+ signal (SIGUSR1, softsig_usr1);
+}
+#endif /* defined(AFS_DARWIN60_ENV) */
+
void
softsig_init ()
{
rc = pthread_create (&softsig_tid, NULL, &softsig_thread, NULL);
assert(0 == rc);
AFS_SIGSET_RESTORE();
+#if defined(AFS_DARWIN60_ENV)
+ signal (SIGUSR1, softsig_usr1);
+#endif /* defined(AFS_DARWIN60_ENV) */
}
static void
# This software has been released under the terms of the IBM Public
# License. For details, see the LICENSE file in the top-level source
# directory or online at http://www.openafs.org/dl/license10.html
+#
+# Portions Copyright (c) 2003 Apple Computer, Inc.
DEST=@DEST@
TOP_INCDIR=@TOP_INCDIR@
@case ${SYS_NAME} in \
alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun*) \
echo "Don't install fileserver for ${SYS_NAME}" ;; \
+ *_darwin_[1-6][0-9]) \
+ echo ${INSTALL} -ns $? $@ ; \
+ ${INSTALL} -ns $? $@ ;; \
+ *_darwin_*) \
+ echo "Don't install fileserver for ${SYS_NAME}" ;; \
*) \
echo ${INSTALL} -ns $? $@ ; \
${INSTALL} -ns $? $@ ;; \
@case ${SYS_NAME} in \
alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun*) \
echo "Don't install fileserver for ${SYS_NAME}" ;; \
+ *_darwin_[1-6][0-9]) \
+ echo ${INSTALL} -ns $? $@ ; \
+ ${INSTALL} -ns $? $@ ;; \
+ *_darwin_*) \
+ echo "Don't install fileserver for ${SYS_NAME}" ;; \
*) \
echo ${INSTALL} -ns $? $@ ; \
${INSTALL} -ns $? $@ ;; \
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/viced/viced.c,v 1.1.1.11 2003/07/30 17:13:36 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/viced/viced.c,v 1.1.1.12 2004/01/10 20:58:04 hartmans Exp $");
#include <stdio.h>
#include <stdlib.h>
#ifdef AFS_PTHREAD_ENV
void CheckSignal_Signal(x) {CheckSignal(0);}
void ShutDown_Signal(x) {ShutDown(0);}
-void CheckDescriptors_Signal(x) {CheckDescriptors(0);}
+void CheckDescriptors_Signal(x) {CheckDescriptors();}
#else /* AFS_PTHREAD_ENV */
void CheckSignal_Signal(x) {IOMGR_SoftSig(CheckSignal, 0);}
void ShutDown_Signal(x) {IOMGR_SoftSig(ShutDown, 0);}
# This software has been released under the terms of the IBM Public
# License. For details, see the LICENSE file in the top-level source
# directory or online at http://www.openafs.org/dl/license10.html
+#
+# Portions Copyright (c) 2003 Apple Computer, Inc.
DEST=@DEST@
TOP_INCDIR=@TOP_INCDIR@
VLIBOBJS=vnode.o volume.o vutil.o partition.o fssync.o purge.o \
clone.o nuke.o devname.o listinodes.o common.o ihandle.o \
- namei_ops.o
+ namei_ops.o ${EXTRA_VLIBOBJS}
OBJECTS=${VLIBOBJS} physio.o vol-salvage.o vol-info.o
#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header: /tmp/cvstemp/openafs/src/volser/volprocs.c,v 1.1.1.9 2003/07/30 17:13:44 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/volser/volprocs.c,v 1.1.1.10 2004/01/10 20:58:11 hartmans Exp $");
#include <stdio.h>
#include <sys/types.h>
}
strcpy(tt->lastProcName,"Restore");
tt->rxCallPtr = acid;
+
+ DFlushVolume(V_parentId(tt->volume)); /* Ensure dir buffers get dropped */
+
code = RestoreVolume(acid, tt->volume, (aflags & 1),cookie); /* last is incrementalp */
FSYNC_askfs(tt->volid, (char *) 0, FSYNC_RESTOREVOLUME, 0l);/*break call backs on the
restored volume */