Revert part of recent include patch not ready for application.

[postgresql] / src / interfaces / libpq / fe-auth.c

diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 4ad50a7a48d895e331e9115b7af2fc2b09849ff8..3c9f5548785c2aac4cc8597da98ddf5ab044b2d6 100644 (file)
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -3,14 +3,14 @@
  * fe-auth.c
  *        The front-end (client) authorization routines
  *
- * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTE: the error message strings returned by this module must not
  * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.111 2006/02/12 20:04:42 momjian Exp $
+ *       $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.118 2006/07/14 04:59:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -50,7 +50,7 @@
 #include "libpq-fe.h"
 #include "libpq-int.h"
 #include "fe-auth.h"
-#include "libpq/crypt.h"
+#include "libpq/md5.h"
 
 
 #ifdef KRB5
@@ -188,10 +188,10 @@ pg_krb5_destroy(struct krb5_info *info)
 
 
 /*
- * pg_krb5_authname -- returns a pointer to static space containing whatever
- *                                        name the user has authenticated to the system
-  */
-static const char *
+ * pg_krb5_authname -- returns a copy of whatever name the user
+ *                                        has authenticated to the system, or NULL
+ */
+static char *
 pg_krb5_authname(char *PQerrormsg)
 {
        char *tmp_name;
@@ -520,7 +520,7 @@ char *
 pg_fe_getauthname(char *PQerrormsg)
 {
 #ifdef KRB5
-       const char *krb5_name = NULL;
+       char       *krb5_name = NULL;
 #endif
        const char *name = NULL;
        char       *authn;