BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / amd / amd / info_nis.c

diff --git a/usr/src/usr.sbin/amd/amd/info_nis.c b/usr/src/usr.sbin/amd/amd/info_nis.c
index 45ce0a2..af13665 100644 (file)
--- a/usr/src/usr.sbin/amd/amd/info_nis.c
+++ b/usr/src/usr.sbin/amd/amd/info_nis.c
@@ -1,6 +1,4 @@
 /*
 /*

- * $Id: info_nis.c,v 5.2 90/06/23 22:19:32 jsp Rel $
- *

  * Copyright (c) 1989 Jan-Simon Pendry
  * Copyright (c) 1989 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1989 The Regents of the University of California.
  * Copyright (c) 1989 Jan-Simon Pendry
  * Copyright (c) 1989 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1989 The Regents of the University of California.


@@ -9,21 +7,38 @@
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *     @(#)info_nis.c  5.3 (Berkeley) 5/12/91
+ *
+ * $Id: info_nis.c,v 5.2.1.4 91/05/07 22:18:01 jsp Alpha $

  *
  *

- *     @(#)info_nis.c  5.1 (Berkeley) 6/29/90

  */
 
 /*
  */
 
 /*


@@ -41,25 +56,108 @@
  */
 static int determine_nis_domain(P_void)
 {
  */
 static int determine_nis_domain(P_void)
 {

-static  char default_domain[YPMAXDOMAIN];
+       char default_domain[YPMAXDOMAIN];

 
        if (getdomainname(default_domain, sizeof(default_domain)) < 0) {
                plog(XLOG_ERROR, "getdomainname: %m");
                return EIO;
        }
 
 
        if (getdomainname(default_domain, sizeof(default_domain)) < 0) {
                plog(XLOG_ERROR, "getdomainname: %m");
                return EIO;
        }
 

-       domain = default_domain;
-       if (!*domain) {
-               plog(XLOG_ERROR, "YP domain name is not set");
+       if (!*default_domain) {
+               plog(XLOG_ERROR, "NIS domain name is not set");

                return ENOENT;
        }
                return ENOENT;
        }

+       domain = strdup(default_domain);

 
        return 0;
 }
 
 
        return 0;
 }
 

+
+#ifdef HAS_NIS_RELOAD
+struct nis_callback_data {
+       mnt_map *ncd_m;
+       char *ncd_map;
+       void (*ncd_fn)();
+};
+
+/*
+ * Callback from yp_all
+ */
+static int callback(status, key, kl, val, vl, data)
+int status;
+char *key;
+int kl;
+char *val;
+int vl;
+struct nis_callback_data *data;
+{
+       if (status == YP_TRUE) {
+               /*
+                * Add to list of maps
+                */
+               char *kp = strnsave(key, kl);
+               char *vp = strnsave(val, vl);
+               (*data->ncd_fn)(data->ncd_m, kp, vp);
+
+               /*
+                * We want more ...
+                */
+               return FALSE;
+       } else {
+               /*
+                * NOMORE means end of map - otherwise log error
+                */
+               if (status != YP_NOMORE) {
+                       /*
+                        * Check what went wrong
+                        */
+                       int e = ypprot_err(status);
+
+#ifdef DEBUG
+                       plog(XLOG_ERROR, "yp enumeration of %s: %s, status=%d, e=%d",
+                                       data->ncd_map, yperr_string(e), status, e);
+#else
+                       plog(XLOG_ERROR, "yp enumeration of %s: %s", data->ncd_map, yperr_string(e));
+#endif
+               }
+
+               return TRUE;
+       }
+}
+
+int nis_reload P((mnt_map *m, char *map, void (*fn)()));
+int nis_reload(m, map, fn)
+mnt_map *m;
+char *map;
+void (*fn)();
+{
+       struct ypall_callback cbinfo;
+       int error;
+       struct nis_callback_data data;
+
+       if (!domain) {
+               error = determine_nis_domain();
+               if (error)
+                       return error;
+       }
+
+       data.ncd_m = m;
+       data.ncd_map = map;
+       data.ncd_fn = fn;
+       cbinfo.data = (voidp) &data;
+       cbinfo.foreach = callback;
+
+       error = yp_all(domain, map, &cbinfo);
+
+       if (error)
+               plog(XLOG_ERROR, "error grabbing nis map of %s: %s", map, yperr_string(ypprot_err(error)));
+
+       return error;
+}
+#endif /* HAS_NIS_RELOAD */
+

 /*
  * Try to locate a key using NIS.
 /*
  * Try to locate a key using NIS.

- * Modify time is ignored in NIS - XXX

  */
 int nis_search P((mnt_map *m, char *map, char *key, char **val, time_t *tp));
 int nis_search(m, map, key, val, tp)
  */
 int nis_search P((mnt_map *m, char *map, char *key, char **val, time_t *tp));
 int nis_search(m, map, key, val, tp)


@@ -71,13 +169,30 @@ time_t *tp;
 {
        int outlen;
        int res;
 {
        int outlen;
        int res;

+       int order;

 
 

+       /*
+        * Make sure domain initialised
+        */

        if (!domain) {
                int error = determine_nis_domain();
                if (error)
                        return error;
        }
 
        if (!domain) {
                int error = determine_nis_domain();
                if (error)
                        return error;
        }
 

+       /*
+        * Check if map has changed
+        */
+       if (yp_order(domain, map, &order))
+               return EIO;
+       if ((time_t) order > *tp) {
+               *tp = (time_t) order;
+               return -1;
+       }
+
+       /*
+        * Lookup key
+        */

        res = yp_match(domain, map, key, strlen(key), val, &outlen);
 
        /*
        res = yp_match(domain, map, key, strlen(key), val, &outlen);
 
        /*


@@ -96,11 +211,12 @@ time_t *tp;
        }
 }
 
        }
 }
 

-int nis_init P((char *map));
-int nis_init(map)
+int nis_init P((char *map, time_t *tp));
+int nis_init(map, tp)

 char *map;
 char *map;

+time_t *tp;

 {
 {

-       char *name = 0;
+       int order;

 
        if (!domain) {
                int error = determine_nis_domain();
 
        if (!domain) {
                int error = determine_nis_domain();


@@ -112,9 +228,12 @@ char *map;
         * To see if the map exists, try to find
         * a master for it.
         */
         * To see if the map exists, try to find
         * a master for it.
         */

-       if (yp_master(domain, map, &name))
+       if (yp_order(domain, map, &order))

                return ENOENT;
                return ENOENT;

-       free(name);
+       *tp = (time_t) order;
+#ifdef DEBUG
+       dlog("NIS master for %s@%s has order %d", map, domain, order);
+#endif

        return 0;
 }
 #endif /* HAS_NIS_MAPS */
        return 0;
 }
 #endif /* HAS_NIS_MAPS */