diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2013-12-04 10:43:04 +0100 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2013-12-04 12:10:03 +0100 |
| commit | 93976a816e6d690a6c7d77801e31ce6ee5bc4899 (patch) | |
| tree | 6876384dd11d78bb9816ec8cdc8ecc81e804b805 /trans | |
| parent | df66588b0f6daf99573153cb384a676ced27f0b1 (diff) | |
trans: fix transparent reauthentication in fakeroot
When looking up files, fakeroot intercepts reauthentication requests
and executes io_reauthenticate and auth_user_authenticate
transparently for the client. This, however, makes the client
incorrectly assume that the lookup is finished (assuming
/media/scratch is a translator):
% cd /media/scratch && fakeroot-hurd pwd
pwd: reading directory `..': Bad file descriptor
Make the reauthentication completely transparent to the client by
re-doing the lookup ourselves.
* trans/fakeroot.c (netfs_S_dir_lookup): Fix transparent reauthentication.
Diffstat (limited to 'trans')
| -rw-r--r-- | trans/fakeroot.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/trans/fakeroot.c b/trans/fakeroot.c index b6938dce..24d3a4f9 100644 --- a/trans/fakeroot.c +++ b/trans/fakeroot.c @@ -235,7 +235,10 @@ netfs_S_dir_lookup (struct protid *diruser, return EOPNOTSUPP; dnp = diruser->po->np; - err = dir_lookup (dnp->nn->file, filename, + + mach_port_t dir = dnp->nn->file; + redo_lookup: + err = dir_lookup (dir, filename, flags & (O_NOLINK|O_RDWR|O_EXEC|O_CREAT|O_EXCL|O_NONBLOCK), mode, do_retry, retry_name, &file); if (err) @@ -252,14 +255,14 @@ netfs_S_dir_lookup (struct protid *diruser, mach_port_deallocate (mach_task_self (), file); err = auth_user_authenticate (fakeroot_auth_port, ref, MACH_MSG_TYPE_MAKE_SEND, - retry_port); + &dir); } mach_port_destroy (mach_task_self (), ref); if (err) return err; } - *do_retry = FS_RETRY_NORMAL; - /*FALLTHROUGH*/ + filename = retry_name; + goto redo_lookup; case FS_RETRY_NORMAL: case FS_RETRY_MAGICAL: |