X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fidmapd%2Fidmapd.c;h=80819d4d53e34037d06f705bf34cdc0f317adee7;hb=a1b7c0da9e73a607f4bc70ffe3b44b00f5d39938;hp=02604df16d1a6e4bd47d45ff47e45e30dd43774a;hpb=5206cbfa8934cb7331a840f3446d35cdbb795e34;p=nfs-utils.git

diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
index 02604df..80819d4 100644
--- a/utils/idmapd/idmapd.c
+++ b/utils/idmapd/idmapd.c
@@ -141,6 +141,34 @@ static struct idmap_client nfsd_ic[2];
 /* Used by cfg.c */
 char *conf_path;
 
+static int
+flush_nfsd_cache(char *path, time_t now)
+{
+	int fd;
+	char stime[20];
+
+	sprintf(stime, "%ld\n", now);
+	fd = open(path, O_RDWR);
+	if (fd == -1)
+		return -1;
+	write(fd, stime, strlen(stime));
+	close(fd);
+	return 0;
+}
+
+static int
+flush_nfsd_idmap_cache(void)
+{
+	time_t now = time(NULL);
+	int ret;
+
+	ret = flush_nfsd_cache("/proc/net/rpc/nfs4.idtoname/flush", now);
+	if (ret)
+		return ret;
+	ret = flush_nfsd_cache("/proc/net/rpc/nfs4.nametoid/flush", now);
+	return ret;
+}
+
 int
 main(int argc, char **argv)
 {
@@ -153,6 +181,7 @@ main(int argc, char **argv)
 	struct stat sb;
 	char *xpipefsdir = NULL;
 	int serverstart = 1, clientstart = 1;
+	int ret;
 
 	conf_path = _PATH_IDMAPDCONF;
 	nobodyuser = NFS4NOBODY_USER;
@@ -230,8 +259,14 @@ main(int argc, char **argv)
 
 	event_init();
 
-	if (serverstart)
+	if (serverstart) {
 		nfsdret = nfsdopen(NFSD_DIR);
+		if (nfsdret == 0) {
+			ret = flush_nfsd_idmap_cache();
+			if (ret)
+				errx(1, "Failed to flush nfsd idmap cache\n");
+		}
+	}
 
 	if (clientstart) {
 		struct timeval now = {
@@ -565,10 +600,8 @@ nfsdreopen_one(struct idmap_client *ic)
 		if (ic->ic_fd != -1)
 			close(ic->ic_fd);
 		ic->ic_event.ev_fd = ic->ic_fd = fd;
-		if ((ic->ic_event.ev_flags & EVLIST_INIT) == 0) {
-			event_set(&ic->ic_event, ic->ic_fd, EV_READ, nfsdcb, ic);
-			event_add(&ic->ic_event, NULL);
-		}
+		event_set(&ic->ic_event, ic->ic_fd, EV_READ, nfsdcb, ic);
+		event_add(&ic->ic_event, NULL);
 	} else {
 		warnx("nfsdreopen: Opening '%s' failed: errno %d (%s)",
 			ic->ic_path, errno, strerror(errno));
@@ -681,9 +714,7 @@ idtonameres(struct idmap_msg *im)
 					sizeof(im->im_name));
 		break;
 	}
-	/* XXX Hack? would rather return failure instead of writing nobody
-	 * as above, but kernel seems not to deal well with that as of
-	 * 2.6.8-rc3. */
+	/* XXX Hack? */
 	im->im_status = IDMAP_STATUS_SUCCESS;
 }
 
@@ -692,6 +723,14 @@ nametoidres(struct idmap_msg *im)
 {
 	int ret = 0;
 
+	/* XXX: nobody fallbacks shouldn't always happen:
+	 *	server id -> name should be OK
+	 *	client name -> id should be OK
+	 * but not otherwise */
+	/* XXX: move nobody stuff to library calls
+	 * (nfs4_get_nobody_user(domain), nfs4_get_nobody_group(domain)) */
+	/* XXX: should make this call higher up in the call chain (so we'd
+	 * have a chance on looking up server/whatever. */
 	switch (im->im_type) {
 	case IDMAP_TYPE_USER:
 		ret = nfs4_name_to_uid(im->im_name, &im->im_id);
@@ -704,9 +743,7 @@ nametoidres(struct idmap_msg *im)
 			im->im_id = nobodygid;
 		break;
 	}
-	/* XXX Hack? would rather return failure instead of writing nobody
-	 * as above, but kernel seems not to deal well with that as of
-	 * 2.6.8-rc3. */
+	/* XXX? */
 	im->im_status = IDMAP_STATUS_SUCCESS;
 }