mirror of
https://github.com/postgres/postgres.git
synced 2025-08-24 09:27:52 +03:00
New pgindent run with fixes suggested by Tom. Patch manually reviewed,
initdb/regression tests pass.
This commit is contained in:
Bruce Momjian
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.71 2001/10/28 06:25:44 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.72 2001/11/05 17:46:25 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -60,7 +60,7 @@ static struct pam_conv pam_passw_conv = {
|
||||
static char *pam_passwd = NULL; /* Workaround for Solaris 2.6 brokenness */
|
||||
static Port *pam_port_cludge; /* Workaround for passing "Port *port"
|
||||
* into pam_passwd_conv_proc */
|
||||
#endif /* USE_PAM */
|
||||
#endif /* USE_PAM */
|
||||
|
||||
#ifdef KRB4
|
||||
/*----------------------------------------------------------------
|
||||
@@ -144,7 +144,7 @@ pg_krb4_recvauth(Port *port)
|
||||
|
||||
return STATUS_ERROR;
|
||||
}
|
||||
#endif /* KRB4 */
|
||||
#endif /* KRB4 */
|
||||
|
||||
|
||||
#ifdef KRB5
|
||||
@@ -325,7 +325,7 @@ pg_krb5_recvauth(Port *port)
|
||||
|
||||
return STATUS_ERROR;
|
||||
}
|
||||
#endif /* KRB5 */
|
||||
#endif /* KRB5 */
|
||||
|
||||
|
||||
/*
|
||||
@@ -467,7 +467,7 @@ auth_failed(Port *port, int status)
|
||||
case uaPAM:
|
||||
authmethod = "PAM";
|
||||
break;
|
||||
#endif /* USE_PAM */
|
||||
#endif /* USE_PAM */
|
||||
}
|
||||
|
||||
elog(FATAL, "%s authentication failed for user \"%s\"",
|
||||
@@ -586,7 +586,7 @@ ClientAuthentication(Port *port)
|
||||
pam_port_cludge = port;
|
||||
status = CheckPAMAuth(port, port->user, "");
|
||||
break;
|
||||
#endif /* USE_PAM */
|
||||
#endif /* USE_PAM */
|
||||
|
||||
case uaTrust:
|
||||
status = STATUS_OK;
|
||||
@@ -819,7 +819,7 @@ CheckPAMAuth(Port *port, char *user, char *password)
|
||||
else
|
||||
return STATUS_ERROR;
|
||||
}
|
||||
#endif /* USE_PAM */
|
||||
#endif /* USE_PAM */
|
||||
|
||||
|
||||
/*
|
||||
@@ -920,7 +920,7 @@ map_old_to_new(Port *port, UserAuth old, int status)
|
||||
case uaReject:
|
||||
#ifdef USE_PAM
|
||||
case uaPAM:
|
||||
#endif /* USE_PAM */
|
||||
#endif /* USE_PAM */
|
||||
status = STATUS_ERROR;
|
||||
break;
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/libpq/crypt.c,v 1.41 2001/11/02 18:39:57 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/libpq/crypt.c,v 1.42 2001/11/05 17:46:25 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -31,8 +31,8 @@
|
||||
#define CRYPT_PWD_FILE "pg_pwd"
|
||||
|
||||
|
||||
static char **pwd_cache = NULL;
|
||||
static int pwd_cache_count = 0;
|
||||
static char **pwd_cache = NULL;
|
||||
static int pwd_cache_count = 0;
|
||||
|
||||
/*
|
||||
* crypt_getpwdfilename --- get full pathname of password file
|
||||
@@ -91,8 +91,8 @@ compar_user(const void *user_a, const void *user_b)
|
||||
login_b = *((char **) user_b);
|
||||
|
||||
/*
|
||||
* We only really want to compare the user logins which are first
|
||||
* and are terminated by CRYPT_PWD_FILE_SEPSTR. (NB: this code
|
||||
* We only really want to compare the user logins which are first and
|
||||
* are terminated by CRYPT_PWD_FILE_SEPSTR. (NB: this code
|
||||
* effectively assumes that CRYPT_PWD_FILE_SEPSTR is just one char.)
|
||||
*/
|
||||
len_a = strcspn(login_a, CRYPT_PWD_FILE_SEPSTR);
|
||||
@@ -134,10 +134,10 @@ load_password_cache(void)
|
||||
}
|
||||
|
||||
/*
|
||||
* Read the file and store its lines in current memory context,
|
||||
* which we expect will be PostmasterContext. That context will
|
||||
* live as long as we need the cache to live, ie, until just after
|
||||
* each postmaster child has completed client authentication.
|
||||
* Read the file and store its lines in current memory context, which
|
||||
* we expect will be PostmasterContext. That context will live as
|
||||
* long as we need the cache to live, ie, until just after each
|
||||
* postmaster child has completed client authentication.
|
||||
*/
|
||||
while (fgets(buffer, sizeof(buffer), pwd_file) != NULL)
|
||||
{
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.76 2001/10/28 06:25:44 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.77 2001/11/05 17:46:25 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -1262,4 +1262,4 @@ GetCharSetByHost(char *TableName, int host, const char *DataDir)
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* CYR_RECODE */
|
||||
#endif /* CYR_RECODE */
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: pqcomm.c,v 1.122 2001/10/25 05:49:30 momjian Exp $
|
||||
* $Id: pqcomm.c,v 1.123 2001/11/05 17:46:25 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -232,7 +232,7 @@ StreamServerPort(int family, char *hostName, unsigned short portNumber,
|
||||
*/
|
||||
unlink(sock_path);
|
||||
}
|
||||
#endif /* HAVE_UNIX_SOCKETS */
|
||||
#endif /* HAVE_UNIX_SOCKETS */
|
||||
|
||||
if (family == AF_INET)
|
||||
{
|
||||
@@ -344,7 +344,7 @@ StreamServerPort(int family, char *hostName, unsigned short portNumber,
|
||||
return STATUS_ERROR;
|
||||
}
|
||||
}
|
||||
#endif /* HAVE_UNIX_SOCKETS */
|
||||
#endif /* HAVE_UNIX_SOCKETS */
|
||||
|
||||
/*
|
||||
* Select appropriate accept-queue length limit. PG_SOMAXCONN is only
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.29 2001/03/22 03:59:30 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.30 2001/11/05 17:46:25 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -65,7 +65,7 @@ PacketReceiveFragment(Port *port)
|
||||
got = read(port->sock, pkt->ptr, pkt->nrtodo);
|
||||
#else
|
||||
got = recv(port->sock, pkt->ptr, pkt->nrtodo, 0);
|
||||
#endif /* __BEOS__ */
|
||||
#endif /* __BEOS__ */
|
||||
if (got > 0)
|
||||
{
|
||||
pkt->nrtodo -= got;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.24 2001/09/21 17:06:12 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.25 2001/11/05 17:46:25 momjian Exp $
|
||||
*
|
||||
* NOTES
|
||||
* This shouldn't be in libpq, but the monitor and some other
|
||||
@@ -147,5 +147,5 @@ pqsignal(int signo, pqsigfunc func)
|
||||
if (sigaction(signo, &act, &oact) < 0)
|
||||
return SIG_ERR;
|
||||
return oact.sa_handler;
|
||||
#endif /* !HAVE_POSIX_SIGNALS */
|
||||
#endif /* !HAVE_POSIX_SIGNALS */
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user