X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fidmapd%2Fidmapd.c;h=9ecab66f2696adec7cb7e82ebb8cac95146b8b37;hp=80819d4d53e34037d06f705bf34cdc0f317adee7;hb=14e6ec262e58e962c2d7e9161ca9c56529de3170;hpb=a980156c122e975cc185a6c41ef705f166a5765f diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c index 80819d4..9ecab66 100644 --- a/utils/idmapd/idmapd.c +++ b/utils/idmapd/idmapd.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -64,7 +65,8 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#include "cfg.h" +#include "xlog.h" +#include "conffile.h" #include "queue.h" #include "nfslib.h" @@ -76,6 +78,10 @@ #define NFSD_DIR "/proc/net/rpc" #endif +#ifndef CLIENT_CACHE_TIMEOUT_FILE +#define CLIENT_CACHE_TIMEOUT_FILE "/proc/sys/fs/nfs/idmap_cache_timeout" +#endif + #ifndef NFS4NOBODY_USER #define NFS4NOBODY_USER "nobody" #endif @@ -91,19 +97,45 @@ (w) = p; \ } while (0) -#define IC_IDNAME 1 -#define IC_NAMEID 2 +#define IC_IDNAME 0 +#define IC_IDNAME_CHAN NFSD_DIR "/nfs4.idtoname/channel" +#define IC_IDNAME_FLUSH NFSD_DIR "/nfs4.idtoname/flush" + +#define IC_NAMEID 1 +#define IC_NAMEID_CHAN NFSD_DIR "/nfs4.nametoid/channel" +#define IC_NAMEID_FLUSH NFSD_DIR "/nfs4.nametoid/flush" + struct idmap_client { - int ic_fd; - int ic_dirfd; + short ic_which; char ic_clid[30]; + char *ic_id; char ic_path[PATH_MAX]; + int ic_fd; + int ic_dirfd; int ic_scanned; struct event ic_event; - char *ic_id; - short ic_which; TAILQ_ENTRY(idmap_client) ic_next; }; +static struct idmap_client nfsd_ic[2] = { +{ + .ic_which = IC_IDNAME, + .ic_clid = "Server", + .ic_id = "", + .ic_path = IC_IDNAME_CHAN, + .ic_fd = -1, + .ic_dirfd = -1, + .ic_scanned = 0 +}, +{ + .ic_which = IC_NAMEID, + .ic_clid = "Server", + .ic_id = "", + .ic_path = IC_NAMEID_CHAN, + .ic_fd = -1, + .ic_dirfd = -1, + .ic_scanned = 0 +}, +}; TAILQ_HEAD(idmap_clientq, idmap_client); @@ -121,24 +153,27 @@ static void imconv(struct idmap_client *, struct idmap_msg *); static void idtonameres(struct idmap_msg *); static void nametoidres(struct idmap_msg *); -static int nfsdopen(char *); -static int nfsdopenone(struct idmap_client *, short, char *); +static int nfsdopen(void); +static int nfsdopenone(struct idmap_client *); +static void nfsdreopen_one(struct idmap_client *); static void nfsdreopen(void); size_t strlcat(char *, const char *, size_t); size_t strlcpy(char *, const char *, size_t); -ssize_t atomicio(ssize_t (*)(), int, void *, size_t); +ssize_t atomicio(ssize_t (*f) (int, void*, size_t), + int, void *, size_t); void mydaemon(int, int); -void release_parent(); +void release_parent(void); static int verbose = 0; +#define DEFAULT_IDMAP_CACHE_EXPIRY 600 /* seconds */ +static int cache_entry_expiration = 0; static char pipefsdir[PATH_MAX]; static char *nobodyuser, *nobodygroup; static uid_t nobodyuid; static gid_t nobodygid; -static struct idmap_client nfsd_ic[2]; -/* Used by cfg.c */ +/* Used by conffile.c in libnfs.a */ char *conf_path; static int @@ -151,7 +186,10 @@ flush_nfsd_cache(char *path, time_t now) fd = open(path, O_RDWR); if (fd == -1) return -1; - write(fd, stime, strlen(stime)); + if (write(fd, stime, strlen(stime)) != (ssize_t)strlen(stime)) { + errx(1, "Flushing nfsd cache failed: errno %d (%s)", + errno, strerror(errno)); + } close(fd); return 0; } @@ -162,10 +200,10 @@ flush_nfsd_idmap_cache(void) time_t now = time(NULL); int ret; - ret = flush_nfsd_cache("/proc/net/rpc/nfs4.idtoname/flush", now); + ret = flush_nfsd_cache(IC_IDNAME_FLUSH, now); if (ret) return ret; - ret = flush_nfsd_cache("/proc/net/rpc/nfs4.nametoid/flush", now); + ret = flush_nfsd_cache(IC_NAMEID_FLUSH, now); return ret; } @@ -182,12 +220,19 @@ main(int argc, char **argv) char *xpipefsdir = NULL; int serverstart = 1, clientstart = 1; int ret; + char *progname; conf_path = _PATH_IDMAPDCONF; nobodyuser = NFS4NOBODY_USER; nobodygroup = NFS4NOBODY_GROUP; strlcpy(pipefsdir, PIPEFS_DIR, sizeof(pipefsdir)); + if ((progname = strrchr(argv[0], '/'))) + progname++; + else + progname = argv[0]; + xlog_open(progname); + #define GETOPTSTR "vfd:p:U:G:c:CS" opterr=0; /* Turn off error messages */ while ((opt = getopt(argc, argv, GETOPTSTR)) != -1) { @@ -204,15 +249,17 @@ main(int argc, char **argv) if (stat(conf_path, &sb) == -1 && (errno == ENOENT || errno == EACCES)) { warn("Skipping configuration file \"%s\"", conf_path); + conf_path = NULL; } else { conf_init(); verbose = conf_get_num("General", "Verbosity", 0); + cache_entry_expiration = conf_get_num("General", + "Cache-Expiration", DEFAULT_IDMAP_CACHE_EXPIRY); CONF_SAVE(xpipefsdir, conf_get_str("General", "Pipefs-Directory")); if (xpipefsdir != NULL) strlcpy(pipefsdir, xpipefsdir, sizeof(pipefsdir)); CONF_SAVE(nobodyuser, conf_get_str("Mapping", "Nobody-User")); CONF_SAVE(nobodygroup, conf_get_str("Mapping", "Nobody-Group")); - nfs4_init_name_mapping(conf_path); } while ((opt = getopt(argc, argv, GETOPTSTR)) != -1) @@ -254,17 +301,28 @@ main(int argc, char **argv) errx(1, "Could not find group \"%s\"", nobodygroup); nobodygid = gr->gr_gid; +#ifdef HAVE_NFS4_SET_DEBUG + nfs4_set_debug(verbose, xlog_warn); +#endif + if (conf_path == NULL) + conf_path = _PATH_IDMAPDCONF; + if (nfs4_init_name_mapping(conf_path)) + errx(1, "Unable to create name to user id mappings."); + if (!fg) mydaemon(0, 0); event_init(); + if (verbose > 0) + xlog_warn("Expiration time is %d seconds.", + cache_entry_expiration); if (serverstart) { - nfsdret = nfsdopen(NFSD_DIR); + nfsdret = nfsdopen(); if (nfsdret == 0) { ret = flush_nfsd_idmap_cache(); if (ret) - errx(1, "Failed to flush nfsd idmap cache\n"); + xlog_err("main: Failed to flush nfsd idmap cache\n: %s", strerror(errno)); } } @@ -274,15 +332,41 @@ main(int argc, char **argv) .tv_usec = 0, }; + if (cache_entry_expiration != DEFAULT_IDMAP_CACHE_EXPIRY) { + int timeout_fd, len; + char timeout_buf[12]; + if ((timeout_fd = open(CLIENT_CACHE_TIMEOUT_FILE, + O_RDWR)) == -1) { + xlog_warn("Unable to open '%s' to set " + "client cache expiration time " + "to %d seconds\n", + CLIENT_CACHE_TIMEOUT_FILE, + cache_entry_expiration); + } else { + len = snprintf(timeout_buf, sizeof(timeout_buf), + "%d", cache_entry_expiration); + if ((write(timeout_fd, timeout_buf, len)) != len) + xlog_warn("Error writing '%s' to " + "'%s' to set client " + "cache expiration time\n", + timeout_buf, + CLIENT_CACHE_TIMEOUT_FILE); + close(timeout_fd); + } + } + if ((fd = open(pipefsdir, O_RDONLY)) == -1) - err(1, "open(%s)", pipefsdir); + xlog_err("main: open(%s): %s", pipefsdir, strerror(errno)); if (fcntl(fd, F_SETSIG, SIGUSR1) == -1) - err(1, "fcntl(%s)", pipefsdir); - if (fcntl(fd, F_NOTIFY, - DN_CREATE | DN_DELETE | DN_MODIFY | DN_MULTISHOT) == -1) - err(1, "fcntl(%s)", pipefsdir); + xlog_err("main: fcntl(%s): %s", pipefsdir, strerror(errno)); + if (fcntl(fd, F_NOTIFY, + DN_CREATE | DN_DELETE | DN_MODIFY | DN_MULTISHOT) == -1) { + xlog_err("main: fcntl(%s): %s", pipefsdir, strerror(errno)); + if (errno == EINVAL) + xlog_err("main: Possibly no Dnotify support in kernel."); + } TAILQ_INIT(&icq); /* These events are persistent */ @@ -301,28 +385,29 @@ main(int argc, char **argv) } if (nfsdret != 0 && fd == 0) - errx(1, "Neither NFS client nor NFSd found"); + xlog_err("main: Neither NFS client nor NFSd found"); release_parent(); if (event_dispatch() < 0) - errx(1, "event_dispatch: returns errno %d (%s)", errno, strerror(errno)); + xlog_err("main: event_dispatch returns errno %d (%s)", + errno, strerror(errno)); /* NOTREACHED */ return 1; } static void -dirscancb(int fd, short which, void *data) +dirscancb(int UNUSED(fd), short UNUSED(which), void *data) { int nent, i; struct dirent **ents; - struct idmap_client *ic; + struct idmap_client *ic, *nextic; char path[PATH_MAX]; struct idmap_clientq *icq = data; nent = scandir(pipefsdir, &ents, NULL, alphasort); if (nent == -1) { - warn("scandir(%s)", pipefsdir); + xlog_warn("dirscancb: scandir(%s): %s", pipefsdir, strerror(errno)); return; } @@ -336,7 +421,7 @@ dirscancb(int fd, short which, void *data) goto next; if ((ic = calloc(1, sizeof(*ic))) == NULL) - return; + goto out; strlcpy(ic->ic_clid, ents[i]->d_name + 4, sizeof(ic->ic_clid)); path[0] = '\0'; @@ -344,21 +429,21 @@ dirscancb(int fd, short which, void *data) pipefsdir, ents[i]->d_name); if ((ic->ic_dirfd = open(path, O_RDONLY, 0)) == -1) { - warn("open(%s)", path); + xlog_warn("dirscancb: open(%s): %s", path, strerror(errno)); free(ic); - return; + goto out; } strlcat(path, "/idmap", sizeof(path)); strlcpy(ic->ic_path, path, sizeof(ic->ic_path)); if (verbose > 0) - warnx("New client: %s", ic->ic_clid); + xlog_warn("New client: %s", ic->ic_clid); if (nfsopen(ic) == -1) { close(ic->ic_dirfd); free(ic); - return; + goto out; } ic->ic_id = "Client"; @@ -370,31 +455,39 @@ dirscancb(int fd, short which, void *data) } } - TAILQ_FOREACH(ic, icq, ic_next) { + ic = TAILQ_FIRST(icq); + while(ic != NULL) { + nextic=TAILQ_NEXT(ic, ic_next); if (!ic->ic_scanned) { event_del(&ic->ic_event); close(ic->ic_fd); close(ic->ic_dirfd); TAILQ_REMOVE(icq, ic, ic_next); if (verbose > 0) { - warnx("Stale client: %s", ic->ic_clid); - warnx("\t-> closed %s", ic->ic_path); + xlog_warn("Stale client: %s", ic->ic_clid); + xlog_warn("\t-> closed %s", ic->ic_path); } free(ic); } else ic->ic_scanned = 0; + ic = nextic; } + +out: + for (i = 0; i < nent; i++) + free(ents[i]); + free(ents); return; } static void -svrreopen(int fd, short which, void *data) +svrreopen(int UNUSED(fd), short UNUSED(which), void *UNUSED(data)) { nfsdreopen(); } static void -clntscancb(int fd, short which, void *data) +clntscancb(int UNUSED(fd), short UNUSED(which), void *data) { struct idmap_clientq *icq = data; struct idmap_client *ic; @@ -408,41 +501,46 @@ clntscancb(int fd, short which, void *data) } static void -nfsdcb(int fd, short which, void *data) +nfsdcb(int UNUSED(fd), short which, void *data) { struct idmap_client *ic = data; struct idmap_msg im; u_char buf[IDMAP_MAXMSGSZ + 1]; - size_t len, bsiz; + size_t len; + ssize_t bsiz; char *bp, typebuf[IDMAP_MAXMSGSZ], buf1[IDMAP_MAXMSGSZ], authbuf[IDMAP_MAXMSGSZ], *p; + unsigned long tmp; if (which != EV_READ) goto out; - if ((len = read(ic->ic_fd, buf, sizeof(buf))) == -1) { - warnx("nfsdcb: read(%s) failed: errno %d (%s)", - ic->ic_path, errno, strerror(errno)); - goto out; + if ((len = read(ic->ic_fd, buf, sizeof(buf))) <= 0) { + xlog_warn("nfsdcb: read(%s) failed: errno %d (%s)", + ic->ic_path, len?errno:0, + len?strerror(errno):"End of File"); + nfsdreopen_one(ic); + return; } /* Get rid of newline and terminate buffer*/ buf[len - 1] = '\0'; - bp = buf; + bp = (char *)buf; memset(&im, 0, sizeof(im)); /* Authentication name -- ignored for now*/ if (getfield(&bp, authbuf, sizeof(authbuf)) == -1) { - warnx("nfsdcb: bad authentication name in upcall\n"); - return; + xlog_warn("nfsdcb: bad authentication name in upcall\n"); + goto out; } if (getfield(&bp, typebuf, sizeof(typebuf)) == -1) { - warnx("nfsdcb: bad type in upcall\n"); - return; + xlog_warn("nfsdcb: bad type in upcall\n"); + goto out; } if (verbose > 0) - warnx("nfsdcb: authbuf=%s authtype=%s", authbuf, typebuf); + xlog_warn("nfsdcb: authbuf=%s authtype=%s", + authbuf, typebuf); im.im_type = strcmp(typebuf, "user") == 0 ? IDMAP_TYPE_USER : IDMAP_TYPE_GROUP; @@ -451,32 +549,33 @@ nfsdcb(int fd, short which, void *data) case IC_NAMEID: im.im_conv = IDMAP_CONV_NAMETOID; if (getfield(&bp, im.im_name, sizeof(im.im_name)) == -1) { - warnx("nfsdcb: bad name in upcall\n"); - return; + xlog_warn("nfsdcb: bad name in upcall\n"); + goto out; } break; case IC_IDNAME: im.im_conv = IDMAP_CONV_IDTONAME; if (getfield(&bp, buf1, sizeof(buf1)) == -1) { - warnx("nfsdcb: bad id in upcall\n"); - return; + xlog_warn("nfsdcb: bad id in upcall\n"); + goto out; } - if ((im.im_id = strtoul(buf1, (char **)NULL, 10)) == ULONG_MAX && - errno == ERANGE) { - warnx("nfsdcb: id '%s' too big!\n", buf1); - return; + tmp = strtoul(buf1, (char **)NULL, 10); + im.im_id = (u_int32_t)tmp; + if ((tmp == ULONG_MAX && errno == ERANGE) + || (unsigned long)im.im_id != tmp) { + xlog_warn("nfsdcb: id '%s' too big!\n", buf1); + goto out; } - break; default: - warnx("Unknown which type %d", ic->ic_which); - return; + xlog_warn("nfsdcb: Unknown which type %d", ic->ic_which); + goto out; } imconv(ic, &im); buf[0] = '\0'; - bp = buf; + bp = (char *)buf; bsiz = sizeof(buf); /* Authentication name */ @@ -489,14 +588,22 @@ nfsdcb(int fd, short which, void *data) addfield(&bp, &bsiz, p); /* Name */ addfield(&bp, &bsiz, im.im_name); -#define NFSD_EXPIRY 300 /* seconds */ /* expiry */ - snprintf(buf1, sizeof(buf1), "%lu", time(NULL) + NFSD_EXPIRY); - addfield(&bp, &bsiz, buf1); - /* ID */ - snprintf(buf1, sizeof(buf1), "%u", im.im_id); + snprintf(buf1, sizeof(buf1), "%lu", + time(NULL) + cache_entry_expiration); addfield(&bp, &bsiz, buf1); + /* Note that we don't want to write the id if the mapping + * failed; instead, by leaving it off, we write a negative + * cache entry which will result in an error returned to + * the client. We don't want a chown or setacl referring + * to an unknown user to result in giving permissions to + * "nobody"! */ + if (im.im_status == IDMAP_STATUS_SUCCESS) { + /* ID */ + snprintf(buf1, sizeof(buf1), "%u", im.im_id); + addfield(&bp, &bsiz, buf1); + } //if (bsiz == sizeof(buf)) /* XXX */ bp[-1] = '\n'; @@ -510,8 +617,11 @@ nfsdcb(int fd, short which, void *data) snprintf(buf1, sizeof(buf1), "%u", im.im_id); addfield(&bp, &bsiz, buf1); /* expiry */ - snprintf(buf1, sizeof(buf1), "%lu", time(NULL) + NFSD_EXPIRY); + snprintf(buf1, sizeof(buf1), "%lu", + time(NULL) + cache_entry_expiration); addfield(&bp, &bsiz, buf1); + /* Note we're ignoring the status field in this case; we'll + * just map to nobody instead. */ /* Name */ addfield(&bp, &bsiz, im.im_name); @@ -519,15 +629,15 @@ nfsdcb(int fd, short which, void *data) break; default: - warnx("Unknown which type %d", ic->ic_which); - return; + xlog_warn("nfsdcb: Unknown which type %d", ic->ic_which); + goto out; } bsiz = sizeof(buf) - bsiz; - if (atomicio(write, ic->ic_fd, buf, bsiz) != bsiz) - warnx("nfsdcb: write(%s) failed: errno %d (%s)", - ic->ic_path, errno, strerror(errno)); + if (atomicio((void*)write, ic->ic_fd, buf, bsiz) != bsiz) + xlog_warn("nfsdcb: write(%s) failed: errno %d (%s)", + ic->ic_path, errno, strerror(errno)); out: event_add(&ic->ic_event, NULL); @@ -540,7 +650,7 @@ imconv(struct idmap_client *ic, struct idmap_msg *im) case IDMAP_CONV_IDTONAME: idtonameres(im); if (verbose > 1) - warnx("%s %s: (%s) id \"%d\" -> name \"%s\"", + xlog_warn("%s %s: (%s) id \"%d\" -> name \"%s\"", ic->ic_id, ic->ic_clid, im->im_type == IDMAP_TYPE_USER ? "user" : "group", im->im_id, im->im_name); @@ -552,20 +662,21 @@ imconv(struct idmap_client *ic, struct idmap_msg *im) } nametoidres(im); if (verbose > 1) - warnx("%s %s: (%s) name \"%s\" -> id \"%d\"", + xlog_warn("%s %s: (%s) name \"%s\" -> id \"%d\"", ic->ic_id, ic->ic_clid, im->im_type == IDMAP_TYPE_USER ? "user" : "group", im->im_name, im->im_id); break; default: - warnx("Invalid conversion type (%d) in message", im->im_conv); + xlog_warn("imconv: Invalid conversion type (%d) in message", + im->im_conv); im->im_status |= IDMAP_STATUS_INVALIDMSG; break; } } static void -nfscb(int fd, short which, void *data) +nfscb(int UNUSED(fd), short which, void *data) { struct idmap_client *ic = data; struct idmap_msg im; @@ -575,7 +686,7 @@ nfscb(int fd, short which, void *data) if (atomicio(read, ic->ic_fd, &im, sizeof(im)) != sizeof(im)) { if (verbose > 0) - warn("read(%s)", ic->ic_path); + xlog_warn("nfscb: read(%s): %s", ic->ic_path, strerror(errno)); if (errno == EPIPE) return; goto out; @@ -583,8 +694,15 @@ nfscb(int fd, short which, void *data) imconv(ic, &im); - if (atomicio(write, ic->ic_fd, &im, sizeof(im)) != sizeof(im)) - warn("write(%s)", ic->ic_path); + /* XXX: I don't like ignoring this error in the id->name case, + * but we've never returned it, and I need to check that the client + * can handle it gracefully before starting to return it now. */ + + if (im.im_status == IDMAP_STATUS_LOOKUPFAIL) + im.im_status = IDMAP_STATUS_SUCCESS; + + if (atomicio((void*)write, ic->ic_fd, &im, sizeof(im)) != sizeof(im)) + xlog_warn("nfscb: write(%s): %s", ic->ic_path, strerror(errno)); out: event_add(&ic->ic_event, NULL); } @@ -595,22 +713,23 @@ nfsdreopen_one(struct idmap_client *ic) int fd; if (verbose > 0) - warnx("ReOpening %s", ic->ic_path); + xlog_warn("ReOpening %s", ic->ic_path); + if ((fd = open(ic->ic_path, O_RDWR, 0)) != -1) { + if ((ic->ic_event.ev_flags & EVLIST_INIT)) + event_del(&ic->ic_event); if (ic->ic_fd != -1) close(ic->ic_fd); + ic->ic_event.ev_fd = ic->ic_fd = fd; 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)", + xlog_warn("nfsdreopen: Opening '%s' failed: errno %d (%s)", ic->ic_path, errno, strerror(errno)); } } -/* - * Note: nfsdreopen assumes nfsdopen has already been called - */ static void nfsdreopen() { @@ -620,23 +739,19 @@ nfsdreopen() } static int -nfsdopen(char *path) +nfsdopen(void) { - return ((nfsdopenone(&nfsd_ic[0], IC_NAMEID, path) == 0 && - nfsdopenone(&nfsd_ic[1], IC_IDNAME, path) == 0) ? 0 : -1); + return ((nfsdopenone(&nfsd_ic[IC_NAMEID]) == 0 && + nfsdopenone(&nfsd_ic[IC_IDNAME]) == 0) ? 0 : -1); } static int -nfsdopenone(struct idmap_client *ic, short which, char *path) +nfsdopenone(struct idmap_client *ic) { - char *whichstr; - - whichstr = which == IC_IDNAME ? "idtoname" : "nametoid"; - snprintf(ic->ic_path, sizeof(ic->ic_path), - "%s/nfs4.%s/channel", path, whichstr); if ((ic->ic_fd = open(ic->ic_path, O_RDWR, 0)) == -1) { if (verbose > 0) - warnx("Opening %s failed: errno %d (%s)", + xlog_warn("nfsdopenone: Opening %s failed: " + "errno %d (%s)", ic->ic_path, errno, strerror(errno)); return (-1); } @@ -644,12 +759,8 @@ nfsdopenone(struct idmap_client *ic, short which, char *path) event_set(&ic->ic_event, ic->ic_fd, EV_READ, nfsdcb, ic); event_add(&ic->ic_event, NULL); - ic->ic_which = which; - ic->ic_id = "Server"; - strlcpy(ic->ic_clid, "Server", strlen("Server")); - if (verbose > 0) - warnx("Opened %s", ic->ic_path); + xlog_warn("Opened %s", ic->ic_path); return (0); } @@ -665,7 +776,7 @@ nfsopen(struct idmap_client *ic) DN_CREATE | DN_DELETE | DN_MULTISHOT); break; default: - warn("open(%s)", ic->ic_path); + xlog_warn("nfsopen: open(%s): %s", ic->ic_path, strerror(errno)); return (-1); } } else { @@ -674,23 +785,12 @@ nfsopen(struct idmap_client *ic) fcntl(ic->ic_dirfd, F_SETSIG, 0); fcntl(ic->ic_dirfd, F_NOTIFY, 0); if (verbose > 0) - warnx("Opened %s", ic->ic_path); + xlog_warn("Opened %s", ic->ic_path); } return (0); } -static int write_name(char *dest, char *localname, char *domain, size_t len) -{ - if (strlen(localname) + 1 + strlen(domain) + 1 > len) { - return -ENOMEM; /* XXX: Is there an -ETOOLONG? */ - } - strcpy(dest, localname); - strcat(dest, "@"); - strcat(dest, domain); - return 0; -} - static void idtonameres(struct idmap_msg *im) { @@ -702,55 +802,66 @@ idtonameres(struct idmap_msg *im) case IDMAP_TYPE_USER: ret = nfs4_uid_to_name(im->im_id, domain, im->im_name, sizeof(im->im_name)); - if (ret) - write_name(im->im_name, nobodyuser, domain, - sizeof(im->im_name)); + if (ret) { + if (strlen(nobodyuser) < sizeof(im->im_name)) + strcpy(im->im_name, nobodyuser); + else + strcpy(im->im_name, NFS4NOBODY_USER); + } break; case IDMAP_TYPE_GROUP: ret = nfs4_gid_to_name(im->im_id, domain, im->im_name, sizeof(im->im_name)); - if (ret) - write_name(im->im_name, nobodygroup, domain, - sizeof(im->im_name)); + if (ret) { + if (strlen(nobodygroup) < sizeof(im->im_name)) + strcpy(im->im_name, nobodygroup); + else + strcpy(im->im_name, NFS4NOBODY_GROUP); + } break; } - /* XXX Hack? */ - im->im_status = IDMAP_STATUS_SUCCESS; + if (ret) + im->im_status = IDMAP_STATUS_LOOKUPFAIL; + else + im->im_status = IDMAP_STATUS_SUCCESS; } static void nametoidres(struct idmap_msg *im) { + uid_t uid; + gid_t gid; 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. */ + + im->im_status = IDMAP_STATUS_SUCCESS; + switch (im->im_type) { case IDMAP_TYPE_USER: - ret = nfs4_name_to_uid(im->im_name, &im->im_id); - if (ret) + ret = nfs4_name_to_uid(im->im_name, &uid); + im->im_id = (u_int32_t) uid; + if (ret) { + im->im_status = IDMAP_STATUS_LOOKUPFAIL; im->im_id = nobodyuid; - break; + } + return; case IDMAP_TYPE_GROUP: - ret = nfs4_name_to_gid(im->im_name, &im->im_id); - if (ret) + ret = nfs4_name_to_gid(im->im_name, &gid); + im->im_id = (u_int32_t) gid; + if (ret) { + im->im_status = IDMAP_STATUS_LOOKUPFAIL; im->im_id = nobodygid; - break; + } + return; } - /* XXX? */ - im->im_status = IDMAP_STATUS_SUCCESS; } static int validateascii(char *string, u_int32_t len) { - int i; + u_int32_t i; for (i = 0; i < len; i++) { if (string[i] == '\0') @@ -760,7 +871,7 @@ validateascii(char *string, u_int32_t len) return (-1); } - if (string[i] != '\0') + if ((i >= len) || string[i] != '\0') return (-1); return (i + 1); @@ -806,7 +917,7 @@ static int getfield(char **bpp, char *fld, size_t fldsz) { char *bp; - u_int val, n; + int val, n; while ((bp = strsep(bpp, " ")) != NULL && bp[0] == '\0') ; @@ -846,13 +957,13 @@ int pipefds[2] = { -1, -1}; void mydaemon(int nochdir, int noclose) { - int pid, status, tempfd, fdmax, filedes; + int pid, status, tempfd; if (pipe(pipefds) < 0) - err(1, "mydaemon: pipe() failed: errno %d (%s)\n", errno, strerror(errno)); + err(1, "mydaemon: pipe() failed: errno %d", errno); if ((pid = fork ()) < 0) - err(1, "mydaemon: fork() failed: errno %d (%s)\n", errno, strerror(errno)); + err(1, "mydaemon: fork() failed: errno %d", errno); if (pid != 0) { /* @@ -868,35 +979,43 @@ mydaemon(int nochdir, int noclose) setsid (); if (nochdir == 0) { if (chdir ("/") == -1) - err(1, "mydaemon: chdir() failed: errno %d (%s)\n", errno, strerror(errno)); + err(1, "mydaemon: chdir() failed: errno %d", errno); } while (pipefds[1] <= 2) { pipefds[1] = dup(pipefds[1]); if (pipefds[1] < 0) - err(1, "mydaemon: dup() failed: errno %d (%s)\n", errno, strerror(errno)); + err(1, "mydaemon: dup() failed: errno %d", errno); } if (noclose == 0) { tempfd = open("/dev/null", O_RDWR); - close(0); dup2(tempfd, 0); - close(1); dup2(tempfd, 1); - close(2); dup2(tempfd, 2); - fdmax = sysconf (_SC_OPEN_MAX); - for (filedes = 3; filedes < fdmax; filedes++) - if (filedes != pipefds[1]) - close (filedes); + if (tempfd < 0) + tempfd = open("/", O_RDONLY); + if (tempfd >= 0) { + dup2(tempfd, 0); + dup2(tempfd, 1); + dup2(tempfd, 2); + close(tempfd); + } else { + err(1, "mydaemon: can't open /dev/null: errno %d", + errno); + exit(1); + } } return; } void -release_parent() +release_parent(void) { int status; if (pipefds[1] > 0) { - write(pipefds[1], &status, 1); + if (write(pipefds[1], &status, 1) != 1) { + err(1, "Writing to parent pipe failed: errno %d (%s)\n", + errno, strerror(errno)); + } close(pipefds[1]); pipefds[1] = -1; }