Replace the getpublickey() stub with the real thing.

1 files changed, 160 insertions, 33 deletions

diff --git a/lib/libc/rpc/getpublickey.c b/lib/libc/rpc/getpublickey.c
index 4f0aa7c..e1c34d9 100644
--- a/lib/libc/rpc/getpublickey.c
+++ b/lib/libc/rpc/getpublickey.c
@@ -1,45 +1,172 @@
-/*-
- * Copyright (c) 1997 John D. Polstra
- * All rights reserved.
+/*
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+ * unrestricted use provided that this legend is included on all tape
+ * media and as a part of the software program in whole or part.  Users
+ * 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 or with the express written consent of
+ * Sun Microsystems, Inc.
+ *
+ * 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.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * 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.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * 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.
  *
- * $Id$
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Avenue
+ * Mountain View, California  94043
+ */
+#if !defined(lint) && defined(SCCSIDS)
+static char sccsid[] = "@(#)publickey.c 1.10 91/03/11 Copyr 1986 Sun Micro";
+#endif
+
+/*
+ * publickey.c
+ * Copyright (C) 1986, Sun Microsystems, Inc.
+ */
+
+/*
+ * Public key lookup routines
+ */
+#include <stdio.h>
+#include <pwd.h>
+#include <rpc/rpc.h>
+#include <rpc/key_prot.h>
+#include <rpcsvc/yp_prot.h>
+#include <rpcsvc/ypclnt.h>
+#include <string.h>
+#include <stdlib.h>
+
+#define PKFILE "/etc/publickey"
+
+/*
+ * Hack to let ypserv/rpc.nisd use AUTH_DES.
  */
+int (*__getpublickey_LOCAL)() = 0;
 
 /*
- * Stub version of getpublickey(), which is referenced in auth_des.c
- * and svc_auth_des.c.  This stub always fails.  It is necessary to
- * avoid any references to undefined symbols from libc.
+ * Get somebody's public key
  */
+int
+__getpublickey_real(netname, publickey)
+	char *netname;
+	char *publickey;
+{
+	char lookup[3 * HEXKEYBYTES];
+	char *p;
 
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
+	if (publickey == NULL)
+		return (0);
+	if (!getpublicandprivatekey(netname, lookup))
+		return (0);
+	p = strchr(lookup, ':');
+	if (p == NULL) {
+		return (0);
+	}
+	*p = '\0';
+	(void) strncpy(publickey, lookup, HEXKEYBYTES);
+	publickey[HEXKEYBYTES] = '\0';
+	return (1);
+}
+
+/*
+ * reads the file /etc/publickey looking for a + to optionally go to the
+ * yellow pages
+ */
 
 int
-getpublickey(servername, pkey_data)
-	char	*servername;
-	char	*pkey_data;
+getpublicandprivatekey(key, ret)
+	char *key;
+	char *ret;
+{
+	char buf[1024];	/* big enough */
+	char *res;
+	FILE *fd;
+	char *mkey;
+	char *mval;
+
+	fd = fopen(PKFILE, "r");
+	if (fd == (FILE *) 0)
+		return (0);
+	for (;;) {
+		res = fgets(buf, 1024, fd);
+		if (res == 0) {
+			fclose(fd);
+			return (0);
+		}
+		if (res[0] == '#')
+			continue;
+		else if (res[0] == '+') {
+#ifdef YP
+			char *PKMAP = "publickey.byname";
+			char *lookup;
+			char *domain;
+			int err;
+			int len;
+
+			err = yp_get_default_domain(&domain);
+			if (err) {
+				continue;
+			}
+			lookup = NULL;
+			err = yp_match(domain, PKMAP, key, strlen(key), &lookup, &len);
+			if (err) {
+#ifdef DEBUG
+				fprintf(stderr, "match failed error %d\n", err);
+#endif
+				continue;
+			}
+			lookup[len] = 0;
+			strcpy(ret, lookup);
+			fclose(fd);
+			free(lookup);
+			return (2);
+#else /* YP */
+#ifdef DEBUG
+			fprintf(stderr,
+"Bad record in %s '+' -- NIS not supported in this library copy\n", PKFILE);
+#endif /* DEBUG */
+			continue;
+#endif /* YP */
+		} else {
+			mkey = strtok(buf, "\t ");
+			if (mkey == NULL) {
+				fprintf(stderr,
+				"Bad record in %s -- %s", PKFILE, buf);
+				continue;
+			}
+			mval = strtok((char *)NULL, " \t#\n");
+			if (mval == NULL) {
+				fprintf(stderr,
+			"Bad record in %s val problem - %s", PKFILE, buf);
+				continue;
+			}
+			if (strcmp(mkey, key) == 0) {
+				strcpy(ret, mval);
+				fclose(fd);
+				return (1);
+			}
+		}
+	}
+}
+
+int getpublickey(netname, publickey)
+	char *netname;
+	char *publickey;
 {
-	return 0;
+	if (__getpublickey_LOCAL != NULL)
+		return(__getpublickey_LOCAL(netname, publickey));
+	else
+		return(__getpublickey_real(netname, publickey));
 }