Index: libdiskfs/boot-start.c
===================================================================
RCS file: /cvsroot/hurd/hurd/libdiskfs/boot-start.c,v
retrieving revision 1.60
diff -u -r1.60 boot-start.c
--- libdiskfs/boot-start.c	26 Mar 2002 14:59:52 -0000	1.60
+++ libdiskfs/boot-start.c	8 Aug 2003 18:16:34 -0000
@@ -53,12 +53,23 @@
 get_console ()
 {
   mach_port_t device_master, console;
+#ifdef KERNEL_SECURITY_TOKEN_VALUE
+  security_token_t sec_token = KERNEL_SECURITY_TOKEN_VALUE;
+#endif
   error_t err = get_privileged_ports (0, &device_master);
 
   if (err)
     return MACH_PORT_NULL;
 
-  err = device_open (device_master, D_WRITE | D_READ, "console", &console);
+  err = device_open (device_master,
+#ifdef KERN_INVALID_LEDGER
+		     MACH_PORT_NULL,
+#endif
+		     D_WRITE | D_READ,
+#ifdef KERNEL_SECURITY_TOKEN_VALUE
+		     sec_token,
+#endif
+		     "console", &console);
   if (err)
     return MACH_PORT_NULL;
 
Index: libdiskfs/console.c
===================================================================
RCS file: /cvsroot/hurd/hurd/libdiskfs/console.c,v
retrieving revision 1.6
diff -u -r1.6 console.c
--- libdiskfs/console.c	20 Aug 2001 22:45:11 -0000	1.6
+++ libdiskfs/console.c	8 Aug 2003 18:16:34 -0000
@@ -57,11 +57,23 @@
     {
       mach_port_t dev, cons;
       error_t err;
+#ifdef KERNEL_SECURITY_TOKEN_VALUE
+      security_token_t sec_token = KERNEL_SECURITY_TOKEN_VALUE;
+#endif
+      
       if (diskfs_boot_filesystem ())
 	_diskfs_boot_privports ();
       err = get_privileged_ports (NULL, &dev);
       assert_perror (err);
-      err = device_open (dev, D_READ|D_WRITE, "console", &cons);
+      err = device_open (dev,
+#ifdef KERN_INVALID_LEDGER
+			 MACH_PORT_NULL,
+#endif
+			 D_READ | D_WRITE,
+#ifdef KERNEL_SECURITY_TOKEN_VALUE
+			 sec_token,
+#endif
+			 "console", &cons);
       mach_port_deallocate (mach_task_self (), dev);
       assert_perror (err);
       stdin = mach_open_devstream (cons, "r");
Index: libdiskfs/file-set-trans.c
===================================================================
RCS file: /cvsroot/hurd/hurd/libdiskfs/file-set-trans.c,v
retrieving revision 1.35
diff -u -r1.35 file-set-trans.c
--- libdiskfs/file-set-trans.c	8 May 2002 09:56:54 -0000	1.35
+++ libdiskfs/file-set-trans.c	8 Aug 2003 18:16:34 -0000
@@ -105,7 +105,7 @@
   /* Set passive translator */
   if (passive_flags & FS_TRANS_SET)
     {
-      if (!(passive_flags & FS_TRANS_FORCE))
+      if (passive && !(passive_flags & FS_TRANS_FORCE))
 	{
 	  /* Handle the short-circuited translators */
 	  mode_t newmode = 0;
Index: libdiskfs/io-map-cntl.c
===================================================================
RCS file: /cvsroot/hurd/hurd/libdiskfs/io-map-cntl.c,v
retrieving revision 1.7
diff -u -r1.7 io-map-cntl.c
--- libdiskfs/io-map-cntl.c	8 May 2002 09:57:02 -0000	1.7
+++ libdiskfs/io-map-cntl.c	8 Aug 2003 18:16:34 -0000
@@ -17,7 +17,11 @@
 
 #include "priv.h"
 #include "io_S.h"
+#ifdef OSFMACH
+#include <mach/default_pager_object.h>
+#else
 #include <mach/default_pager.h>
+#endif
 
 /* Implement io_map_cntl as described in <hurd/io.defs>. */
 kern_return_t