Commit40f32f3

committed

Add conditional inclusion of <com_err.h> to support old 'heimdal'

version of Kerberos. Per report from Reinhard Max.

1 parent2ec1aa4 commit40f32f3Copy full SHA for 40f32f3

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.121 2004/12/31 21:59:50 pgsql Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.122 2005/01/12 21:37:53 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -150,6 +150,10 @@ pg_krb4_recvauth(Port *port)`
`150`	`150`	`*/`
`151`	`151`
`152`	`152`	`#include<krb5.h>`
	`153`	`+/* Some old versions of Kerberos do not include <com_err.h> in <krb5.h> */`
	`154`	`+#if !defined(__COM_ERR_H)&& !defined(__COM_ERR_H__)`
	`155`	`+#include<com_err.h>`
	`156`	`+#endif`
`153`	`157`
`154`	`158`	`/*`
`155`	`159`	`* pg_an_to_ln -- return the local name corresponding to an authentication`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.98 2005/01/04 23:18:25 tgl Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.99 2005/01/12 21:37:54 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -243,6 +243,10 @@ pg_krb4_sendauth(char *PQerrormsg, int sock,`
`243`	`243`	`*/`
`244`	`244`
`245`	`245`	`#include<krb5.h>`
	`246`	`+/* Some old versions of Kerberos do not include <com_err.h> in <krb5.h> */`
	`247`	`+#if !defined(__COM_ERR_H)&& !defined(__COM_ERR_H__)`
	`248`	`+#include<com_err.h>`
	`249`	`+#endif`
`246`	`250`
`247`	`251`	`/*`
`248`	`252`	`* pg_an_to_ln -- return the local name corresponding to an authentication`

Comments

(0)