commit 26886167dc4210d3ca09a7a8561a6a014b00b382
author adrikim <akim@duo.com> Fri Sep 14 10:35:59 2018 -0400
committer adrikim <akim@duo.com> Fri Sep 14 10:35:59 2018 -0400
tree cb9407959fc74cc1abfcd170f98d91c00ae4d5fc
parent 28edf6baf9e9d7f3c9ef77858237fc0c8daee140

Prevent freeaddrinfo call when getaddrinfo does not populate info struct, some whitespace cleanup

lib/duo.c

diff --git a/lib/duo.c b/lib/duo.c
index 667ee25..8fcf2fd 100644
--- a/lib/duo.c
+++ b/lib/duo.c
@@ -47,7 +47,7 @@
 
 /*
  * Finding the maximum length for the machine's hostname
- * Idea and technique originated from https://github.com/openssh/openssh-portable 
+ * Idea and technique originated from https://github.com/openssh/openssh-portable
  */
 #ifndef HOST_NAME_MAX
 # include "netdb.h" /* for MAXHOSTNAMELEN */
@@ -231,7 +231,7 @@
         ctx->argv[ctx->argc++] = p;
         ret = DUO_OK;
     }
-    
+
     free(k);
     free(v);
 
@@ -249,45 +249,39 @@
 }
 
 
-static void 
-_duo_get_hostname(struct duo_ctx *ctx, char *dns_fqdn, int dns_fqdn_size)
+static void
+_duo_get_hostname(char *dns_fqdn, size_t dns_fqdn_size)
 {
     struct addrinfo hints, *info, *p;
-    int error;
-
     char hostname[HOST_NAME_MAX + 1];
-    /* gethostname may not insert a null terminator when it needs to truncate the hostname */
+
+    /* gethostname may not insert a null terminator when it needs to truncate the hostname.
+     * See gethostname's man page under "Description" for more info.
+     */
     hostname[HOST_NAME_MAX] = '\0';
     gethostname(hostname, HOST_NAME_MAX);
     memset(&hints, 0, sizeof(hints));
-    
+
     hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
     hints.ai_flags = AI_CANONNAME;
     strlcpy(dns_fqdn, hostname, dns_fqdn_size);
-    
-    if ((error = getaddrinfo(hostname, NULL, &hints, &info)) != 0) {
-        _duo_seterr(ctx, "%s", gai_strerror(error));
-    }
-    else {
+
+    if (getaddrinfo(hostname, NULL, &hints, &info) == 0) {
         if(info->ai_canonname != NULL && strlen(info->ai_canonname) > 0) {
             strlcpy(dns_fqdn, info->ai_canonname, dns_fqdn_size);
         }
-    } 
-    
-    freeaddrinfo(info);
+        freeaddrinfo(info);
+    }
 }
 
 int
 _duo_add_hostname_param(struct duo_ctx *ctx)
 {
     char dns_fqdn[DNS_MAXNAMELEN];
-    _duo_get_hostname(ctx, dns_fqdn, sizeof(dns_fqdn));
+    _duo_get_hostname(dns_fqdn, sizeof(dns_fqdn));
 
-    if(duo_add_param(ctx, "hostname", dns_fqdn) != DUO_OK) {
-        return (DUO_LIB_ERROR);
-    }
-    return (DUO_OK);
+    return duo_add_param(ctx, "hostname", dns_fqdn);
 }
 
 #define _BSON_FIND(ctx, it, obj, name, type) do {           \
@@ -408,11 +402,11 @@
             return (DUO_LIB_ERROR);
         }
     }
-    
+
     if(_duo_add_hostname_param(ctx) != DUO_OK) {
         return (DUO_LIB_ERROR);
     }
- 
+
     if ((ret = duo_call(ctx, "POST", DUO_API_VERSION "/preauth.bson", ctx->https_timeout)) != DUO_OK ||
         (ret = _duo_bson_response(ctx, obj)) != DUO_OK) {
         return (ret);