diff options
| author | Neil Conway | 2004-09-27 04:18:28 +0000 |
|---|---|---|
| committer | Neil Conway | 2004-09-27 04:18:28 +0000 |
| commit | c1a17f7f942450065e7b929c5ad3a84b9c4b7cfd (patch) | |
| tree | 846f0ee2bd5d8bd923c47f6265c3f7f5c3334767 | |
| parent | 6fbdc120d698ba9db21a3fb3066c756d426abac2 (diff) | |
Remove references to the ODBC driver from the main source tree. From Kris
Jurka.
| -rw-r--r-- | src/backend/libpq/md5.c | 18 | ||||
| -rw-r--r-- | src/include/c.h | 1 | ||||
| -rw-r--r-- | src/include/libpq/crypt.h | 2 |
3 files changed, 2 insertions, 19 deletions
diff --git a/src/backend/libpq/md5.c b/src/backend/libpq/md5.c index 56695c3a23..bf8981cb7c 100644 --- a/src/backend/libpq/md5.c +++ b/src/backend/libpq/md5.c @@ -18,15 +18,7 @@ */ -/* - * 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 @@ -34,18 +26,12 @@ #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 */ /* diff --git a/src/include/c.h b/src/include/c.h index 041a6f45f2..741ea16212 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -231,7 +231,6 @@ typedef signed int int32; /* == 32 bits */ * 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 */ diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h index 97edfc602e..c1b83f18f0 100644 --- a/src/include/libpq/crypt.h +++ b/src/include/libpq/crypt.h @@ -15,7 +15,6 @@ #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 && \ @@ -27,7 +26,6 @@ extern int md5_crypt_verify(const Port *port, const char *user, 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); |