#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
-#include "xmalloc.h"
+
#include "misc.h"
#include "exportfs.h"
#include "xio.h"
}
void
-mountlist_del_all(struct sockaddr_in *sin)
+mountlist_del_all(const struct sockaddr *sap)
{
- struct in_addr addr = sin->sin_addr;
- struct hostent *hp;
+ char *hostname;
struct rmtabent *rep;
- nfs_export *exp;
FILE *fp;
int lockid;
if ((lockid = xflock(_PATH_RMTABLCK, "w")) < 0)
return;
- if (!(hp = gethostbyaddr((char *)&addr, sizeof(addr), AF_INET))) {
- xlog(L_ERROR, "can't get hostname of %s", inet_ntoa(addr));
+ hostname = host_canonname(sap);
+ if (hostname == NULL) {
+ char buf[INET6_ADDRSTRLEN];
+ xlog(L_ERROR, "can't get hostname of %s",
+ host_ntop(sap, buf, sizeof(buf)));
goto out_unlock;
}
- hp = hostent_dup (hp);
if (!setrmtabent("r"))
goto out_free;
goto out_close;
while ((rep = getrmtabent(1, NULL)) != NULL) {
- if (strcmp(rep->r_client, hp->h_name) == 0 &&
- (exp = auth_authenticate("umountall", sin, rep->r_path)))
+ if (strcmp(rep->r_client, hostname) == 0 &&
+ auth_authenticate("umountall", sap, rep->r_path) != NULL)
continue;
fputrmtabent(fp, rep, NULL);
}
out_close:
endrmtabent(); /* close & unlink */
out_free:
- free (hp);
+ free(hostname);
out_unlock:
xfunlock(lockid);
}
+static void
+mountlist_freeall(mountlist list)
+{
+ while (list != NULL) {
+ mountlist m = list;
+ list = m->ml_next;
+ free(m->ml_hostname);
+ free(m->ml_directory);
+ free(m);
+ }
+}
+
mountlist
mountlist_list(void)
{
struct rmtabent *rep;
struct stat stb;
int lockid;
- struct in_addr addr;
- struct hostent *he;
if ((lockid = xflock(_PATH_RMTABLCK, "r")) < 0)
return NULL;
return NULL;
}
if (stb.st_mtime != last_mtime) {
- while (mlist) {
- mlist = (m = mlist)->ml_next;
- xfree(m->ml_hostname);
- xfree(m->ml_directory);
- xfree(m);
- }
+ mountlist_freeall(mlist);
+ mlist = NULL;
last_mtime = stb.st_mtime;
setrmtabent("r");
while ((rep = getrmtabent(1, NULL)) != NULL) {
- m = (mountlist) xmalloc(sizeof(*m));
-
- if (reverse_resolve &&
- inet_aton((const char *) rep->r_client, &addr) &&
- (he = gethostbyaddr(&addr, sizeof(addr), AF_INET)))
- m->ml_hostname = xstrdup(he->h_name);
- else
- m->ml_hostname = xstrdup(rep->r_client);
+ m = calloc(1, sizeof(*m));
+ if (m == NULL) {
+ mountlist_freeall(mlist);
+ mlist = NULL;
+ xlog(L_ERROR, "%s: memory allocation failed",
+ __func__);
+ break;
+ }
+
+ if (reverse_resolve) {
+ struct addrinfo *ai;
+ ai = host_pton(rep->r_client);
+ if (ai != NULL) {
+ m->ml_hostname = host_canonname(ai->ai_addr);
+ freeaddrinfo(ai);
+ }
+ }
+ if (m->ml_hostname == NULL)
+ m->ml_hostname = strdup(rep->r_client);
+
+ m->ml_directory = strdup(rep->r_path);
+
+ if (m->ml_hostname == NULL || m->ml_directory == NULL) {
+ mountlist_freeall(mlist);
+ mlist = NULL;
+ xlog(L_ERROR, "%s: memory allocation failed",
+ __func__);
+ break;
+ }
- m->ml_directory = xstrdup(rep->r_path);
m->ml_next = mlist;
mlist = m;
}