Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc4213ae

Browse files
committed
From: Phil Thompson <phil@river-bank.demon.co.uk>
Cleanup patches for previous protocol changes patch
1 parent7c3dc8f commitc4213ae

File tree

7 files changed

+128
-22
lines changed

7 files changed

+128
-22
lines changed

‎src/Makefile.global.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.32 1998/01/15 19:41:35 pgsql Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.33 1998/01/27 03:24:51 scrappy Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -157,10 +157,10 @@ USE_TCL= @USE_TCL@
157157
#
158158
TCL_INCDIR= /usr/local/include
159159
TCL_LIBDIR= /usr/local/lib
160-
TCL_LIB= -ltcl80
160+
TCL_LIB= -ltcl8.0
161161
TK_INCDIR= /usr/local/include
162162
TK_LIBDIR= /usr/local/lib
163-
TK_LIB= -ltk80
163+
TK_LIB= -ltk8.0
164164

165165
USE_PERL= @USE_PERL@
166166

‎src/backend/libpq/auth.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.22 1998/01/27 03:11:41 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.23 1998/01/27 03:24:54 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -401,7 +401,7 @@ void be_recvauth(Port *port)
401401
if (hba_getauthmethod(&port->raddr,port->database,port->auth_arg,
402402
&port->auth_method)!=STATUS_OK)
403403
{
404-
PacketSendError(&port->pktInfo,"Error getting authentication method");
404+
PacketSendError(&port->pktInfo,"Missing or mis-configured pg_hba.conf file");
405405
return;
406406
}
407407

‎src/backend/libpq/hba.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.26 1998/01/26 01:41:08 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.27 1998/01/27 03:24:56 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -337,8 +337,15 @@ process_open_config_file(FILE *file, SockAddr *raddr, const char database[],
337337
}
338338
}
339339

340-
if (found_entry&& !error)
340+
if (!error)
341+
{
342+
/* If no entry was found then force a rejection. */
343+
344+
if (!found_entry)
345+
*userauth_p=uaReject;
346+
341347
*host_ok_p= true;
348+
}
342349
}
343350

344351

‎src/backend/libpq/pg_hba.conf.sample

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,3 +122,8 @@
122122
# connect as Postgres user "guest1", the connection is only allowed if
123123
# there is an entry for map "omicron" in pg_ident.conf that says "bryanh" is
124124
# allowed to connect as "guest1".
125+
126+
# By default, allow anything over UNIX domain sockets and localhost.
127+
128+
local all trust
129+
host all 127.0.0.1 255.255.255.255 trust

‎src/backend/libpq/pqcomm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.35 1998/01/26 01:41:11 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.36 1998/01/27 03:25:01 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -619,7 +619,7 @@ StreamServerPort(char *hostName, short portName, int *fdP)
619619
errno);
620620
pqdebug("%s",PQerrormsg);
621621
strcat(PQerrormsg,"\tIs another postmaster already running on that port?\n");
622-
if (family==AF_UNIX)
622+
if (family==AF_UNIX)
623623
strcat(PQerrormsg,"\tIf not, remove socket node (/tmp/.s.PGSQL.<portnr>)and retry.\n");
624624
else
625625
strcat(PQerrormsg,"\tIf not, wait a few seconds and retry.\n");

‎src/backend/parser/scan.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* A lexical scanner generated by flex */
22

33
/* Scanner skeleton version:
4-
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.9 1998/01/24 19:40:56 scrappy Exp $
4+
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.10 1998/01/27 03:25:07 scrappy Exp $
55
*/
66

77
#defineFLEX_SCANNER
@@ -539,7 +539,7 @@ char *yytext;
539539
*
540540
*
541541
* IDENTIFICATION
542-
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.9 1998/01/24 19:40:56 scrappy Exp $
542+
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.10 1998/01/27 03:25:07 scrappy Exp $
543543
*
544544
*-------------------------------------------------------------------------
545545
*/

‎src/man/pg_hba.conf.5

Lines changed: 105 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,114 @@
11
.\" This is -*-nroff-*-
2-
.\" $Header: /cvsroot/pgsql/src/man/Attic/pg_hba.conf.5,v 1.3 1997/08/26 17:30:03 momjian Exp $
3-
.TH pg_hba.conf 511/04/96 Postgres Postgres
2+
.\" $Header: /cvsroot/pgsql/src/man/Attic/pg_hba.conf.5,v 1.4 1998/01/27 03:25:14 scrappy Exp $
3+
.TH pg_hba.conf 51/26/98 PostgreSQL PostgreSQL
44
.SH NAME
55
$PGDATA/pg_hba.conf
66
.SH DESCRIPTION
7-
"Host-based access control" is the name for the basic controls Postgres
8-
exercises on what clients are allowed to access a database system.
9-
It is called that because one of the factors that can control access is
10-
from what host the client is connecting.
7+
"Host-based access control" is the name for the basic controls PostgreSQL
8+
exercises on what clients are allowed to access a database and how
9+
the users on those clients must authenticate themselves.
1110
.PP
12-
Each database system contains a file named "pg_hba.conf", in its PGDATA
13-
directory, that controls who can connect tothat database system.
11+
Each database system contains a file named "pg_hba.conf", in its$PGDATA
12+
directory, that controls who can connect toeach database.
1413
.PP
15-
The exact format of the pg_hba.conf file is described in the comments at
16-
the top of the sample file pg_hba.conf.sample, which resides in the
17-
the PostgreSQL "lib" sub-directory of the main postgres directory.
14+
Every client that wants to access to a database
15+
.IR must
16+
be covered by one of
17+
the entries in pg_hba.conf. Otherwise all attempted connections from that
18+
client will be rejected with a "User authentication failed" error message.
19+
.PP
20+
The general format of the pg_hba.conf file is of a set of records, one per
21+
line. Blank lines and lines beginning with '#' are ignored. A record is
22+
made up of a number of fields which are separated by spaces and/or tabs.
23+
.PP
24+
Connections from clients can be made using UNIX domain sockets or Internet
25+
domain sockets (ie. TCP/IP). Connections made using UNIX domain sockets
26+
are controlled using records of the following format.
27+
.PP
28+
local <database> <authentication method>
29+
.PP
30+
<database> specifies the database that this record applies to. The value
31+
.IR all
32+
specifies that it applies to all databases. <authentication method>
33+
specifies the method a user must use to authenticate themselves when
34+
connecting to that database using UNIX domain sockets. The different methods
35+
are described below.
36+
.PP
37+
Connections made using Internet domain sockets are controlled using records
38+
of the following format.
39+
.PP
40+
host <database> <TCP/IP address> <TCP/IP mask> <authentication method>
41+
.PP
42+
The <TCP/IP mask> is logically anded to both the specified <TCP/IP address>
43+
and the TCP/IP address
44+
of the connecting client. If the two values that result are equal then the
45+
record is used for this connection. If a connection matches more than one
46+
record then the earliest one in the file is used. Both the <TCP/IP address>
47+
and the <TCP/IP mask> are specified in dotted decimal notation.
48+
.PP
49+
If a connection fails to match any record then the
50+
.IR reject
51+
authentication method is applied (see below).
52+
.SH "AUTHENTICATION METHODS"
53+
The following authentication methods are supported for both UNIX and TCP/IP
54+
domain sockets.
55+
.PP
56+
.IR trust
57+
- the connection is allowed unconditionally.
58+
.PP
59+
.IR reject
60+
- the connection is rejected unconditionally.
61+
.PP
62+
.IR crypt
63+
- the client is asked for a password for the user. This is sent encrypted
64+
(using crypt(3)) and compared against the password held in the pg_user table.
65+
If the passwords match, the connection is allowed.
66+
.PP
67+
.IR password
68+
- the client is asked for a password for the user. This is sent in clear
69+
and compared against the password held in the pg_user table.
70+
If the passwords match, the connection is allowed. An optional password file
71+
may be specified after the
72+
.IR password
73+
keyword which is used to match the supplied password rather than the pg_user
74+
table. See pg_passwd(1).
75+
.PP
76+
The following authentication methods are supported for TCP/IP
77+
domain sockets only.
78+
.PP
79+
.IR krb4
80+
- Kerberos V4 is used to authenticate the user.
81+
.PP
82+
.IR krb5
83+
- Kerberos V5 is used to authenticate the user.
84+
.PP
85+
.IR ident
86+
- the ident server on the client is used to authenticate the user (RFC 1413).
87+
An optional map name may be specified after the
88+
.IR ident
89+
keyword which allows ident user names to be mapped onto PostgreSQL user names.
90+
Maps are held in the file $PGDATA/pg_ident.conf.
91+
.SH EXAMPLES
92+
93+
# Trust any connection via UNIX domain sockets.
94+
95+
localtrust
96+
97+
# Trust any connection via TCP/IP from this machine.
98+
99+
hostall127.0.0.1255.255.255.255trust
100+
101+
# We don't like this machine.
102+
103+
hostall192.168.0.10255.255.255.0reject
104+
105+
# This machine can't encrypt so we ask for passwords in clear.
106+
107+
hostall192.168.0.3255.255.255.0password
108+
109+
# The rest of this group of machines should provide encrypted passwords.
110+
111+
hostall192.168.0.0255.255.255.0crypt
18112

19113
.SH "SEE ALSO"
20114
pgintro(1).

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp