[src/trunk]: src/usr.sbin/ypbind The FILE* kept open for /var/yp/binding/foo....

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/302f2da1f517
branches:  trunk
changeset: 765313:302f2da1f517
user:      dholland <dholland%NetBSD.org@localhost>
date:      Tue May 24 07:01:40 2011 +0000

description:
The FILE* kept open for /var/yp/binding/foo.ypservers needs to be
per-domain. Also, use the file for the domain we're servicing instead
of always the file for the default domain.

Partly from Wolfgang Stukenbrock's patch in PR 43900.

diffstat:

 usr.sbin/ypbind/ypbind.c |  54 ++++++++++++++++++++++++++---------------------
 1 files changed, 30 insertions(+), 24 deletions(-)

diffs (125 lines):

diff -r b2d9bb914b12 -r 302f2da1f517 usr.sbin/ypbind/ypbind.c
--- a/usr.sbin/ypbind/ypbind.c  Tue May 24 07:01:24 2011 +0000
+++ b/usr.sbin/ypbind/ypbind.c  Tue May 24 07:01:40 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ypbind.c,v 1.83 2011/05/24 07:01:24 dholland Exp $     */
+/*     $NetBSD: ypbind.c,v 1.84 2011/05/24 07:01:40 dholland Exp $     */
 
 /*
  * Copyright (c) 1992, 1993 Theo de Raadt <deraadt%fsa.ca@localhost>
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifndef LINT
-__RCSID("$NetBSD: ypbind.c,v 1.83 2011/05/24 07:01:24 dholland Exp $");
+__RCSID("$NetBSD: ypbind.c,v 1.84 2011/05/24 07:01:40 dholland Exp $");
 #endif
 
 #include <sys/types.h>
@@ -97,8 +97,9 @@
        int dom_lockfd;
        int dom_alive;
        uint32_t dom_xid;
+       FILE *dom_serversfile;          /* /var/yp/binding/foo.ypservers */
+       int dom_been_ypset;             /* ypset been done on this domain? */
        ypbind_mode_t dom_ypbindmode;   /* broadcast or direct */
-       int dom_been_ypset;             /* ypset been done on this domain? */
 };
 
 #define BUFSIZE                1400
@@ -235,6 +236,8 @@
        dom->dom_lockfd = -1;
        dom->dom_alive = 0;
        dom->dom_xid = unique_xid(dom);
+       dom->dom_been_ypset = 0;
+       dom->dom_serversfile = NULL;
 
        /*
         * Per traditional ypbind(8) semantics, if a ypservers
@@ -721,15 +724,8 @@
 }
 
 static int
-direct(char *buf, int outlen)
+direct(char *buf, int outlen, struct domain *dom)
 {
-       /*
-        * XXX I don't see how this can work if we're binding multiple domains.
-        * Also, what if someone's editor unlinks and replaces the file?
-        */
-       static FILE *df;
-       static char ypservers_path[MAXPATHLEN];
-
        const char *path;
        char line[_POSIX2_LINE_MAX];
        char *p;
@@ -737,16 +733,26 @@
        struct sockaddr_in bindsin;
        int i, count = 0;
 
-       if (df)
-               rewind(df);
-       else {
-               path = ypservers_filename(domainname);
-               strcpy(ypservers_path, path);
-               df = fopen(ypservers_path, "r");
-               if (df == NULL) {
-                       yp_log(LOG_ERR, "%s: %s", ypservers_path,
+       /*
+        * XXX what happens if someone's editor unlinks and replaces
+        * the servers file?
+        */
+
+       if (dom->dom_serversfile != NULL) {
+               rewind(dom->dom_serversfile);
+       } else {
+               path = ypservers_filename(dom->dom_name);
+               dom->dom_serversfile = fopen(path, "r");
+               if (dom->dom_serversfile == NULL) {
+                       /*
+                        * XXX there should be a time restriction on
+                        * this (and/or on trying the open) so we
+                        * don't flood the log. Or should we fall back
+                        * to broadcast mode?
+                        */
+                       yp_log(LOG_ERR, "%s: %s", path,
                               strerror(errno));
-                       exit(1);
+                       return -1;
                }
        }
 
@@ -755,13 +761,13 @@
        bindsin.sin_len = sizeof(bindsin);
        bindsin.sin_port = htons(PMAPPORT);
 
-       while(fgets(line, (int)sizeof(line), df) != NULL) {
+       while (fgets(line, (int)sizeof(line), dom->dom_serversfile) != NULL) {
                /* skip lines that are too big */
                p = strchr(line, '\n');
                if (p == NULL) {
                        int c;
 
-                       while ((c = getc(df)) != '\n' && c != EOF)
+                       while ((c = getc(dom->dom_serversfile)) != '\n' && c != EOF)
                                ;
                        continue;
                }
@@ -792,7 +798,7 @@
        }
        if (!count) {
                yp_log(LOG_WARNING, "No contactable servers found in %s",
-                   ypservers_path);
+                   ypservers_filename(dom->dom_name));
                return -1;
        }
        return 0;
@@ -1049,7 +1055,7 @@
                return broadcast(buf, outlen);
 
        case YPBIND_DIRECT:
-               return direct(buf, outlen);
+               return direct(buf, outlen, dom);
        }
        /*NOTREACHED*/
        return -1;