diff options
Diffstat (limited to 'debian/patches/netfs-fix-fsys-receiver-lookups.patch')
| -rw-r--r-- | debian/patches/netfs-fix-fsys-receiver-lookups.patch | 48 |
1 files changed, 17 insertions, 31 deletions
diff --git a/debian/patches/netfs-fix-fsys-receiver-lookups.patch b/debian/patches/netfs-fix-fsys-receiver-lookups.patch index 54d06a09..8d72e458 100644 --- a/debian/patches/netfs-fix-fsys-receiver-lookups.patch +++ b/debian/patches/netfs-fix-fsys-receiver-lookups.patch @@ -1,4 +1,4 @@ -commit d9bcd42894027ae75e898d4a143c82f48f6c2eed +commit 300fc1b78311cf32dce548d9716ada4b961346c5 Author: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Wed Feb 12 11:24:14 2014 +0100 @@ -15,7 +15,7 @@ Date: Wed Feb 12 11:24:14 2014 +0100 * fsysstubs.c: Likewise. diff --git a/libnetfs/fsys-get-options.c b/libnetfs/fsys-get-options.c -index 54bd9a0..bc5be63 100644 +index 54bd9a0..836806b 100644 --- a/libnetfs/fsys-get-options.c +++ b/libnetfs/fsys-get-options.c @@ -31,7 +31,7 @@ @@ -27,21 +27,16 @@ index 54bd9a0..bc5be63 100644 mach_port_t reply, mach_msg_type_name_t reply_type, char **data, mach_msg_type_number_t *data_len) -@@ -39,10 +39,10 @@ netfs_S_fsys_get_options (fsys_t fsys, +@@ -39,8 +39,6 @@ netfs_S_fsys_get_options (fsys_t fsys, error_t err; char *argz = 0; size_t argz_len = 0; - struct port_info *port = - ports_lookup_port (netfs_port_bucket, fsys, netfs_control_class); -- if (!port) -+ if (!port -+ || port->pi.bucket != netfs_port_bucket -+ || port->pi.class != netfs_control_class) + if (!port) return EOPNOTSUPP; - - err = argz_add (&argz, &argz_len, program_invocation_name); -@@ -63,7 +63,5 @@ netfs_S_fsys_get_options (fsys_t fsys, +@@ -63,7 +61,5 @@ netfs_S_fsys_get_options (fsys_t fsys, else free (argz); @@ -50,7 +45,7 @@ index 54bd9a0..bc5be63 100644 return err; } diff --git a/libnetfs/fsys-getroot.c b/libnetfs/fsys-getroot.c -index 0d80111..fc774e1 100644 +index 0d80111..2d02120 100644 --- a/libnetfs/fsys-getroot.c +++ b/libnetfs/fsys-getroot.c @@ -25,7 +25,7 @@ @@ -71,24 +66,19 @@ index 0d80111..fc774e1 100644 struct iouser *cred; error_t err; struct protid *newpi; -@@ -49,9 +47,10 @@ netfs_S_fsys_getroot (mach_port_t cntl, - path: NULL, - }; +@@ -51,7 +49,6 @@ netfs_S_fsys_getroot (mach_port_t cntl, -- if (!pt) -+ if (!pt -+ || pt->pi.bucket != netfs_port_bucket -+ || pt->pi.class != netfs_control_class) + if (!pt) return EOPNOTSUPP; - ports_port_deref (pt); err = iohelp_create_complex_iouser (&cred, uids, nuids, gids, ngids); if (err) diff --git a/libnetfs/fsys-goaway.c b/libnetfs/fsys-goaway.c -index 0ac36d3..ec5db18 100644 +index 0ac36d3..872d073 100644 --- a/libnetfs/fsys-goaway.c +++ b/libnetfs/fsys-goaway.c -@@ -26,17 +26,17 @@ +@@ -26,17 +26,15 @@ #include <hurd/ports.h> error_t @@ -105,13 +95,11 @@ index 0ac36d3..ec5db18 100644 - netfs_control_class); - if (! pt) + -+ if (!pt -+ || pt->pi.bucket != netfs_port_bucket -+ || pt->pi.class != netfs_control_class) ++ if (!pt) return EOPNOTSUPP; err = netfs_shutdown (flags); -@@ -46,7 +46,5 @@ netfs_S_fsys_goaway (fsys_t control, +@@ -46,7 +44,5 @@ netfs_S_fsys_goaway (fsys_t control, exit (0); } @@ -120,10 +108,10 @@ index 0ac36d3..ec5db18 100644 return err; } diff --git a/libnetfs/fsys-set-options.c b/libnetfs/fsys-set-options.c -index d7dc743..c182ee2 100644 +index d7dc743..fb1c87e 100644 --- a/libnetfs/fsys-set-options.c +++ b/libnetfs/fsys-set-options.c -@@ -31,15 +31,17 @@ +@@ -31,15 +31,15 @@ /* Implement fsys_set_options as described in <hurd/fsys.defs>. */ error_t @@ -137,14 +125,12 @@ index d7dc743..c182ee2 100644 error_t err = 0; - struct port_info *pt = - ports_lookup_port (netfs_port_bucket, fsys, netfs_control_class); -+ if (!pt -+ || pt->pi.bucket != netfs_port_bucket -+ || pt->pi.class != netfs_control_class) ++ if (!pt) + return EOPNOTSUPP; error_t helper (struct node *np) -@@ -64,9 +66,6 @@ netfs_S_fsys_set_options (fsys_t fsys, +@@ -64,9 +64,6 @@ netfs_S_fsys_set_options (fsys_t fsys, return error; } @@ -154,7 +140,7 @@ index d7dc743..c182ee2 100644 #if NOT_YET if (do_children) { -@@ -87,7 +86,5 @@ netfs_S_fsys_set_options (fsys_t fsys, +@@ -87,7 +84,5 @@ netfs_S_fsys_set_options (fsys_t fsys, #endif } |