Wed Nov 6 19:26:14 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>

	* Makefile (SRCS): Add iouser-create.c, iouser-dup.c
	iouser-reauth.c, and iouser-free.c.
	(OBJS): Compute automatically.

	* iohelp.h (iohelp_create_user): New function.
	* iouser-create.c: New file.

Tue Nov  5 21:51:24 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>

	* iohelp.h (struct iouser): New type.
	(iohelp_dup_iouser, iohelp_free_iouser, iohelp_reauth): New
	functions.
	* iouser-dup.c, iouser-reauth.c, iouser-free.c: New files.

7 files changed, 262 insertions, 3 deletions

diff --git a/libiohelp/ChangeLog b/libiohelp/ChangeLog
index e70d5d14..a4dce1f8 100644
--- a/libiohelp/ChangeLog
+++ b/libiohelp/ChangeLog
@@ -1,3 +1,19 @@
+Wed Nov  6 19:26:14 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* Makefile (SRCS): Add iouser-create.c, iouser-dup.c
+	iouser-reauth.c, and iouser-free.c.
+	(OBJS): Compute automatically.
+	
+	* iohelp.h (iohelp_create_user): New function.
+	* iouser-create.c: New file.
+
+Tue Nov  5 21:51:24 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* iohelp.h (struct iouser): New type.
+	(iohelp_dup_iouser, iohelp_free_iouser, iohelp_reauth): New
+	functions. 
+	* iouser-dup.c, iouser-reauth.c, iouser-free.c: New files.
+
 Thu Sep 12 16:18:46 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
 
 	* Makefile (HURDLIBS): New variable.
diff --git a/libiohelp/Makefile b/libiohelp/Makefile
index 9202f9e8..61d20aa9 100644
--- a/libiohelp/Makefile
+++ b/libiohelp/Makefile
@@ -19,9 +19,9 @@ dir := libiohelp
 makemode := library
 
 SRCS = get_conch.c handle_io_get_conch.c handle_io_release_conch.c \
-	initialize_conch.c verify_user_conch.c
-OBJS = get_conch.o handle_io_get_conch.o handle_io_release_conch.o \
-	initialize_conch.o verify_user_conch.o
+	initialize_conch.c verify_user_conch.c iouser-create.c \
+	iouser-dup.c iouser-reauth.c iouser-free.c
+OBJS = $(SRCS:.c=.o)
 LCLHDRS = iohelp.h 
 HURDLIBS = threads
 libname = libiohelp
diff --git a/libiohelp/iohelp.h b/libiohelp/iohelp.h
index 2897653d..f4a8615e 100644
--- a/libiohelp/iohelp.h
+++ b/libiohelp/iohelp.h
@@ -64,4 +64,33 @@ void iohelp_fetch_shared_data (void *);
 void iohelp_put_shared_data (void *);
 
 
+
+/* User identification */
+
+struct iouser
+{
+  struct idvec *uids, *gids;
+  void *hook; /* Never used by iohelp library */
+};
+
+/* Return a copy of IOUSER. */
+struct iouser *iohelp_dup_iouser (struct iouser *iouser);
+
+/* Free a reference to IOUSER. */
+void iohelp_free_iouser (struct iouser *iouser);
+
+/* Create a new IOUSER for the specified idvecs */
+struc iouser *iohelp_create_iouser (struct idvec *uids, struct idvec *gids);
+
+/* Conduct a reauthentication transaction, returning a new iouser.
+   AUTHSERVER is the I/O servers auth port.  The rendezvous port
+   provided by the user is REND_PORT.  If the transaction cannot be
+   completed, return zero, unless PERMIT_FAILURE is non-zero.  If
+   PERMIT_FAILURE is nonzero, then should the transaction fail, return
+   an iouser that has no ids.  The new port to be sent to the user is
+   newright.  */
+struct iouser *iohelp_reauth (auth_t authserver, mach_port_t rend_port,
+			      mach_port_t newright, int permit_failure);
+   
+
 #endif
diff --git a/libiohelp/iouser-create.c b/libiohelp/iouser-create.c
new file mode 100644
index 00000000..69b9f7e1
--- /dev/null
+++ b/libiohelp/iouser-create.c
@@ -0,0 +1,32 @@
+/* 
+   Copyright (C) 1996 Free Software Foundation
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+#include "iohelp.h"
+
+struct iouser *
+iohelp_create_iouser (struct idvec *uids, struct idvec *gids)
+{
+  struct iouser *new;
+  new = malloc (sizeof (struct iouser));
+  if (!new)
+    return 0;
+
+  new->uids = uids;
+  new->gids = gids;
+  return new;
+}
+  
diff --git a/libiohelp/iouser-dup.c b/libiohelp/iouser-dup.c
new file mode 100644
index 00000000..f6839ac2
--- /dev/null
+++ b/libiohelp/iouser-dup.c
@@ -0,0 +1,50 @@
+/* 
+   Copyright (C) 1996 Free Software Foundation
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+#include "iohelp.h"
+
+struct iouser *
+iohelp_dup_iouser (struct iouser *iouser)
+{
+  struct iouser *new;
+  error_t err = 0;
+
+  new = malloc (sizeof (struct iouser));
+  if (!new)
+    return 0;
+
+  new->uids = make_idvec ();
+  new->gids = make_idvec ();
+  if (!new->uids || !new->gids)
+    goto lose;
+
+  err = idvec_set (new->uids, iouser->uids);
+  if (!err)
+    err = idvec_set (new->gids, iouser->gids);
+
+  if (err)
+    {
+    lose:
+      if (new->uids)
+	idvec_free (new->uids);
+      if (new->gids)
+	idvec_free (new->gids);
+      free (new);
+      return 0;
+    }
+  return new;
+}
diff --git a/libiohelp/iouser-free.c b/libiohelp/iouser-free.c
new file mode 100644
index 00000000..4cfdc954
--- /dev/null
+++ b/libiohelp/iouser-free.c
@@ -0,0 +1,28 @@
+/* 
+   Copyright (C) 1996 Free Software Foundation
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+#include "iohelp.h"
+
+void
+iohelp_free_iouser (struct iouser *iouser)
+{
+  idvec_free (iouser->uids);
+  idvec_free (iouser->gids);
+  free (iouser);
+}
+
+	   
diff --git a/libiohelp/iouser-reauth.c b/libiohelp/iouser-reauth.c
new file mode 100644
index 00000000..d4b67ff6
--- /dev/null
+++ b/libiohelp/iouser-reauth.c
@@ -0,0 +1,104 @@
+/* 
+   Copyright (C) 1996 Free Software Foundation
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+#include "iohelp.h"
+
+/* Conduct a reauthentication transaction, returning a new iouser.
+   AUTHSERVER is the I/O servers auth port.  The rendezvous port
+   provided by the user is REND_PORT.  If the transaction cannot be
+   completed, return zero, unless PERMIT_FAILURE is non-zero.  If
+   PERMIT_FAILURE is nonzero, then should the transaction fail, return
+   an iouser that has no ids.  The new port to be sent to the user is
+   newright.  */
+struct iouser *iohelp_reauth (auth_t authserver, mach_port_t rend_port,
+			      mach_port_t newright, int permit_failure)
+{
+  uid_t gubuf[20], ggbuf[20], aubuf[20], agbuf[20];
+  uid_t *gen_uids, *gen_gids, *aux_uids, *aux_gids;
+  u_int genuidlen, gengidlen, auxuidlen, auxgidlen;
+  error_t err;
+  struct iouser *new;
+
+  new = malloc (sizeof (struct iouser));
+  if (!new)
+    return 0;
+
+  new->uids = make_idvec ();
+  new->gids = make_idvec ();
+  if (!new->uids || !new->gids)
+    {
+      if (new->uids)
+	idvec_free (new->uids);
+      if (new->gids)
+	idvec_free (new->gids);
+      free (new);
+      return 0;
+    }
+
+  genuidlen = gengidlen = auxuidlen = auxgidlen = 20;
+  gen_uids = gubuf;
+  gen_gids = ggbuf;
+  aux_uids = aubuf;
+  aux_gids = agbuf;
+
+  do
+    err = auth_server_authenticate (authserver,
+				    rend_port,
+				    MACH_MSG_TYPE_COPY_SEND,
+				    newright,
+				    MACH_MSG_TYPE_COPY_SEND,
+				    &gen_uids, &genuidlen,
+				    &aux_uids, &auxuidlen,
+				    &gen_gids, &gengidlen,
+				    &aux_gids, &auxgidlen);
+  while (err == EINTR);
+
+  if (err)
+    {
+      if (permit_failure)
+	genuidlen = gengidlen = 0;
+      else
+	goto out;
+    }
+
+  err = idvec_set_ids (new->uids, gen_uids, genuidlen);
+  if (!err)
+    err = idvec_set_ids (new->gids, gen_gids, gengidlen);
+
+  if (gubuf != gen_uids)
+    vm_deallocate (mach_task_self (), (u_int) gen_uids,
+		   genuidlen * sizeof (uid_t));
+  if (ggbuf != gen_gids)
+    vm_deallocate (mach_task_self (), (u_int) gen_gids,
+		   gengidlen * sizeof (uid_t));
+  if (aubuf != aux_uids)
+    vm_deallocate (mach_task_self (), (u_int) aux_uids,
+		   auxuidlen * sizeof (uid_t));
+  if (agbuf != aux_gids)
+    vm_deallocate (mach_task_self (), (u_int) aux_gids,
+		   auxgidlen * sizeof (uid_t));
+
+  if (err)
+    {
+    out:
+      idvec_free (new->uids);
+      idvec_free (new->gids);
+      free (new);
+      return 0;
+    }
+  return new;
+}