sm-notify: Use my_name when sending SM_NOTIFY requests

[nfs-utils.git] / utils / statd / sm-notify.c

diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c
index 3259a3e973d774de310f93065fcc1c867a026124..2d146687f706dca0a8cc70dc38ebd80405ddcdac 100644 (file)
--- a/utils/statd/sm-notify.c
+++ b/utils/statd/sm-notify.c
@@ -54,7 +54,7 @@ struct nsm_host {
        uint32_t                xid;
 };
 
-static char            nsm_hostname[256];
+static char            nsm_hostname[SM_MAXSTRLEN + 1];
 static int             nsm_state;
 static int             nsm_family = AF_INET;
 static int             opt_debug = 0;
@@ -412,12 +412,33 @@ usage:            fprintf(stderr,
                }
        }
 
-       if (opt_srcaddr) {
-               strncpy(nsm_hostname, opt_srcaddr, sizeof(nsm_hostname)-1);
-       } else
-       if (gethostname(nsm_hostname, sizeof(nsm_hostname)) < 0) {
-               xlog(L_ERROR, "Failed to obtain name of local host: %m");
-               exit(1);
+       if (opt_srcaddr != NULL) {
+               struct addrinfo *ai = NULL;
+               struct addrinfo hint = {
+                       .ai_family      = AF_UNSPEC,
+                       .ai_flags       = AI_NUMERICHOST,
+               };
+
+               if (getaddrinfo(opt_srcaddr, NULL, &hint, &ai))
+                       /* not a presentation address - use it */
+                       strncpy(nsm_hostname, opt_srcaddr, sizeof(nsm_hostname));
+               else {
+                       /* was a presentation address - look it up in
+                        * /etc/hosts, so it can be used for my_name */
+                       int error;
+
+                       freeaddrinfo(ai);
+                       hint.ai_flags = AI_CANONNAME;
+                       error = getaddrinfo(opt_srcaddr, NULL, &hint, &ai);
+                       if (error != 0) {
+                               xlog(L_ERROR, "Bind address %s is unusable: %s",
+                                               opt_srcaddr, gai_strerror(error));
+                               exit(1);
+                       }
+                       strncpy(nsm_hostname, ai->ai_canonname,
+                                                       sizeof(nsm_hostname));
+                       freeaddrinfo(ai);
+               }
        }
 
        (void)nsm_retire_monitored_hosts();
@@ -535,6 +556,8 @@ notify(const int sock)
 static int
 notify_host(int sock, struct nsm_host *host)
 {
+       const char *my_name = (opt_srcaddr != NULL ?
+                                       nsm_hostname : host->my_name);
        struct sockaddr *sap;
        socklen_t salen;
 
@@ -580,8 +603,8 @@ notify_host(int sock, struct nsm_host *host)
                host->xid = nsm_xmit_rpcbind(sock, sap, SM_PROG, SM_VERS);
        else
                host->xid = nsm_xmit_notify(sock, sap, salen,
-                               SM_PROG, nsm_hostname, nsm_state);
-       
+                                       SM_PROG, my_name, nsm_state);
+
        return 0;
 }