Resolve conflicts.

This concludes tonight's entertainment. Once I'm sure I haven't destroyed
the world with all these changes, I'll import the utilities. Everything
should continue to work as before. If it doesn't let me know.

Special thanks to Mark Murray for running a test 'make world' for me to
shake out the bugs, which, hopefully, I have fixed.

(And there was much rejoicing.)

1 files changed, 122 insertions, 28 deletions

diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c
index f69ebf5..0063e75 100644
--- a/lib/libc/rpc/svc_auth.c
+++ b/lib/libc/rpc/svc_auth.c
@@ -5,42 +5,56 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- *
+ * 
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
+ * 
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- *
+ * 
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- *
+ * 
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- *
+ * 
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
+/*
+ * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
+ */
+
+#ident	"@(#)svc_auth.c	1.16	94/04/24 SMI"
 
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)svc_auth.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/
-/*static char *sccsid = "from: @(#)svc_auth.c	2.1 88/08/07 4.0 RPCSRC";*/
-static char *rcsid = "$Id$";
+#if !defined(lint) && defined(SCCSIDS)
+static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro";
 #endif
 
 /*
- * svc_auth_nodes.c, Server-side rpc authenticator interface,
- * *WITHOUT* DES authentication.
+ * svc_auth.c, Server-side rpc authenticator interface.
  *
- * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
+#ifdef KERNEL
+#include <sys/param.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+#include <rpc/auth.h>
+#include <rpc/clnt.h>
+#include <rpc/rpc_msg.h>
+#include <rpc/svc.h>
+#include <rpc/svc_auth.h>
+#else
+#include <stdlib.h>
 #include <rpc/rpc.h>
+#endif
+#include <sys/types.h>
 
 /*
  * svcauthsw is the bdevsw of server side authentication.
@@ -57,19 +71,18 @@ static char *rcsid = "$Id$";
  *
  */
 
-enum auth_stat _svcauth_null();		/* no authentication */
-enum auth_stat _svcauth_unix();		/* unix style (uid, gids) */
+enum auth_stat _svcauth_null();	/* no authentication */
+enum auth_stat _svcauth_unix();		/* (system) unix style (uid, gids) */
 enum auth_stat _svcauth_short();	/* short hand unix style */
+enum auth_stat _svcauth_des();		/* des style */
 
-static struct {
-	enum auth_stat (*authenticator)();
-} svcauthsw[] = {
-	{_svcauth_null},			/* AUTH_NULL */
-	{_svcauth_unix},			/* AUTH_UNIX */
-	{_svcauth_short},			/* AUTH_SHORT */
+/* declarations to allow servers to specify new authentication flavors */
+struct authsvc {
+	int	flavor;
+	enum	auth_stat (*handler)();
+	struct	authsvc	  *next;
 };
-#define	AUTH_MAX	2		/* HIGHEST AUTH NUMBER */
-
+static struct authsvc *Auths = NULL;
 
 /*
  * The call rpc message, msg has been obtained from the wire.  The msg contains
@@ -95,23 +108,104 @@ _authenticate(rqst, msg)
 	struct rpc_msg *msg;
 {
 	register int cred_flavor;
+	register struct authsvc *asp;
 
 	rqst->rq_cred = msg->rm_call.cb_cred;
 	rqst->rq_xprt->xp_verf.oa_flavor = _null_auth.oa_flavor;
 	rqst->rq_xprt->xp_verf.oa_length = 0;
 	cred_flavor = rqst->rq_cred.oa_flavor;
-	if ((cred_flavor <= AUTH_MAX) && (cred_flavor >= AUTH_NULL)) {
-		return ((*(svcauthsw[cred_flavor].authenticator))(rqst, msg));
+	switch (cred_flavor) {
+	case AUTH_NULL:
+		return(_svcauth_null(rqst, msg));
+	case AUTH_UNIX:
+		return(_svcauth_unix(rqst, msg));
+	case AUTH_SHORT:
+		return(_svcauth_short(rqst, msg));
+	/*
+	 * We leave AUTH_DES turned off by default because svcauth_des()
+	 * needs getpublickey(), which is in librpcsvc, not libc. If we
+ 	 * included AUTH_DES as a built-in flavor, programs that don't
+	 * have -lrpcsvc in their Makefiles wouldn't link correctly, even
+	 * though they don't use AUTH_DES. And I'm too lazy to go through
+	 * the tree looking for all of them.
+	 */
+#ifdef DES_BUILTIN
+	case AUTH_DES:
+		return(_svcauth_des(rqst, msg));
+#endif
+	}
+
+	/* flavor doesn't match any of the builtin types, so try new ones */
+	for (asp = Auths; asp; asp = asp->next) {
+		if (asp->flavor == cred_flavor) {
+			enum auth_stat as;
+
+			as = (*asp->handler)(rqst, msg);
+			return (as);
+		}
 	}
 
 	return (AUTH_REJECTEDCRED);
 }
 
+/*ARGSUSED*/
 enum auth_stat
-_svcauth_null(/*rqst, msg*/)
-	/*struct svc_req *rqst;
-	struct rpc_msg *msg;*/
+_svcauth_null(rqst, msg)
+	struct svc_req *rqst;
+	struct rpc_msg *msg;
 {
-
 	return (AUTH_OK);
 }
+
+/*
+ *  Allow the rpc service to register new authentication types that it is
+ *  prepared to handle.  When an authentication flavor is registered,
+ *  the flavor is checked against already registered values.  If not
+ *  registered, then a new Auths entry is added on the list.
+ *
+ *  There is no provision to delete a registration once registered.
+ *
+ *  This routine returns:
+ *	 0 if registration successful
+ *	 1 if flavor already registered
+ *	-1 if can't register (errno set)
+ */
+
+int
+svc_auth_reg(cred_flavor, handler)
+	register int cred_flavor;
+	enum auth_stat (*handler)();
+{
+	register struct authsvc *asp;
+
+	switch (cred_flavor) {
+	    case AUTH_NULL:
+	    case AUTH_UNIX:
+	    case AUTH_SHORT:
+#ifdef DES_BUILTIN
+	    case AUTH_DES:
+#endif
+		/* already registered */
+		return (1);
+
+	    default:
+		for (asp = Auths; asp; asp = asp->next) {
+			if (asp->flavor == cred_flavor) {
+				/* already registered */
+				return (1);
+			}
+		}
+
+		/* this is a new one, so go ahead and register it */
+		asp = (struct authsvc *)mem_alloc(sizeof (*asp));
+		if (asp == NULL) {
+			return (-1);
+		}
+		asp->flavor = cred_flavor;
+		asp->handler = handler;
+		asp->next = Auths;
+		Auths = asp;
+		break;
+	}
+	return (0);
+}