[Cvs-cvs] Changes to ccvs/src/server.c

[Derek Robert Price]

Index: ccvs/src/server.c
diff -u ccvs/src/server.c:1.443 ccvs/src/server.c:1.444
--- ccvs/src/server.c:1.443     Tue Sep  6 00:40:51 2005
+++ ccvs/src/server.c   Tue Sep  6 04:55:09 2005
@@ -25,6 +25,7 @@
 #endif /* defined(SERVER_SUPPORT) || defined(CLIENT_SUPPORT) */
 
 #if defined (HAVE_GSSAPI) && defined (SERVER_SUPPORT)
+# include "canon-host.h"
 # include "gssapi-client.h"
 
 /* This stuff isn't included solely with SERVER_SUPPORT since some of these
@@ -7342,9 +7343,7 @@
 
 
 
-#ifdef HAVE_GSSAPI
-char *canon_host (const char *host);
-
+# ifdef HAVE_GSSAPI /* && SERVER_SUPPORT */
 /* Authenticate a GSSAPI connection.  This is called from
  * pserver_authenticate_connection, and it handles success and failure
  * the same way.
@@ -7369,8 +7368,8 @@
 
     hn = canon_host (server_hostname);
     if (!hn)
-       error (1, 0, "can't get canonical hostname for `%s'",
-              server_hostname);
+       error (1, 0, "can't get canonical hostname for `%s': %s",
+              server_hostname, ch_strerror ());
 
     sprintf (buf, "address@hidden", hn);
     free (hn);
@@ -7471,7 +7470,7 @@
     fflush (stdout);
 }
 
-#endif /* HAVE_GSSAPI */
+# endif /* HAVE_GSSAPI */
 
 #endif /* SERVER_SUPPORT */