From 064a36b3888a8eee6352d35bdcd4453f1c4dc50a Mon Sep 17 00:00:00 2001
From: Margaret Wasserman <mrw@painless-security.com>
Date: Sat, 15 Mar 2014 06:10:00 -0400
Subject: [PATCH] Debugging printfs for trust router port number.

---
 gsscon/gsscon_active.c | 12 ++++++++----
 include/gsscon.h       |  2 +-
 tid/tidc.c             |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/gsscon/gsscon_active.c b/gsscon/gsscon_active.c
index 30d1954..0b03926 100755
--- a/gsscon/gsscon_active.c
+++ b/gsscon/gsscon_active.c
@@ -52,11 +52,15 @@
  * or implied warranty.
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <gsscon.h>
 
-/* --------------------------------------------------------------------------- */
+/* ---------------------------------------------------------------------------
+*/
 
-int gsscon_connect (const char *inHost, int inPort, const char *inServiceName, int *outFD, gss_ctx_id_t *outGSSContext)
+int gsscon_connect (const char *inHost, unsigned int inPort, const char *inServiceName, int *outFD, gss_ctx_id_t *outGSSContext)
 {
     int err = 0;
     int fd = -1;
@@ -94,16 +98,16 @@ int gsscon_connect (const char *inHost, int inPort, const char *inServiceName, i
     }
     
     if (!err) {
+        fprintf (stderr, "gss_connect: Connecting to host '%s' on port %d\n", inHost, inPort);
         err = connect (fd, (struct sockaddr *) &saddr, sizeof (saddr));
         if (err < 0) { err = errno; }
     }
     
     if (!err) {
-        printf ("connecting to host '%s' on port %d\n", inHost, inPort);
         *outFD = fd;
         fd = -1; /* takes ownership */
     } else {
-         gsscon_print_error (err, "OpenConnection failed");
+        gsscon_print_error (err, "OpenConnection failed");
     }
     
     if (fd >= 0) { close (fd); }
diff --git a/include/gsscon.h b/include/gsscon.h
index e122eb6..e8aef7e 100644
--- a/include/gsscon.h
+++ b/include/gsscon.h
@@ -103,7 +103,7 @@ void gsscon_print_gss_errors (const char *inRoutineName,
 			      OM_uint32   inMinorStatus);
 
 int gsscon_connect (const char *inHost, 
-		    int inPort, 
+		    unsigned int inPort, 
 		    const char *inServiceName,
 		    int *outFD,
 		    gss_ctx_id_t *outGSSContext);
diff --git a/tid/tidc.c b/tid/tidc.c
index f35854e..90ac58e 100644
--- a/tid/tidc.c
+++ b/tid/tidc.c
@@ -33,7 +33,6 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <jansson.h>
 
 #include <trust_router/tr_dh.h>
@@ -69,6 +68,7 @@ int tidc_open_connection (TIDC_INSTANCE *tidc,
   int err = 0;
   int conn = -1;
 
+  fprintf(stderr, "tidc_open_connection: Opening GSS connection to %s:%u.", server, port);  
   err = gsscon_connect(server, port, "trustidentity", &conn, gssctx);
 
   if (!err)
-- 
2.1.4