From: Matt Benjamin <matt@linuxbox.com>
Date: Tue, 12 May 2009 14:02:38 +0000 (+0000)
Subject: openbsd-44-45-20090512
X-Git-Tag: openafs-devel-1_5_61~337
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=4b9283a30db0c3aee943c94573b412f24894d366

openbsd-44-45-20090512

LICENSE IPL10
FIXES 124719

add missing osi_free backend, missing param file, modify soreceive for 4.5
---

diff --git a/src/afs/afs_osi.c b/src/afs/afs_osi.c
index 8c40c79..b1b77d6 100644
--- a/src/afs/afs_osi.c
+++ b/src/afs/afs_osi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000, International Business Machines Corporation and others.
+ * Copyrigh 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
  *
  * This software has been released under the terms of the IBM Public
diff --git a/src/afs/afs_osi_alloc.c b/src/afs/afs_osi_alloc.c
index 8a9c188..dfb834c 100644
--- a/src/afs/afs_osi_alloc.c
+++ b/src/afs/afs_osi_alloc.c
@@ -113,6 +113,8 @@ afs_osi_Free(void *x, size_t asize)
     osi_linux_free(x);
 #elif defined(AFS_FBSD_ENV)
     osi_fbsd_free(x);
+#elif defined(AFS_OBSD44_ENV)
+    osi_obsd_Free(x, asize);
 #else
     AFS_KFREE((struct osimem *)x, asize);
 #endif
diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h
index 4dbb5a4..9b6cc6c 100644
--- a/src/config/afs_sysnames.h
+++ b/src/config/afs_sysnames.h
@@ -249,6 +249,7 @@
 #define SYS_NAME_ID_i386_obsd42         2611
 #define SYS_NAME_ID_i386_obsd43         2612
 #define SYS_NAME_ID_i386_obsd44         2613
+#define SYS_NAME_ID_i386_obsd45         2614
 
 #define SYS_NAME_ID_amd64_linux2        2700
 #define SYS_NAME_ID_amd64_linux22       2701
diff --git a/src/config/param.i386_obsd44.h b/src/config/param.i386_obsd44.h
new file mode 100644
index 0000000..25866ba
--- /dev/null
+++ b/src/config/param.i386_obsd44.h
@@ -0,0 +1,72 @@
+/*
+ * Jim Rees, University of Michigan CITI
+ */
+
+#ifndef	AFS_PARAM_H
+#define	AFS_PARAM_H
+
+#ifndef IGNORE_STDS_H
+#include <sys/param.h>
+#endif
+
+#define SYS_NAME		"i386_obsd44"
+#define SYS_NAME_ID		SYS_NAME_ID_i386_obsd44
+
+#define AFS_XBSD_ENV		1	/* {Free,Open,Net}BSD */
+#define AFS_X86_XBSD_ENV	1
+
+#define AFS_NAMEI_ENV		1	/* User space interface to file system */
+#define AFS_64BIT_ENV		1
+#define AFS_64BIT_CLIENT	1
+#define AFS_64BIT_IOPS_ENV	1	/* Needed for NAMEI */
+#define AFS_OBSD_ENV		1
+#define AFS_OBSD34_ENV		1
+#define AFS_OBSD35_ENV		1
+#define AFS_OBSD36_ENV		1
+#define AFS_OBSD37_ENV		1
+#define AFS_OBSD38_ENV		1
+#define AFS_OBSD39_ENV		1
+#define AFS_OBSD40_ENV		1
+#define AFS_OBSD41_ENV		1
+#define AFS_OBSD42_ENV		1
+#define AFS_OBSD43_ENV		1
+#define AFS_OBSD44_ENV		1
+#define AFS_NONFSTRANS		1
+#define AFS_VM_RDWR_ENV		1
+#define AFS_VFS_ENV		1
+#define AFS_VFSINCL_ENV		1
+
+#define FTRUNC O_TRUNC
+
+#define AFS_SYSCALL		208
+#define AFS_MOUNT_AFS		"afs"
+
+#define RXK_LISTENER_ENV	1
+#define AFS_GCPAGS	        0	/* if nonzero, garbage collect PAGs */
+#define AFS_USE_GETTIMEOFDAY    1	/* use gettimeofday to implement rx clock */
+
+#define AFSLITTLE_ENDIAN	1
+
+#ifndef IGNORE_STDS_H
+#include <afs/afs_sysnames.h>
+#endif
+
+/* Extra kernel definitions (from kdefs file) */
+#ifdef _KERNEL
+#define AFS_GLOBAL_SUNLOCK	1
+#define	AFS_SHORTGID		0	/* are group id's short? */
+
+#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
+enum vcexcl { NONEXCL, EXCL };
+
+#ifndef MIN
+#define MIN(A,B) ((A) < (B) ? (A) : (B))
+#endif
+#ifndef MAX
+#define MAX(A,B) ((A) > (B) ? (A) : (B))
+#endif
+
+#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
+#endif /* _KERNEL */
+
+#endif /* AFS_PARAM_H */
diff --git a/src/rx/OBSD/rx_knet.c b/src/rx/OBSD/rx_knet.c
index e2fa381..e812534 100644
--- a/src/rx/OBSD/rx_knet.c
+++ b/src/rx/OBSD/rx_knet.c
@@ -42,7 +42,11 @@ osi_NetReceive(osi_socket asocket, struct sockaddr_in *addr,
 
     if (haveGlock)
 	AFS_GUNLOCK();
-    code = soreceive(asocket, (addr ? &nam : NULL), &u, NULL, NULL, NULL);
+    code = soreceive(asocket, (addr ? &nam : NULL), &u, NULL, NULL, NULL
+#if defined(AFS_OBSD45_ENV)
+		     , 0
+#endif
+		     );
     if (haveGlock)
 	AFS_GLOCK();