Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix usage with NIS+ servers in NIS compat mode, which was lost in the 

last amd update.  From Matthieu Herrb <matthieu@laas.fr>, PR #4023.
This commit is contained in:
thorpej 1997-08-26 19:47:19 +00:00
parent 631dee9e59
commit aeeac5d7fd
1 changed files with 55 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
usr.sbin/amd/amd/info_nis.c
View File

@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
* $Id: info_nis.c,v 1.6 1997/07/24 23:16:36 christos Exp $
* $Id: info_nis.c,v 1.7 1997/08/26 19:47:19 thorpej Exp $
*
*/
@ -51,6 +51,12 @@
#endif /* HAVE_CONFIG_H */
#include <am_defs.h>
#include <amd.h>
#include <time.h>
/*
* NIS+ servers in NIS compat mode don't have yp_order()
*/
static int has_yp_order = FALSE;
struct nis_callback_data {
mnt_map *ncd_m;
@ -187,16 +193,28 @@ nis_search(mnt_map *m, char *map, char *key, char **val, time_t *tp)
return error;
}
/*
* Check if map has changed
*/
if (yp_order(gopt.nis_domain, map, &order))
return EIO;
if ((time_t) order > *tp) {
*tp = (time_t) order;
return -1;
}
if (has_yp_order) {
/*
* Check if map has changed
*/
if (yp_order(gopt.nis_domain, map, &order))
return EIO;
if ((time_t) order > *tp) {
*tp = (time_t) order;
return -1;
}
} else {
/*
* NIS+ server without yp_order
* Check if timeout has expired to invalidate the cache
*/
order = time(NULL);
if ((time_t)order - *tp > gopt.am_timeo) {
*tp = (time_t)order;
return(-1);
}
}
/*
* Lookup key
*/
@ -223,6 +241,8 @@ int
nis_init(mnt_map *m, char *map, time_t *tp)
{
YP_ORDER_OUTORDER_TYPE order;
int yp_order_result;
char *master;
if (!gopt.nis_domain) {
int error = determine_nis_domain();
@ -233,12 +253,34 @@ nis_init(mnt_map *m, char *map, time_t *tp)
* To see if the map exists, try to find
* a master for it.
*/
if (yp_order(gopt.nis_domain, map, &order))
return ENOENT;
*tp = (time_t) order;
yp_order_result = yp_order(gopt.nis_domain, map, &order);
switch (yp_order_result) {
case 0:
has_yp_order = TRUE;
*tp = (time_t)order;
#ifdef DEBUG
dlog("NIS master for %s@%s has order %d", map, gopt.nis_domain, order);
#endif /* DEBUG */
break;
case YPERR_YPERR:
/* NIS+ server found ! */
has_yp_order = FALSE;
/* try yp_master() instead */
if (yp_master(gopt.nis_domain, map, &master)) {
return ENOENT;
} else {
#ifdef DEBUG
dlog("NIS master for %s@%s is a NIS+ server",
map, domain);
#endif
/* Use fake timestamps */
*tp = time(NULL);
}
break;
default:
return ENOENT;
}
return 0;
}