[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 12/23: trans/passwd: convert to trivfs dynamic classes and bucket
From: |
Samuel Thibault |
Subject: |
[hurd] 12/23: trans/passwd: convert to trivfs dynamic classes and buckets |
Date: |
Tue, 13 Oct 2015 00:09:55 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch upstream
in repository hurd.
commit 65e63be1f4884a0223fe51ac6ff53ed11605506a
Author: Justus Winter <address@hidden>
Date: Sun Sep 27 16:26:03 2015 +0200
trans/passwd: convert to trivfs dynamic classes and buckets
libtrivfs contains two ways of managing more than one port class and
bucket. There is the old way of using a statically allocated array
with explicit length, and the new way with dynamically allocated
vectors.
Converting all users to the new way of handling multiple classes
and/or buckets, we can simplify the code in libtrivfs. In many cases,
the code will be simpler and more expressive for the user.
This also fixes a mild bug. The classes and buckets given to
`trivfs_startup' end up in the dynamic vectors too, making the object
lookup code use the more complicated code path.
* trans/password.c: Convert to dynamic classes and buckets.
---
trans/password.c | 48 +++++++++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 21 deletions(-)
diff --git a/trans/password.c b/trans/password.c
index 344b78b..9ffcaa0 100644
--- a/trans/password.c
+++ b/trans/password.c
@@ -39,6 +39,10 @@ const char *argp_program_version = STANDARD_HURD_VERSION
(password);
/* Port bucket we service requests on. */
struct port_bucket *port_bucket;
+/* Our port classes. */
+struct port_class *trivfs_control_class;
+struct port_class *trivfs_protid_class;
+
/* Trivfs hooks. */
int trivfs_fstype = FSTYPE_MISC;
int trivfs_fsid = 0;
@@ -46,12 +50,6 @@ int trivfs_support_read = 0;
int trivfs_support_write = 0;
int trivfs_support_exec = 0;
int trivfs_allow_open = 0;
-
-struct port_class *trivfs_protid_portclasses[1];
-struct port_class *trivfs_cntl_portclasses[1];
-int trivfs_protid_nportclasses = 1;
-int trivfs_cntl_nportclasses = 1;
-
static int
password_demuxer (mach_msg_header_t *inp, mach_msg_header_t *outp)
@@ -75,15 +73,23 @@ main (int argc, char *argv[])
if (bootstrap == MACH_PORT_NULL)
error (1, 0, "must be started as a translator");
- port_bucket = ports_create_bucket ();
- trivfs_cntl_portclasses[0] = ports_create_class (trivfs_clean_cntl, 0);
- trivfs_protid_portclasses[0] = ports_create_class (trivfs_clean_protid, 0);
-
+ err = trivfs_add_port_bucket (&port_bucket);
+ if (err)
+ error (1, 0, "error creating port bucket");
+
+ err = trivfs_add_control_port_class (&trivfs_control_class);
+ if (err)
+ error (1, 0, "error creating control port class");
+
+ err = trivfs_add_protid_port_class (&trivfs_protid_class);
+ if (err)
+ error (1, 0, "error creating protid port class");
+
/* Reply to our parent. */
err = trivfs_startup (bootstrap, 0,
- trivfs_cntl_portclasses[0], port_bucket,
- trivfs_protid_portclasses[0], port_bucket,
- &fsys);
+ trivfs_control_class, port_bucket,
+ trivfs_protid_class, port_bucket,
+ &fsys);
mach_port_deallocate (mach_task_self (), bootstrap);
if (err)
error (3, err, "Contacting parent");
@@ -114,17 +120,17 @@ trivfs_goaway (struct trivfs_control *fsys, int flags)
int count;
/* Stop new requests. */
- ports_inhibit_class_rpcs (trivfs_cntl_portclasses[0]);
- ports_inhibit_class_rpcs (trivfs_protid_portclasses[0]);
+ ports_inhibit_class_rpcs (trivfs_control_class);
+ ports_inhibit_class_rpcs (trivfs_protid_class);
/* Are there any extant user ports for the /servers/password file? */
- count = ports_count_class (trivfs_protid_portclasses[0]);
+ count = ports_count_class (trivfs_protid_class);
if (count > 0 && !(flags & FSYS_GOAWAY_FORCE))
{
/* We won't go away, so start things going again... */
- ports_enable_class (trivfs_protid_portclasses[0]);
- ports_resume_class_rpcs (trivfs_cntl_portclasses[0]);
- ports_resume_class_rpcs (trivfs_protid_portclasses[0]);
+ ports_enable_class (trivfs_protid_class);
+ ports_resume_class_rpcs (trivfs_control_class);
+ ports_resume_class_rpcs (trivfs_protid_class);
return EBUSY;
}
@@ -153,7 +159,7 @@ S_password_check_user (struct trivfs_protid *cred, uid_t
user, char *pw,
return EOPNOTSUPP;
if (cred->pi.bucket != port_bucket ||
- cred->pi.class != trivfs_protid_portclasses[0])
+ cred->pi.class != trivfs_protid_class)
{
ports_port_deref (cred);
return EOPNOTSUPP;
@@ -201,7 +207,7 @@ S_password_check_group (struct trivfs_protid *cred, uid_t
group, char *pw,
return EOPNOTSUPP;
if (cred->pi.bucket != port_bucket ||
- cred->pi.class != trivfs_protid_portclasses[0])
+ cred->pi.class != trivfs_protid_class)
{
ports_port_deref (cred);
return EOPNOTSUPP;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] 19/23: Add missing null checks in libshouldbeinlibc, (continued)
- [hurd] 19/23: Add missing null checks in libshouldbeinlibc, Samuel Thibault, 2015/10/12
- [hurd] 21/23: Make netfs_S_io_reauthenticate handle allocation errors, Samuel Thibault, 2015/10/12
- [hurd] 20/23: Drop duplicate port deallocation, Samuel Thibault, 2015/10/12
- [hurd] 14/23: libtrivfs: optimize the object lookup code, Samuel Thibault, 2015/10/12
- [hurd] 23/23: Merge remote-tracking branch 'upstream/master' into upstream, Samuel Thibault, 2015/10/12
- [hurd] 10/23: trans/magic: convert to trivfs dynamic classes and buckets, Samuel Thibault, 2015/10/12
- [hurd] 04/23: libdiskfs: fflush stdout when pausing, Samuel Thibault, 2015/10/12
- [hurd] 11/23: trans/new-fifo: convert to trivfs dynamic classes and buckets, Samuel Thibault, 2015/10/12
- [hurd] 07/23: pflocal: convert to trivfs dynamic classes and buckets, Samuel Thibault, 2015/10/12
- [hurd] 09/23: trans/ifsock: convert to trivfs dynamic classes and buckets, Samuel Thibault, 2015/10/12
- [hurd] 12/23: trans/passwd: convert to trivfs dynamic classes and buckets,
Samuel Thibault <=
- [hurd] 13/23: trans/proxy-defpager: convert to trivfs dynamic classes and buckets, Samuel Thibault, 2015/10/15
- [hurd] 17/23: libdiskfs: fflush stdout when pausing, Samuel Thibault, 2015/10/15
- [hurd] 22/23: Make dir_lookup create files with user permissions enabled, Samuel Thibault, 2015/10/15
- [hurd] 16/23: Minor documentation changes, Samuel Thibault, 2015/10/15
- [hurd] 03/23: libdiskfs: improve error handling, Samuel Thibault, 2015/10/15
- [hurd] 02/23: exec: add missing include, Samuel Thibault, 2015/10/15
- [hurd] 05/23: exec: convert to trivfs dynamic classes and buckets, Samuel Thibault, 2015/10/15
- [hurd] 01/23: libports: remove unused variables, Samuel Thibault, 2015/10/15
- [hurd] 06/23: pfinet: convert to trivfs dynamic classes and buckets, Samuel Thibault, 2015/10/15
- [hurd] 08/23: trans/crash: convert to trivfs dynamic classes and buckets, Samuel Thibault, 2015/10/15