Commit784fd04

committed

Enable GSSAPI to build using MSVC. Always build GSSAPI when Kerberos is

enabled, because the only Kerberos library supported always contains it.

1 parent65a513c commit784fd04Copy full SHA for 784fd04

File tree

+21

-11

lines changed

+21

-11

lines changed

Lines changed: 5 additions & 5 deletions

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.151 2007/07/12 14:36:52 mha Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.152 2007/07/12 14:43:20 mha Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -308,9 +308,9 @@ pg_krb5_recvauth(Port *port)`
`308`	`308`	`#include<gssapi/gssapi.h>`
`309`	`309`	`#endif`
`310`	`310`
`311`		`-#ifdefWIN32`
	`311`	`+#if defined(WIN32)&& !defined(WIN32_ONLY_COMPILER)`
`312`	`312`	`/*`
`313`		`- * MIT Kerberos GSSAPI DLL doesn't properly export the symbols`
	`313`	`+ * MIT Kerberos GSSAPI DLL doesn't properly export the symbols for MingW`
`314`	`314`	`* that contain the OIDs required. Redefine here, values copied`
`315`	`315`	`* from src/athena/auth/krb5/src/lib/gssapi/generic/gssapi_generic.c`
`316`	`316`	`*/`
`@@ -381,8 +381,8 @@ pg_GSS_recvauth(Port *port)`
`381`	`381`	`*/`
`382`	`382`	`if (!getenv("KRB5_KTNAME"))`
`383`	`383`	`{`
`384`		`-kt_path=palloc(PATH_MAX+13);`
`385`		`-snprintf(kt_path,PATH_MAX+13,`
	`384`	`+kt_path=palloc(MAXPGPATH+13);`
	`385`	`+snprintf(kt_path,MAXPGPATH+13,`
`386`	`386`	`"KRB5_KTNAME=%s",pg_krb_server_keyfile);`
`387`	`387`	`putenv(kt_path);`
`388`	`388`	`}`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group`
`12`	`12`	`* Portions Copyright (c) 1994, Regents of the University of California`
`13`	`13`	`*`
`14`		`- * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.60 2007/07/12 14:36:52 mha Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.61 2007/07/12 14:43:21 mha Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -34,8 +34,16 @@`
`34`	`34`	`#include<gssapi.h>`
`35`	`35`	`#else`
`36`	`36`	`#include<gssapi/gssapi.h>`
	`37`	`+#endif/* HAVE_GSSAPI_H */`
	`38`	`+/*`
	`39`	`+ * GSSAPI brings in headers that set a lot of things in the global namespace on win32,`
	`40`	`+ * that doesn't match the msvc build. It gives a bunch of compiler warnings that we ignore,`
	`41`	`+ * but also defines a symbol that simply does not exist. Undefine it again.`
	`42`	`+ */`
	`43`	`+#ifdefWIN32_ONLY_COMPILER`
	`44`	`+#undef HAVE_GETADDRINFO`
`37`	`45`	`#endif`
`38`		`-#endif`
	`46`	`+#endif/* ENABLE_GSS */`
`39`	`47`
`40`	`48`	`#include"libpq/hba.h"`
`41`	`49`	`#include"libpq/pqcomm.h"`

Lines changed: 3 additions & 3 deletions

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.126 2007/07/12 14:36:52 mha Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.127 2007/07/12 14:43:21 mha Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -335,9 +335,9 @@ pg_krb5_sendauth(char PQerrormsg, int sock, const char hostname, const char *s`
`335`	`335`	`#include<gssapi/gssapi.h>`
`336`	`336`	`#endif`
`337`	`337`
`338`		`-#ifdefWIN32`
	`338`	`+#if defined(WIN32)&& !defined(WIN32_ONLY_COMPILER)`
`339`	`339`	`/*`
`340`		`- * MIT Kerberos GSSAPI DLL doesn't properly export the symbols`
	`340`	`+ * MIT Kerberos GSSAPI DLL doesn't properly export the symbols for MingW`
`341`	`341`	`* that contain the OIDs required. Redefine here, values copied`
`342`	`342`	`* from src/athena/auth/krb5/src/lib/gssapi/generic/gssapi_generic.c`
`343`	`343`	`*/`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Solution;`
`3`	`3`	`#`
`4`	`4`	`# Package that encapsulates a Visual C++ solution file generation`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.28 2007/07/12 14:10:39 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.29 2007/07/12 14:43:21 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use strict;`
`@@ -125,6 +125,7 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY`
`125`	`125`	`print O"#define HAVE_KRB5_TICKET_ENC_PART2 1\n";`
`126`	`126`	`print O"#define HAVE_KRB5_FREE_UNPARSED_NAME 1\n";`
`127`	`127`	`print O"#define PG_KRB_SRVNAM\"postgres\"\n";`
	`128`	`+print O"#define ENABLE_GSS\n";`
`128`	`129`	`}`
`129`	`130`	`if (my$port =$self->{options}->{"--with-pgport"})`
`130`	`131`	`{`
`@@ -332,6 +333,7 @@ sub AddProject`
`332`	`333`	`$proj->AddIncludeDir($self->{options}->{krb5} .'\inc\krb5');`
`333`	`334`	`$proj->AddLibrary($self->{options}->{krb5} .'\lib\i386\krb5_32.lib');`
`334`	`335`	`$proj->AddLibrary($self->{options}->{krb5} .'\lib\i386\comerr32.lib');`
	`336`	`+$proj->AddLibrary($self->{options}->{krb5} .'\lib\i386\gssapi32.lib');`
`335`	`337`	`}`
`336`	`338`	`if ($self->{options}->{xml})`
`337`	`339`	`{`

Comments

(0)