Commitcb7fc63

Neil Conway

committed

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

Jurka.

1 parent64a6059 commitcb7fc63Copy full SHA for cb7fc63

File tree

-22

lines changed

-22

lines changed

Lines changed: 3 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,38 +14,24 @@`
`14`	`14`	`*Portions Copyright (c) 1994, Regents of the University of California`
`15`	`15`	`*`
`16`	`16`	`* IDENTIFICATION`
`17`		`- * $PostgreSQL: pgsql/src/backend/libpq/md5.c,v 1.25 2004/08/29 04:12:32 momjian Exp $`
	`17`	`+ * $PostgreSQL: pgsql/src/backend/libpq/md5.c,v 1.26 2004/09/27 04:18:28 neilc Exp $`
`18`	`18`	`*/`
`19`	`19`
`20`	`20`
`21`		`-/*`
`22`		`- *NOTE:`
`23`		`- *`
`24`		`- *There are two copies of this file, one in backend/libpq and another`
`25`		`- *in interfaces/odbc. They should be identical.This is done so ODBC`
`26`		`- *can be compiled stand-alone.`
`27`		`- */`
`28`		`-`
`29`		`-#if ! defined(MD5_ODBC)&& ! defined(FRONTEND)`
	`21`	`+#if ! defined(FRONTEND)`
`30`	`22`	`#include"postgres.h"`
`31`	`23`	`#include"libpq/crypt.h"`
`32`	`24`	`#endif`
`33`	`25`
`34`	`26`	`#ifdefFRONTEND`
`35`	`27`	`#include"postgres_fe.h"`
`36`	`28`	`#include"libpq/crypt.h"`
`37`		`-#endif/* FRONTEND */`
`38`	`29`
`39`		`-#ifdefMD5_ODBC`
`40`		`-#include"md5.h"`
`41`		`-#endif`
`42`		`-`
`43`		`-#ifdefFRONTEND`
`44`	`30`	`#undef palloc`
`45`	`31`	`#definepalloc malloc`
`46`	`32`	`#undef pfree`
`47`	`33`	`#definepfree free`
`48`		`-#endif`
	`34`	`+#endif/* FRONTEND */`
`49`	`35`
`50`	`36`
`51`	`37`	`/*`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group`
`13`	`13`	`* Portions Copyright (c) 1994, Regents of the University of California`
`14`	`14`	`*`
`15`		`- * $PostgreSQL: pgsql/src/include/c.h,v 1.174 2004/09/26 15:13:42 tgl Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/include/c.h,v 1.175 2004/09/27 04:18:28 neilc Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -231,7 +231,6 @@ typedef signed int int32;/* == 32 bits */`
`231`	`231`	`*used for numerical computations and the`
`232`	`232`	`*frontend/backend protocol.`
`233`	`233`	`*/`
`234`		`-/* Also defined in interfaces/odbc/md5.h */`
`235`	`234`	`#ifndefHAVE_UINT8`
`236`	`235`	`typedefunsignedcharuint8;/* == 8 bits */`
`237`	`236`	`typedefunsigned shortuint16;/* == 16 bits */`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/libpq/crypt.h,v 1.28 2004/08/29 04:13:07 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/libpq/crypt.h,v 1.29 2004/09/27 04:18:28 neilc Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -15,7 +15,6 @@`
`15`	`15`
`16`	`16`	`#include"libpq/libpq-be.h"`
`17`	`17`
`18`		`-/* Also defined in interfaces/odbc/md5.h */`
`19`	`18`	`#defineMD5_PASSWD_LEN35`
`20`	`19`
`21`	`20`	`#defineisMD5(passwd)(strncmp((passwd),"md5",3) == 0 && \`
`@@ -27,7 +26,6 @@ extern int md5_crypt_verify(const Port port, const char user,`
`27`	`26`	`externboolmd5_hash(constvoidbuff,size_tlen,charhexsum);`
`28`	`27`	`externboolCheckMD5Pwd(charpasswd,charstoredpwd,char*seed);`
`29`	`28`
`30`		`-/* Also defined in interfaces/odbc/md5.h */`
`31`	`29`	`externboolEncryptMD5(constcharpasswd,constcharsalt,`
`32`	`30`	`size_tsalt_len,char*buf);`
`33`	`31`

Comments

(0)