]> git.decadent.org.uk Git - nfs-utils.git/blobdiff - utils/statd/sm-notify.c
NFS man page: update nfs(5) with details about IPv6 support
[nfs-utils.git] / utils / statd / sm-notify.c
index b75f11b365c317a8f4638b6bf4574ab602be86bf..1d4403a6d973c5773ebf65ece7bced0dae46b9c5 100644 (file)
@@ -4,6 +4,10 @@
  * Copyright (C) 2004-2006 Olaf Kirch <okir@suse.de>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
@@ -24,7 +28,7 @@
 #include <errno.h>
 #include <grp.h>
 
-#include "config.h"
+#include "xlog.h"
 
 #ifndef BASEDIR
 # ifdef NFS_STATEDIR
@@ -51,13 +55,11 @@ char *_SM_BAK_PATH = DEFAULT_SM_BAK_PATH;
 #define NSM_MAX_TIMEOUT        120     /* don't make this too big */
 #define MAXMSGSIZE     256
 
-typedef struct sockaddr_storage nsm_address;
-
 struct nsm_host {
        struct nsm_host *       next;
        char *                  name;
        char *                  path;
-       nsm_address             addr;
+       struct sockaddr_storage addr;
        struct addrinfo         *ai;
        time_t                  last_used;
        time_t                  send_next;
@@ -69,12 +71,10 @@ struct nsm_host {
 static char            nsm_hostname[256];
 static uint32_t                nsm_state;
 static int             opt_debug = 0;
-static int             opt_quiet = 0;
 static int             opt_update_state = 1;
 static unsigned int    opt_max_retry = 15 * 60;
 static char *          opt_srcaddr = 0;
 static uint16_t                opt_srcport = 0;
-static int             log_syslog = 0;
 
 static unsigned int    nsm_get_state(int);
 static void            notify(void);
@@ -83,24 +83,85 @@ static void         recv_reply(int);
 static void            backup_hosts(const char *, const char *);
 static void            get_hosts(const char *);
 static void            insert_host(struct nsm_host *);
-struct nsm_host *      find_host(uint32_t);
-static int             addr_get_port(nsm_address *);
-static void            addr_set_port(nsm_address *, int);
-static struct addrinfo *host_lookup(int, const char *);
-void                   nsm_log(int fac, const char *fmt, ...);
+static struct nsm_host *find_host(uint32_t);
 static int             record_pid(void);
 static void            drop_privs(void);
-static void set_kernel_nsm_state(int state);
+static void            set_kernel_nsm_state(int state);
 
 static struct nsm_host *       hosts = NULL;
 
+/*
+ * Address handling utilities
+ */
+
+static unsigned short smn_get_port(const struct sockaddr *sap)
+{
+       switch (sap->sa_family) {
+       case AF_INET:
+               return ntohs(((struct sockaddr_in *)sap)->sin_port);
+       case AF_INET6:
+               return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
+       }
+       return 0;
+}
+
+static void smn_set_port(struct sockaddr *sap, const unsigned short port)
+{
+       switch (sap->sa_family) {
+       case AF_INET:
+               ((struct sockaddr_in *)sap)->sin_port = htons(port);
+               break;
+       case AF_INET6:
+               ((struct sockaddr_in6 *)sap)->sin6_port = htons(port);
+               break;
+       }
+}
+
+static struct addrinfo *smn_lookup(const char *name)
+{
+       struct addrinfo *ai, hint = {
+#if HAVE_DECL_AI_ADDRCONFIG
+               .ai_flags       = AI_ADDRCONFIG,
+#endif /* HAVE_DECL_AI_ADDRCONFIG */
+               .ai_family      = AF_INET,
+               .ai_protocol    = IPPROTO_UDP,
+       };
+       int error;
+
+       error = getaddrinfo(name, NULL, &hint, &ai);
+       if (error) {
+               xlog(D_GENERAL, "getaddrinfo(3): %s", gai_strerror(error));
+               return NULL;
+       }
+
+       return ai;
+}
+
+static void smn_forget_host(struct nsm_host *host)
+{
+       unlink(host->path);
+       free(host->path);
+       free(host->name);
+       if (host->ai)
+               freeaddrinfo(host->ai);
+
+       free(host);
+}
+
 int
 main(int argc, char **argv)
 {
        int     c;
        int     force = 0;
+       char *  progname;
 
-       while ((c = getopt(argc, argv, "dm:np:v:qP:f")) != -1) {
+       progname = strrchr(argv[0], '/');
+       if (progname != NULL)
+               progname++;
+       else
+               progname = argv[0];
+
+       while ((c = getopt(argc, argv, "dm:np:v:P:f")) != -1) {
                switch (c) {
                case 'f':
                        force = 1;
@@ -120,9 +181,6 @@ main(int argc, char **argv)
                case 'v':
                        opt_srcaddr = optarg;
                        break;
-               case 'q':
-                       opt_quiet = 1;
-                       break;
                case 'P':
                        _SM_BASE_PATH = strdup(optarg);
                        _SM_STATE_PATH = malloc(strlen(optarg)+1+sizeof("state"));
@@ -132,7 +190,7 @@ main(int argc, char **argv)
                            _SM_STATE_PATH == NULL ||
                            _SM_DIR_PATH == NULL ||
                            _SM_BAK_PATH == NULL) {
-                               nsm_log(LOG_WARNING, "unable to allocate memory");
+                               fprintf(stderr, "unable to allocate memory");
                                exit(1);
                        }
                        strcat(strcpy(_SM_STATE_PATH, _SM_BASE_PATH), "/state");
@@ -147,43 +205,57 @@ main(int argc, char **argv)
 
        if (optind < argc) {
 usage:         fprintf(stderr,
-                       "Usage: sm-notify [-dfq] [-m max-retry-minutes] [-p srcport]\n"
-                       "            [-P /path/to/state/directory] [-v my_host_name]\n");
-               return 1;
+                       "Usage: %s -notify [-dfq] [-m max-retry-minutes] [-p srcport]\n"
+                       "            [-P /path/to/state/directory] [-v my_host_name]\n",
+                       progname);
+               exit(1);
        }
 
+       xlog_syslog(1);
+       if (opt_debug) {
+               xlog_stderr(1);
+               xlog_config(D_ALL, 1);
+       } else
+               xlog_stderr(0);
+
+       xlog_open(progname);
+       xlog(L_NOTICE, "Version " VERSION " starting");
+
        if (strcmp(_SM_BASE_PATH, BASEDIR) == 0) {
-               if (record_pid() == 0 && force == 0 && opt_update_state == 1)
+               if (record_pid() == 0 && force == 0 && opt_update_state == 1) {
                        /* already run, don't try again */
+                       xlog(L_NOTICE, "Already notifying clients; Exiting!");
                        exit(0);
+               }
        }
 
        if (opt_srcaddr) {
                strncpy(nsm_hostname, opt_srcaddr, sizeof(nsm_hostname)-1);
        } else
        if (gethostname(nsm_hostname, sizeof(nsm_hostname)) < 0) {
-               perror("gethostname");
-               return 1;
+               xlog(L_ERROR, "Failed to obtain name of local host: %m");
+               exit(1);
        }
 
        backup_hosts(_SM_DIR_PATH, _SM_BAK_PATH);
        get_hosts(_SM_BAK_PATH);
 
+       /* If there are not hosts to notify, just exit */
+       if (!hosts) {
+               xlog(D_GENERAL, "No hosts to notify; exiting");
+               return 0;
+       }
+
        /* Get and update the NSM state. This will call sync() */
        nsm_state = nsm_get_state(opt_update_state);
        set_kernel_nsm_state(nsm_state);
 
        if (!opt_debug) {
-               if (!opt_quiet)
-                       printf("Backgrounding to notify hosts...\n");
-
-               openlog("sm-notify", LOG_PID, LOG_DAEMON);
-               log_syslog = 1;
+               xlog(L_NOTICE, "Backgrounding to notify hosts...\n");
 
                if (daemon(0, 0) < 0) {
-                       nsm_log(LOG_WARNING, "unable to background: %s",
-                                       strerror(errno));
-                       return 1;
+                       xlog(L_ERROR, "unable to background: %m");
+                       exit(1);
                }
 
                close(0);
@@ -198,23 +270,23 @@ usage:            fprintf(stderr,
 
                while ((hp = hosts) != 0) {
                        hosts = hp->next;
-                       nsm_log(LOG_NOTICE,
-                               "Unable to notify %s, giving up",
+                       xlog(L_NOTICE, "Unable to notify %s, giving up",
                                hp->name);
                }
-               return 1;
+               exit(1);
        }
 
-       return 0;
+       exit(0);
 }
 
 /*
  * Notify hosts
  */
-void
+static void
 notify(void)
 {
-       nsm_address local_addr;
+       struct sockaddr_storage address;
+       struct sockaddr *local_addr = (struct sockaddr *)&address;
        time_t  failtime = 0;
        int     sock = -1;
        int retry_cnt = 0;
@@ -222,38 +294,41 @@ notify(void)
  retry:
        sock = socket(AF_INET, SOCK_DGRAM, 0);
        if (sock < 0) {
-               perror("socket");
+               xlog(L_ERROR, "Failed to create RPC socket: %m");
                exit(1);
        }
        fcntl(sock, F_SETFL, O_NONBLOCK);
 
-       memset(&local_addr, 0, sizeof(local_addr));
-       local_addr.ss_family = AF_INET; /* Default to IPv4 */
+       memset(&address, 0, sizeof(address));
+       local_addr->sa_family = AF_INET;        /* Default to IPv4 */
 
        /* Bind source IP if provided on command line */
        if (opt_srcaddr) {
-               struct addrinfo *ai = host_lookup(AF_INET, opt_srcaddr);
+               struct addrinfo *ai = smn_lookup(opt_srcaddr);
                if (!ai) {
-                       nsm_log(LOG_WARNING,
-                               "Not a valid hostname or address: \"%s\"\n",
+                       xlog(L_ERROR,
+                               "Not a valid hostname or address: \"%s\"",
                                opt_srcaddr);
                        exit(1);
                }
-               memcpy(&local_addr, ai->ai_addr, ai->ai_addrlen);
+
                /* We know it's IPv4 at this point */
+               memcpy(local_addr, ai->ai_addr, ai->ai_addrlen);
+
+               freeaddrinfo(ai);
        }
 
        /* Use source port if provided on the command line,
         * otherwise use bindresvport */
        if (opt_srcport) {
-               addr_set_port(&local_addr, opt_srcport);
-               if (bind(sock, (struct sockaddr *) &local_addr, sizeof(local_addr)) < 0) {
-                       perror("bind");
+               smn_set_port(local_addr, opt_srcport);
+               if (bind(sock, local_addr, sizeof(struct sockaddr_in)) < 0) {
+                       xlog(L_ERROR, "Failed to bind RPC socket: %m");
                        exit(1);
                }
        } else {
                struct servent *se;
-               struct sockaddr_in *sin = (struct sockaddr_in *)&local_addr;
+               struct sockaddr_in *sin = (struct sockaddr_in *)local_addr;
                (void) bindresvport(sock, sin);
                /* try to avoid known ports */
                se = getservbyport(sin->sin_port, "udp");
@@ -288,13 +363,8 @@ notify(void)
                        hp = hosts;
                        hosts = hp->next;
 
-                       if (notify_host(sock, hp)){
-                               unlink(hp->path);
-                               free(hp->name);
-                               free(hp->path);
-                               free(hp);
+                       if (notify_host(sock, hp))
                                continue;
-                       }
 
                        /* Set the timeout for this call, using an
                           exponential timeout strategy */
@@ -309,7 +379,7 @@ notify(void)
                if (hosts == NULL)
                        return;
 
-               nsm_log(LOG_DEBUG, "Host %s due in %ld seconds",
+               xlog(D_GENERAL, "Host %s due in %ld seconds",
                                hosts->name, wait);
 
                pfd.fd = sock;
@@ -328,11 +398,13 @@ notify(void)
 /*
  * Send notification to a single host
  */
-int
+static int
 notify_host(int sock, struct nsm_host *host)
 {
+       struct sockaddr_storage address;
+       struct sockaddr *dest = (struct sockaddr *)&address;
+       socklen_t destlen = sizeof(address);
        static unsigned int     xid = 0;
-       nsm_address             dest;
        uint32_t                msgbuf[MAXMSGSIZE], *p;
        unsigned int            len;
 
@@ -342,12 +414,11 @@ notify_host(int sock, struct nsm_host *host)
                host->xid = xid++;
 
        if (host->ai == NULL) {
-               host->ai = host_lookup(AF_UNSPEC, host->name);
+               host->ai = smn_lookup(host->name);
                if (host->ai == NULL) {
-                       nsm_log(LOG_WARNING,
-                               "%s doesn't seem to be a valid address,"
-                               " skipped", host->name);
-                       return 1;
+                       xlog_warn("DNS resolution of %s failed; "
+                               "retrying later", host->name);
+                       return 0;
                }
        }
 
@@ -363,29 +434,37 @@ notify_host(int sock, struct nsm_host *host)
         * point.
         */
        if (host->retries >= 4) {
-               struct addrinfo *first = host->ai;
-               struct addrinfo **next = &host->ai;
-
-               /* remove the first entry from the list */
-               host->ai = first->ai_next;
-               first->ai_next = NULL;
-               /* find the end of the list */
-               next = &first->ai_next;
-               while ( *next )
-                       next = & (*next)->ai_next;
-               /* put first entry at end */
-               *next = first;
-               memcpy(&host->addr, first->ai_addr, first->ai_addrlen);
-               addr_set_port(&host->addr, 0);
+               /* don't rotate if there is only one addrinfo */
+               if (host->ai->ai_next == NULL)
+                       memcpy(&host->addr, host->ai->ai_addr,
+                                               host->ai->ai_addrlen);
+               else {
+                       struct addrinfo *first = host->ai;
+                       struct addrinfo **next = &host->ai;
+
+                       /* remove the first entry from the list */
+                       host->ai = first->ai_next;
+                       first->ai_next = NULL;
+                       /* find the end of the list */
+                       next = &first->ai_next;
+                       while ( *next )
+                               next = & (*next)->ai_next;
+                       /* put first entry at end */
+                       *next = first;
+                       memcpy(&host->addr, first->ai_addr,
+                                               first->ai_addrlen);
+               }
+
+               smn_set_port((struct sockaddr *)&host->addr, 0);
                host->retries = 0;
        }
 
-       dest = host->addr;
-       if (addr_get_port(&dest) == 0) {
+       memcpy(dest, &host->addr, destlen);
+       if (smn_get_port(dest) == 0) {
                /* Build a PMAP packet */
-               nsm_log(LOG_DEBUG, "Sending portmap query to %s", host->name);
+               xlog(D_GENERAL, "Sending portmap query to %s", host->name);
 
-               addr_set_port(&dest, 111);
+               smn_set_port(dest, 111);
                *p++ = htonl(100000);
                *p++ = htonl(2);
                *p++ = htonl(3);
@@ -400,7 +479,7 @@ notify_host(int sock, struct nsm_host *host)
                *p++ = 0;
        } else {
                /* Build an SM_NOTIFY packet */
-               nsm_log(LOG_DEBUG, "Sending SM_NOTIFY to %s", host->name);
+               xlog(D_GENERAL, "Sending SM_NOTIFY to %s", host->name);
 
                *p++ = htonl(NSM_PROGRAM);
                *p++ = htonl(NSM_VERSION);
@@ -419,9 +498,9 @@ notify_host(int sock, struct nsm_host *host)
        }
        len = (p - msgbuf) << 2;
 
-       if (sendto(sock, msgbuf, len, 0, (struct sockaddr *) &dest, sizeof(dest)) < 0)
-               nsm_log(LOG_WARNING, "Sending Reboot Notification to "
-                       "'%s' failed: errno %d (%s)", host->name, errno, strerror(errno));
+       if (sendto(sock, msgbuf, len, 0, dest, destlen) < 0)
+               xlog_warn("Sending Reboot Notification to "
+                       "'%s' failed: errno %d (%m)", host->name, errno);
        
        return 0;
 }
@@ -429,10 +508,11 @@ notify_host(int sock, struct nsm_host *host)
 /*
  * Receive reply from remote host
  */
-void
+static void
 recv_reply(int sock)
 {
        struct nsm_host *hp;
+       struct sockaddr *sap;
        uint32_t        msgbuf[MAXMSGSIZE], *p, *end;
        uint32_t        xid;
        int             res;
@@ -441,7 +521,7 @@ recv_reply(int sock)
        if (res < 0)
                return;
 
-       nsm_log(LOG_DEBUG, "Received packet...");
+       xlog(D_GENERAL, "Received packet...");
 
        p = msgbuf;
        end = p + (res >> 2);
@@ -458,8 +538,9 @@ recv_reply(int sock)
           this reply */
        if ((hp = find_host(xid)) == NULL)
                return;
+       sap = (struct sockaddr *)&hp->addr;
 
-       if (addr_get_port(&hp->addr) == 0) {
+       if (smn_get_port(sap) == 0) {
                /* This was a portmap request */
                unsigned int    port;
 
@@ -471,11 +552,11 @@ recv_reply(int sock)
                if (port == 0) {
                        /* No binding for statd. Delay the next
                         * portmap query for max timeout */
-                       nsm_log(LOG_DEBUG, "No statd on %s", hp->name);
+                       xlog(D_GENERAL, "No statd on %s", hp->name);
                        hp->timeout = NSM_MAX_TIMEOUT;
                        hp->send_next += NSM_MAX_TIMEOUT;
                } else {
-                       addr_set_port(&hp->addr, port);
+                       smn_set_port(sap, port);
                        if (hp->timeout >= NSM_MAX_TIMEOUT / 4)
                                hp->timeout = NSM_MAX_TIMEOUT / 4;
                }
@@ -487,12 +568,9 @@ recv_reply(int sock)
                 * packet)
                 */
                if (p <= end) {
-                       nsm_log(LOG_DEBUG, "Host %s notified successfully", hp->name);
-                       unlink(hp->path);
-                       free(hp->name);
-                       free(hp->path);
-                       free(hp);
-                       freeaddrinfo(hp->ai);
+                       xlog(D_GENERAL, "Host %s notified successfully",
+                                       hp->name);
+                       smn_forget_host(hp);
                        return;
                }
        }
@@ -511,7 +589,7 @@ backup_hosts(const char *dirname, const char *bakname)
        DIR             *dir;
 
        if (!(dir = opendir(dirname))) {
-               perror(dirname);
+               xlog_warn("Failed to open %s: %m", dirname);
                return;
        }
 
@@ -523,11 +601,8 @@ backup_hosts(const char *dirname, const char *bakname)
 
                snprintf(src, sizeof(src), "%s/%s", dirname, de->d_name);
                snprintf(dst, sizeof(dst), "%s/%s", bakname, de->d_name);
-               if (rename(src, dst) < 0) {
-                       nsm_log(LOG_WARNING,
-                               "Failed to rename %s -> %s: %m",
-                               src, dst);
-               }
+               if (rename(src, dst) < 0)
+                       xlog_warn("Failed to rename %s -> %s: %m", src, dst);
        }
        closedir(dir);
 }
@@ -543,7 +618,7 @@ get_hosts(const char *dirname)
        DIR             *dir;
 
        if (!(dir = opendir(dirname))) {
-               perror(dirname);
+               xlog_warn("Failed to open %s: %m", dirname);
                return;
        }
 
@@ -556,6 +631,10 @@ get_hosts(const char *dirname)
                        continue;
                if (host == NULL)
                        host = calloc(1, sizeof(*host));
+               if (host == NULL) {
+                       xlog_warn("Unable to allocate memory");
+                       return;
+               }
 
                snprintf(path, sizeof(path), "%s/%s", dirname, de->d_name);
                if (stat(path, &stb) < 0)
@@ -579,7 +658,7 @@ get_hosts(const char *dirname)
 /*
  * Insert host into sorted list
  */
-void
+static void
 insert_host(struct nsm_host *host)
 {
        struct nsm_host **where, *p;
@@ -607,7 +686,7 @@ insert_host(struct nsm_host *host)
 /*
  * Find host given the XID
  */
-struct nsm_host *
+static struct nsm_host *
 find_host(uint32_t xid)
 {
        struct nsm_host **where, *p;
@@ -627,24 +706,21 @@ find_host(uint32_t xid)
 /*
  * Retrieve the current NSM state
  */
-unsigned int
+static unsigned int
 nsm_get_state(int update)
 {
        char            newfile[PATH_MAX];
        int             fd, state;
 
        if ((fd = open(_SM_STATE_PATH, O_RDONLY)) < 0) {
-               if (!opt_quiet) {
-                       nsm_log(LOG_WARNING, "%s: %m", _SM_STATE_PATH);
-                       nsm_log(LOG_WARNING, "Creating %s, set initial state 1",
-                               _SM_STATE_PATH);
-               }
+               xlog_warn("%s: %m", _SM_STATE_PATH);
+               xlog_warn("Creating %s, set initial state 1",
+                       _SM_STATE_PATH);
                state = 1;
                update = 1;
        } else {
                if (read(fd, &state, sizeof(state)) != sizeof(state)) {
-                       nsm_log(LOG_WARNING,
-                               "%s: bad file size, setting state = 1",
+                       xlog_warn("%s: bad file size, setting state = 1",
                                _SM_STATE_PATH);
                        state = 1;
                        update = 1;
@@ -660,17 +736,17 @@ nsm_get_state(int update)
                snprintf(newfile, sizeof(newfile),
                                "%s.new", _SM_STATE_PATH);
                if ((fd = open(newfile, O_CREAT|O_WRONLY, 0644)) < 0) {
-                       nsm_log(LOG_WARNING, "Cannot create %s: %m", newfile);
+                       xlog(L_ERROR, "Cannot create %s: %m", newfile);
                        exit(1);
                }
                if (write(fd, &state, sizeof(state)) != sizeof(state)) {
-                       nsm_log(LOG_WARNING,
+                       xlog(L_ERROR,
                                "Failed to write state to %s", newfile);
                        exit(1);
                }
                close(fd);
                if (rename(newfile, _SM_STATE_PATH) < 0) {
-                       nsm_log(LOG_WARNING,
+                       xlog(L_ERROR,
                                "Cannot create %s: %m", _SM_STATE_PATH);
                        exit(1);
                }
@@ -680,70 +756,6 @@ nsm_get_state(int update)
        return state;
 }
 
-/*
- * Address handling utilities
- */
-
-int
-addr_get_port(nsm_address *addr)
-{
-       switch (((struct sockaddr *) addr)->sa_family) {
-       case AF_INET:
-               return ntohs(((struct sockaddr_in *) addr)->sin_port);
-       case AF_INET6:
-               return ntohs(((struct sockaddr_in6 *) addr)->sin6_port);
-       }
-       return 0;
-}
-
-static void
-addr_set_port(nsm_address *addr, int port)
-{
-       switch (((struct sockaddr *) addr)->sa_family) {
-       case AF_INET:
-               ((struct sockaddr_in *) addr)->sin_port = htons(port);
-               break;
-       case AF_INET6:
-               ((struct sockaddr_in6 *) addr)->sin6_port = htons(port);
-       }
-}
-
-static struct addrinfo *
-host_lookup(int af, const char *name)
-{
-       struct addrinfo hints, *ai;
-
-       memset(&hints, 0, sizeof(hints));
-       hints.ai_family = af;
-       hints.ai_protocol = IPPROTO_UDP;
-
-       if (getaddrinfo(name, NULL, &hints, &ai) != 0)
-               return NULL;
-
-       return ai;
-}
-
-/*
- * Log a message
- */
-void
-nsm_log(int fac, const char *fmt, ...)
-{
-       va_list ap;
-
-       if (fac == LOG_DEBUG && !opt_debug)
-               return;
-
-       va_start(ap, fmt);
-       if (log_syslog)
-               vsyslog(fac, fmt, ap);
-       else {
-               vfprintf(stderr, fmt, ap);
-               fputs("\n", stderr);
-       }
-       va_end(ap);
-}
-
 /*
  * Record pid in /var/run/sm-notify.pid
  * This file should remain until a reboot, even if the
@@ -759,7 +771,10 @@ static int record_pid(void)
        fd = open("/var/run/sm-notify.pid", O_CREAT|O_EXCL|O_WRONLY, 0600);
        if (fd < 0)
                return 0;
-       write(fd, pid, strlen(pid));
+       if (write(fd, pid, strlen(pid)) != strlen(pid))  {
+               xlog_warn("Writing to pid file failed: errno %d (%m)",
+                               errno);
+       }
        close(fd);
        return 1;
 }
@@ -778,16 +793,15 @@ static void drop_privs(void)
        }
 
        if (st.st_uid == 0) {
-               nsm_log(LOG_WARNING,
-                       "sm-notify running as root. chown %s to choose different user\n",
-                   _SM_DIR_PATH);
+               xlog_warn("Running as 'root'.  "
+                       "chown %s to choose different user", _SM_DIR_PATH);
                return;
        }
 
        setgroups(0, NULL);
        if (setgid(st.st_gid) == -1
            || setuid(st.st_uid) == -1) {
-               nsm_log(LOG_ERR, "Fail to drop privileges");
+               xlog(L_ERROR, "Fail to drop privileges");
                exit(1);
        }
 }
@@ -795,12 +809,16 @@ static void drop_privs(void)
 static void set_kernel_nsm_state(int state)
 {
        int fd;
+       const char *file = "/proc/sys/fs/nfs/nsm_local_state";
 
-       fd = open("/proc/sys/fs/nfs/nsm_local_state",O_WRONLY);
+       fd = open(file ,O_WRONLY);
        if (fd >= 0) {
                char buf[20];
                snprintf(buf, sizeof(buf), "%d", state);
-               write(fd, buf, strlen(buf));
+               if (write(fd, buf, strlen(buf)) != strlen(buf)) {
+                       xlog_warn("Writing to '%s' failed: errno %d (%m)",
+                               file, errno);
+               }
                close(fd);
        }
 }