Jurka.
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/libpq/md5.c,v 1.25 2004/08/29 04:12:32 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/libpq/md5.c,v 1.26 2004/09/27 04:18:28 neilc Exp $
*/
-/*
- * NOTE:
- *
- * There are two copies of this file, one in backend/libpq and another
- * in interfaces/odbc. They should be identical. This is done so ODBC
- * can be compiled stand-alone.
- */
-
-#if ! defined(MD5_ODBC) && ! defined(FRONTEND)
+#if ! defined(FRONTEND)
#include "postgres.h"
#include "libpq/crypt.h"
#endif
#ifdef FRONTEND
#include "postgres_fe.h"
#include "libpq/crypt.h"
-#endif /* FRONTEND */
-#ifdef MD5_ODBC
-#include "md5.h"
-#endif
-
-#ifdef FRONTEND
#undef palloc
#define palloc malloc
#undef pfree
#define pfree free
-#endif
+#endif /* FRONTEND */
/*
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/c.h,v 1.174 2004/09/26 15:13:42 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/c.h,v 1.175 2004/09/27 04:18:28 neilc Exp $
*
*-------------------------------------------------------------------------
*/
* used for numerical computations and the
* frontend/backend protocol.
*/
-/* Also defined in interfaces/odbc/md5.h */
#ifndef HAVE_UINT8
typedef unsigned char uint8; /* == 8 bits */
typedef unsigned short uint16; /* == 16 bits */
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/libpq/crypt.h,v 1.28 2004/08/29 04:13:07 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/libpq/crypt.h,v 1.29 2004/09/27 04:18:28 neilc Exp $
*
*-------------------------------------------------------------------------
*/
#include "libpq/libpq-be.h"
-/* Also defined in interfaces/odbc/md5.h */
#define MD5_PASSWD_LEN 35
#define isMD5(passwd) (strncmp((passwd),"md5",3) == 0 && \
extern bool md5_hash(const void *buff, size_t len, char *hexsum);
extern bool CheckMD5Pwd(char *passwd, char *storedpwd, char *seed);
-/* Also defined in interfaces/odbc/md5.h */
extern bool EncryptMD5(const char *passwd, const char *salt,
size_t salt_len, char *buf);