mirror of
https://github.com/postgres/postgres.git
synced 2025-07-11 10:01:57 +03:00
pgindent run for release 9.3
This is the first run of the Perl-based pgindent script. Also update pgindent instructions.
This commit is contained in:
@ -827,7 +827,7 @@ pg_krb5_recvauth(Port *port)
|
||||
return ret;
|
||||
|
||||
retval = krb5_recvauth(pg_krb5_context, &auth_context,
|
||||
(krb5_pointer) &port->sock, pg_krb_srvnam,
|
||||
(krb5_pointer) & port->sock, pg_krb_srvnam,
|
||||
pg_krb5_server, 0, pg_krb5_keytab, &ticket);
|
||||
if (retval)
|
||||
{
|
||||
@ -2057,7 +2057,7 @@ InitializeLDAPConnection(Port *port, LDAP **ldap)
|
||||
{
|
||||
ldap_unbind(*ldap);
|
||||
ereport(LOG,
|
||||
(errmsg("could not set LDAP protocol version: %s", ldap_err2string(r))));
|
||||
(errmsg("could not set LDAP protocol version: %s", ldap_err2string(r))));
|
||||
return STATUS_ERROR;
|
||||
}
|
||||
|
||||
@ -2110,7 +2110,7 @@ InitializeLDAPConnection(Port *port, LDAP **ldap)
|
||||
{
|
||||
ldap_unbind(*ldap);
|
||||
ereport(LOG,
|
||||
(errmsg("could not start LDAP TLS session: %s", ldap_err2string(r))));
|
||||
(errmsg("could not start LDAP TLS session: %s", ldap_err2string(r))));
|
||||
return STATUS_ERROR;
|
||||
}
|
||||
}
|
||||
@ -2201,7 +2201,7 @@ CheckLDAPAuth(Port *port)
|
||||
{
|
||||
ereport(LOG,
|
||||
(errmsg("could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s",
|
||||
port->hba->ldapbinddn, port->hba->ldapserver, ldap_err2string(r))));
|
||||
port->hba->ldapbinddn, port->hba->ldapserver, ldap_err2string(r))));
|
||||
return STATUS_ERROR;
|
||||
}
|
||||
|
||||
@ -2226,7 +2226,7 @@ CheckLDAPAuth(Port *port)
|
||||
{
|
||||
ereport(LOG,
|
||||
(errmsg("could not search LDAP for filter \"%s\" on server \"%s\": %s",
|
||||
filter, port->hba->ldapserver, ldap_err2string(r))));
|
||||
filter, port->hba->ldapserver, ldap_err2string(r))));
|
||||
pfree(filter);
|
||||
return STATUS_ERROR;
|
||||
}
|
||||
@ -2236,16 +2236,16 @@ CheckLDAPAuth(Port *port)
|
||||
{
|
||||
if (count == 0)
|
||||
ereport(LOG,
|
||||
(errmsg("LDAP user \"%s\" does not exist", port->user_name),
|
||||
errdetail("LDAP search for filter \"%s\" on server \"%s\" returned no entries.",
|
||||
filter, port->hba->ldapserver)));
|
||||
(errmsg("LDAP user \"%s\" does not exist", port->user_name),
|
||||
errdetail("LDAP search for filter \"%s\" on server \"%s\" returned no entries.",
|
||||
filter, port->hba->ldapserver)));
|
||||
else
|
||||
ereport(LOG,
|
||||
(errmsg("LDAP user \"%s\" is not unique", port->user_name),
|
||||
errdetail_plural("LDAP search for filter \"%s\" on server \"%s\" returned %d entry.",
|
||||
"LDAP search for filter \"%s\" on server \"%s\" returned %d entries.",
|
||||
count,
|
||||
filter, port->hba->ldapserver, count)));
|
||||
(errmsg("LDAP user \"%s\" is not unique", port->user_name),
|
||||
errdetail_plural("LDAP search for filter \"%s\" on server \"%s\" returned %d entry.",
|
||||
"LDAP search for filter \"%s\" on server \"%s\" returned %d entries.",
|
||||
count,
|
||||
filter, port->hba->ldapserver, count)));
|
||||
|
||||
pfree(filter);
|
||||
ldap_msgfree(search_message);
|
||||
@ -2317,8 +2317,8 @@ CheckLDAPAuth(Port *port)
|
||||
if (r != LDAP_SUCCESS)
|
||||
{
|
||||
ereport(LOG,
|
||||
(errmsg("LDAP login failed for user \"%s\" on server \"%s\": %s",
|
||||
fulluser, port->hba->ldapserver, ldap_err2string(r))));
|
||||
(errmsg("LDAP login failed for user \"%s\" on server \"%s\": %s",
|
||||
fulluser, port->hba->ldapserver, ldap_err2string(r))));
|
||||
pfree(fulluser);
|
||||
return STATUS_ERROR;
|
||||
}
|
||||
|
Reference in New Issue
Block a user