mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove references to the ODBC driver from the main source tree. From Kris

Browse Source 
Jurka.
This commit is contained in:
Neil Conway 2004-09-27 04:18:28 +00:00
parent 64a60590ba
commit cb7fc63d3e
3 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/libpq/md5.c
View File

@ -14,19 +14,11 @@
* 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
@ -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 */
/*

3
src/include/c.h
View File

@ -12,7 +12,7 @@
* 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 $
*
*-------------------------------------------------------------------------
*/
@ -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 */

4
src/include/libpq/crypt.h
View File

@ -6,7 +6,7 @@
* 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 $
*
*-------------------------------------------------------------------------
*/
@ -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);