X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fmountd%2Fauth.c;h=183c9ea8c5b27b747925b832405333543eba97f0;hb=742190194badb6f08a4934c254d642cbf014c84e;hp=4e1cdbd800527e40825f534781227d0867dfd0c6;hpb=c499db6ad1a084901a971cb24946f0ab51454d99;p=nfs-utils.git diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c index 4e1cdbd..183c9ea 100644 --- a/utils/mountd/auth.c +++ b/utils/mountd/auth.c @@ -6,7 +6,9 @@ * Copyright (C) 1995, 1996 Olaf Kirch */ -#include "config.h" +#ifdef HAVE_CONFIG_H +#include +#endif #include #include @@ -44,7 +46,7 @@ auth_init(char *exports) xtab_mount_write(); } -int +time_t auth_reload() { struct stat stb; @@ -53,7 +55,7 @@ auth_reload() if (stat(_PATH_ETAB, &stb) < 0) xlog(L_FATAL, "couldn't stat %s", _PATH_ETAB); if (stb.st_mtime == last_modified) - return 0; + return last_modified; last_modified = stb.st_mtime; export_freeall(); @@ -61,7 +63,7 @@ auth_reload() // export_read(export_file); xtab_export_read(); - return 1; + return last_modified; } static nfs_export * @@ -74,21 +76,15 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller, if (new_cache) { int i; /* return static nfs_export with details filled in */ - if (my_client.m_naddr != 1 || - my_client.m_addrlist[0].s_addr != caller->sin_addr.s_addr) { - /* different client to last time, so do a lookup */ - char *n; - my_client.m_naddr = 0; - my_client.m_addrlist[0] = caller->sin_addr; - n = client_compose(caller->sin_addr); - *error = unknown_host; - if (!n) - return NULL; - strcpy(my_client.m_hostname, *n?n:"DEFAULT"); - free(n); - my_client.m_naddr = 1; - } - + char *n; + my_client.m_addrlist[0] = caller->sin_addr; + n = client_compose(caller->sin_addr); + *error = unknown_host; + if (!n) + return NULL; + strcpy(my_client.m_hostname, *n?n:"DEFAULT"); + free(n); + my_client.m_naddr = 1; my_exp.m_client = &my_client; exp = NULL;