diff options
Diffstat (limited to 'src/interfaces/libpq')
| -rw-r--r-- | src/interfaces/libpq/Makefile.in | 11 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-auth.c | 10 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in index a5675bd5e0..7b5bb61adc 100644 --- a/src/interfaces/libpq/Makefile.in +++ b/src/interfaces/libpq/Makefile.in @@ -6,7 +6,7 @@ # Copyright (c) 1994, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.59 2000/06/06 22:01:03 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.60 2000/06/17 00:10:09 petere Exp $ # #------------------------------------------------------------------------- @@ -19,11 +19,6 @@ include $(SRCDIR)/Makefile.global CFLAGS+= -DFRONTEND -ifdef KRBVERS -CFLAGS+= $(KRBFLAGS) -SHLIB_LINK += $(KRBLIBS) -endif - OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \ pqexpbuffer.o dllist.o pqsignal.o @SNPRINTF@ @INET_ATON@ @@ -35,6 +30,10 @@ endif # make sure it gets included in shared libpq. SHLIB_LINK+= $(findstring -lcrypt,$(LIBS)) +# Include kerberos libraries into libpq +SHLIB_LINK += $(KRB_LIBS) + + # Shared library stuff, also default 'all' target include $(SRCDIR)/Makefile.shlib diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index 8cb9a889ad..e0f1bd7533 100644 --- a/src/interfaces/libpq/fe-auth.c +++ b/src/interfaces/libpq/fe-auth.c @@ -10,7 +10,7 @@ * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes). * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.42 2000/05/27 04:13:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.43 2000/06/17 00:10:09 petere Exp $ * *------------------------------------------------------------------------- */ @@ -119,7 +119,7 @@ static void pg_krb4_init() { char *realm; - static init_done = 0; + static int init_done = 0; if (init_done) return; @@ -129,7 +129,7 @@ pg_krb4_init() * If the user set PGREALM, then we use a ticket file with a special * name: <usual-ticket-file-name>@<PGREALM-value> */ - if (realm = getenv("PGREALM")) + if ((realm = getenv("PGREALM"))) { char tktbuf[MAXPGPATH]; @@ -184,7 +184,7 @@ pg_krb4_authname(char *PQerrormsg) * (canonicalized to omit all domain suffixes). */ static int -pg_krb4_sendauth(const char *PQerrormsg, int sock, +pg_krb4_sendauth(char *PQerrormsg, int sock, struct sockaddr_in * laddr, struct sockaddr_in * raddr, const char *hostname) @@ -213,7 +213,7 @@ pg_krb4_sendauth(const char *PQerrormsg, int sock, (u_long) 0, (MSG_DAT *) NULL, (CREDENTIALS *) NULL, - (Key_schedule *) NULL, + NULL, laddr, raddr, PG_KRB4_VERSION); |