patch for arla-0.41 on OpenBSD-3.8

[Hugo Meiland]

Hi all,

Due to e.g. dropping of UNION support in OpenBSD 3.8, arla-0.41  
wouldn't build on this system; the following patch should fix this....

since I sort of completly ripped out UNION support, there should be  
some nice checks during configure on whether this stuff must be  
removed..I'm not completely sure on how to do that nicely, so I send  
the patch like it is now....

If someone could help me getting it in shape, please!!!

Hugo Meiland

btw it's also here -> http://www.liacs.nl/~hmeiland/afs/arla-0.41- 
obsd.patch

diff -ru appl/fs/fs_local.h arla-0.41.new/appl/fs/fs_local.h
--- appl/fs/fs_local.h  Thu Nov 17 13:58:57 2005
+++ arla-0.41.new/appl/fs/fs_local.h    Tue Dec 27 18:43:28 2005
@@ -51,6 +51,10 @@
#define MAXNAME 100
#define MAXSIZE 2048
+#ifndef PRId64
+#define PRId64 "%ld"
+#endif
+
int arladebug_cmd (int argc, char **argv);
int checkservers_cmd (int argc, char **argv);
int copyacl_cmd (int argc, char **argv);
diff -ru nnpfs/bsd/bin/mntopts.h arla-0.41.new/nnpfs/bsd/bin/mntopts.h
--- nnpfs/bsd/bin/mntopts.h     Fri Mar 24 06:33:00 2000
+++ arla-0.41.new/nnpfs/bsd/bin/mntopts.h       Tue Dec 27 17:37:44 2005
@@ -53,7 +53,7 @@
#define MOPT_NOSUID            { "suid",       1, MNT_NOSUID }
#define MOPT_RDONLY            { "rdonly",     0, MNT_RDONLY }
#define MOPT_SYNC              { "sync",       0, MNT_SYNCHRONOUS }
-#define MOPT_UNION             { "union",      0, MNT_UNION }
+//#define MOPT_UNION           { "union",      0, MNT_UNION }
#define MOPT_USERQUOTA         { "userquota",  0, 0 }
#define MOPT_GROUPQUOTA                { "groupquota", 0, 0 }
@@ -88,7 +88,7 @@
          
MOPT_NOEXEC,                                                    \
          
MOPT_NOSUID,                                                    \
          
MOPT_RDONLY,                                                    \
-       MOPT_UNION
+       {NULL}
#else
@@ -100,7 +100,7 @@
          
MOPT_NOEXEC,                                                    \
          
MOPT_NOSUID,                                                    \
          
MOPT_RDONLY,                                                    \
-       MOPT_UNION
+       {NULL}
#endif
diff -ru nnpfs/bsd/bin/mount_nnpfs.c arla-0.41.new/nnpfs/bsd/bin/ 
mount_nnpfs.c
--- nnpfs/bsd/bin/mount_nnpfs.c Wed Dec 22 20:38:37 2004
+++ arla-0.41.new/nnpfs/bsd/bin/mount_nnpfs.c   Tue Dec 27 19:10:01 2005
@@ -39,11 +39,11 @@
#endif
static const struct mntopt mopts[] = {
-    MOPT_STDOPTS,
-    MOPT_ASYNC,
-    MOPT_SYNC,
-    MOPT_UPDATE,
-    MOPT_RELOAD,
+    "MOPT_STDOPTS",
+    "MOPT_ASYNC",
+    "MOPT_SYNC",
+    "MOPT_UPDATE",
+    "MOPT_RELOAD",
      {NULL}
};