Merge branch 'master' into jennifer/trp-devel

diff --combined gsscon/gsscon_active.c
index f8dc166,fe4d1e8..1f4d91f
--- 1/gsscon/gsscon_active.c
--- 2/gsscon/gsscon_active.c
+++ b/gsscon/gsscon_active.c
@@@ -54,6 -54,7 +54,7 @@@
  
  #include <stdio.h>
  #include <stdlib.h>
+ #include <netdb.h>
  
  #include <gsscon.h>
  
@@@ -85,7 -86,7 +86,7 @@@ int gsscon_connect (const char *inHost
      
      if (!err) {
          hp = gethostbyname (inHost);
-         if (hp == NULL) { err = errno; }
+         if (hp == NULL) { err = h_errno; }
      }
      
      if (!err) {
@@@ -199,6 -200,7 +200,6 @@@
          OM_uint32 requestedFlags = (GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG | GSS_C_SEQUENCE_FLAG | 
                                      GSS_C_CONF_FLAG | GSS_C_INTEG_FLAG);
          
 -      // printf ("Calling gss_init_sec_context...\n");
          majorStatus = gss_init_sec_context (&minorStatus, 
                                              clientCredentials, 
                                              &gssContext,