Big round o changes:

- yp_dblookup.c: Create non-DB specific database access functions.
  Using these allows access to the underlying database functions without
  needing explicit knowledge of Berkeley DB. (These are used only
  when DB_CACHE is #defined. Other programs that use the non-caching
  functions (yp_mkdb, ypxfr, yppush, rpc.yppasswdd) shouldn't notice
  the difference.)

- yp_dnslookup: Implement async DNS lookups. We send our own DNS
  requests using UDP and put the request in a queue. When the response
  arrives, we use the ID in the header to find the corresponsing queue
  entry and then send the response to the client. We can go about our
  business and handle other YP requests in the meantime. This way, we
  can deal with time consuming DNS requests without blocking and without
  forking.

- yp_server.c: Convert to using new non-DB-specific database access
  functions. This simplifies the code a bit and removes the need for
  this module to know anything about Berkeley DB. Also convert the
  ypproc_match_2_svc() function to use the async DNS lookup routines.

- yp_main.c: tweak yp_svc_run() to add the resolver socket to the
  set of descriptors monitored in the select() loop. Also add a
  timeout to select(); we may get stale DNS requests stuck in the
  queue which we want to invalidate after a while. If the timeout
  hits, we decrement the ttl on all pending DNS requests and nuke
  those requests that aren't handled before ttl hits zero.

- yp_extern.h: Add prototypes for new stuff.

- yp_svc_udp.c (new file): The async resolver code needs to be able
  to rummage around inside the RPC UDP transport handle in order to
  work correcty. There's basically one transport handle, and each time
  a request comes in, the transaction ID in the handle is changed.
  This means that if we queue a DNS request, then we handle some other
  unrelated requests, we will be unable to send the DNS response because
  the transaction ID and remote address of the client that made the DNS
  request will have been lost. What we need to do is save the client
  address and transaction ID in the queue entry for the DNS request,
  then put the transaction ID and address back in the transport handle
  when we're ready to reply. (And then we have to undo the change so
  as not to confuse any other part of the server.) The trouble is that
  the transaction ID is hidden in an opaque part of the transport handle,
  and only the code in the svc_udp module in the RPC library knows how
  to handle it. This file contains a couple of functions that let us
  read and set the transaction ID in spite of this. This is really a
  dirty trick and I should be taken out and shot for even thinking about
  it, but there's no other way to get this stuff to work.

- Makefile: add yp_svc_udp.c to SRCS.

1 files changed, 99 insertions, 10 deletions

diff --git a/usr.sbin/ypserv/yp_dblookup.c b/usr.sbin/ypserv/yp_dblookup.c
index a55acb8..2edb673 100644
--- a/usr.sbin/ypserv/yp_dblookup.c
+++ b/usr.sbin/ypserv/yp_dblookup.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: yp_dblookup.c,v 1.4 1996/07/07 19:04:33 wpaul Exp wpaul $
+ *	$Id: yp_dblookup.c,v 1.2 1996/12/22 15:54:15 wpaul Exp $
  *
  */
 #include <stdio.h>
@@ -47,11 +47,11 @@
 #include "yp_extern.h"
 
 #ifndef lint
-static const char rcsid[] = "$Id: yp_dblookup.c,v 1.4 1996/07/07 19:04:33 wpaul Exp wpaul $";
+static const char rcsid[] = "$Id: yp_dblookup.c,v 1.2 1996/12/22 15:54:15 wpaul Exp $";
 #endif
 
 int ypdb_debug = 0;
-int yp_errno = YP_TRUE;
+enum ypstat yp_errno = YP_TRUE;
 
 #define PERM_SECURE (S_IRUSR|S_IWUSR)
 HASHINFO openinfo = {
@@ -459,22 +459,29 @@ again:
  *                   the supplied key value in the database.
  */
 
+#ifdef DB_CACHE
+int yp_get_record(dbp,key,data,allow)
+	DB *dbp;
+#else
 int yp_get_record(domain,map,key,data,allow)
 	const char *domain;
 	const char *map;
+#endif
 	const DBT *key;
 	DBT *data;
 	int allow;
 {
+#ifndef DB_CACHE
 	DB *dbp;
+#endif
 	int rval = 0;
 #ifndef DB_CACHE
 	static unsigned char buf[YPMAXRECORD];
 #endif
 
 	if (ypdb_debug)
-		yp_error("Looking up key [%.*s] in map [%s]",
-			  key->size, key->data, map);
+		yp_error("Looking up key [%.*s]",
+			  key->size, key->data);
 
 	/*
 	 * Avoid passing back magic "YP_*" entries unless
@@ -484,13 +491,11 @@ int yp_get_record(domain,map,key,data,allow)
 	if (!allow && !strncmp(key->data, "YP_", 3))
 		return(YP_NOKEY);
 
-#ifdef DB_CACHE
-	if ((dbp = yp_open_db_cache(domain, map, NULL, 0)) == NULL) {
-#else
+#ifndef DB_CACHE
 	if ((dbp = yp_open_db(domain, map)) == NULL) {
-#endif
 		return(yp_errno);
 	}
+#endif
 
 	if ((rval = (dbp->get)(dbp, key, data, 0)) != 0) {
 #ifdef DB_CACHE
@@ -591,7 +596,7 @@ int yp_next_record(dbp,key,data,all,allow)
 	static unsigned char datbuf[YPMAXRECORD];
 #endif
 
-	if (key == NULL || key->data == NULL) {
+	if (key == NULL || !key->size || key->data == NULL) {
 		rval = yp_first_record(dbp,key,data,allow);
 		if (rval == YP_NOKEY)
 			return(YP_NOMORE);
@@ -657,3 +662,87 @@ int yp_next_record(dbp,key,data,all,allow)
 
 	return(YP_TRUE);
 }
+
+#ifdef DB_CACHE
+/*
+ * Database glue functions.
+ */
+
+static DB *yp_currmap_db = NULL;
+static int yp_allow_db = 0;
+
+ypstat yp_select_map(map, domain, key, allow)
+	char *map;
+	char *domain;
+	keydat *key;
+	int allow;
+{
+	yp_currmap_db = yp_open_db_cache(domain, map, key->keydat_val,
+							key->keydat_len);
+
+	yp_allow_db = allow;
+	return(yp_errno);
+}
+
+ypstat yp_getbykey(key, val)
+	keydat *key;
+	valdat *val;
+{
+	DBT db_key = { NULL, 0 }, db_val = { NULL, 0 };
+	ypstat rval;
+
+	db_key.data = key->keydat_val;
+	db_key.size = key->keydat_len;
+
+	rval = yp_get_record(yp_currmap_db,
+				&db_key, &db_val, yp_allow_db);
+
+	if (rval == YP_TRUE) {
+		val->valdat_val = db_val.data;
+		val->valdat_len = db_val.size;
+	}
+
+	return(rval);
+}
+
+ypstat yp_firstbykey(key, val)
+	keydat *key;
+	valdat *val;
+{
+	DBT db_key = { NULL, 0 }, db_val = { NULL, 0 };
+	ypstat rval;
+
+	rval = yp_first_record(yp_currmap_db, &db_key, &db_val, yp_allow_db);
+
+	if (rval == YP_TRUE) {
+		key->keydat_val = db_key.data;
+		key->keydat_len = db_key.size;
+		val->valdat_val = db_val.data;
+		val->valdat_len = db_val.size;
+	}
+
+	return(rval);
+}
+
+ypstat yp_nextbykey(key, val)
+	keydat *key;
+	valdat *val;
+{
+	DBT db_key = { NULL, 0 }, db_val = { NULL, 0 };
+	ypstat rval;
+
+	db_key.data = key->keydat_val;
+	db_key.size = key->keydat_len;
+
+	rval = yp_next_record(yp_currmap_db, &db_key, &db_val, 0, yp_allow_db);
+
+	if (rval == YP_TRUE) {
+		key->keydat_val = db_key.data;
+		key->keydat_len = db_key.size;
+		val->valdat_val = db_val.data;
+		val->valdat_len = db_val.size;
+	}
+
+	return(rval);
+}
+#endif