diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/libpq/hba.h | 26 | ||||
| -rw-r--r-- | src/include/libpq/libpq-be.h | 5 |
2 files changed, 26 insertions, 5 deletions
diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index 16150846622..3af7db9e626 100644 --- a/src/include/libpq/hba.h +++ b/src/include/libpq/hba.h @@ -4,7 +4,7 @@ * Interface to hba.c * * - * $PostgreSQL: pgsql/src/include/libpq/hba.h,v 1.48 2008/08/01 09:09:48 mha Exp $ + * $PostgreSQL: pgsql/src/include/libpq/hba.h,v 1.49 2008/09/15 12:32:57 mha Exp $ * *------------------------------------------------------------------------- */ @@ -12,6 +12,7 @@ #define HBA_H #include "nodes/pg_list.h" +#include "libpq/pqcomm.h" typedef enum UserAuth @@ -33,10 +34,31 @@ typedef enum UserAuth #endif } UserAuth; +typedef enum ConnType +{ + ctLocal, + ctHost, + ctHostSSL, + ctHostNoSSL +} ConnType; + +typedef struct +{ + int linenumber; + ConnType conntype; + char *database; + char *role; + struct sockaddr_storage addr; + struct sockaddr_storage mask; + UserAuth auth_method; + char *usermap; + char *auth_arg; +} HbaLine; + typedef struct Port hbaPort; extern List **get_role_line(const char *role); -extern void load_hba(void); +extern bool load_hba(void); extern void load_ident(void); extern void load_role(void); extern int hba_getauthmethod(hbaPort *port); diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 6927da2fd08..4d5e0039c89 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.66 2008/04/26 22:47:40 tgl Exp $ + * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.67 2008/09/15 12:32:57 mha Exp $ * *------------------------------------------------------------------------- */ @@ -121,8 +121,7 @@ typedef struct Port /* * Information that needs to be held during the authentication cycle. */ - UserAuth auth_method; - char *auth_arg; + HbaLine *hba; char md5Salt[4]; /* Password salt */ char cryptSalt[2]; /* Password salt */ |