diff options
| author | Robert Haas <rhaas@postgresql.org> | 2016-06-09 18:02:36 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2016-06-09 18:02:36 -0400 |
| commit | 4bc424b968058c7f0aa685821d7039e86faac99c (patch) | |
| tree | a4e245ae67bd11edb3926ff5fb3b0223438ac283 /src/backend/libpq/auth.c | |
| parent | 9164deea2f4ac90ee5e008ff41fc5ad4423887b2 (diff) | |
| download | postgresql-4bc424b968058c7f0aa685821d7039e86faac99c.tar.gz postgresql-4bc424b968058c7f0aa685821d7039e86faac99c.zip | |
pgindent run for 9.6
Diffstat (limited to 'src/backend/libpq/auth.c')
| -rw-r--r-- | src/backend/libpq/auth.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 43bb1343550..7d8fc3e54d0 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -1875,7 +1875,7 @@ CheckPAMAuth(Port *port, char *user, char *password) retval = pg_getnameinfo_all(&port->raddr.addr, port->raddr.salen, hostinfo, sizeof(hostinfo), NULL, 0, - port->hba->pam_use_hostname ? 0 : NI_NUMERICHOST | NI_NUMERICSERV); + port->hba->pam_use_hostname ? 0 : NI_NUMERICHOST | NI_NUMERICSERV); if (retval != 0) { ereport(WARNING, @@ -1934,7 +1934,7 @@ CheckPAMAuth(Port *port, char *user, char *password) { ereport(LOG, (errmsg("pam_set_item(PAM_RHOST) failed: %s", - pam_strerror(pamh, retval)))); + pam_strerror(pamh, retval)))); pam_passwd = NULL; return STATUS_ERROR; } @@ -1996,8 +1996,8 @@ CheckPAMAuth(Port *port, char *user, char *password) static int CheckBSDAuth(Port *port, char *user) { - char *passwd; - int retval; + char *passwd; + int retval; /* Send regular password request to client, and get the response */ sendAuthRequest(port, AUTH_REQ_PASSWORD); @@ -2539,11 +2539,10 @@ CheckRADIUSAuth(Port *port) radius_add_attribute(packet, RADIUS_NAS_IDENTIFIER, (unsigned char *) identifier, strlen(identifier)); /* - * RADIUS password attributes are calculated as: - * e[0] = p[0] XOR MD5(secret + Request Authenticator) - * for the first group of 16 octets, and then: - * e[i] = p[i] XOR MD5(secret + e[i-1]) - * for the following ones (if necessary) + * RADIUS password attributes are calculated as: e[0] = p[0] XOR + * MD5(secret + Request Authenticator) for the first group of 16 octets, + * and then: e[i] = p[i] XOR MD5(secret + e[i-1]) for the following ones + * (if necessary) */ encryptedpasswordlen = ((strlen(passwd) + RADIUS_VECTOR_LENGTH - 1) / RADIUS_VECTOR_LENGTH) * RADIUS_VECTOR_LENGTH; cryptvector = palloc(strlen(port->hba->radiussecret) + RADIUS_VECTOR_LENGTH); @@ -2554,7 +2553,11 @@ CheckRADIUSAuth(Port *port) for (i = 0; i < encryptedpasswordlen; i += RADIUS_VECTOR_LENGTH) { memcpy(cryptvector + strlen(port->hba->radiussecret), md5trailer, RADIUS_VECTOR_LENGTH); - /* .. and for subsequent iterations the result of the previous XOR (calculated below) */ + + /* + * .. and for subsequent iterations the result of the previous XOR + * (calculated below) + */ md5trailer = encryptedpassword + i; if (!pg_md5_binary(cryptvector, strlen(port->hba->radiussecret) + RADIUS_VECTOR_LENGTH, encryptedpassword + i)) @@ -2565,7 +2568,7 @@ CheckRADIUSAuth(Port *port) return STATUS_ERROR; } - for (j = i; j < i+RADIUS_VECTOR_LENGTH; j++) + for (j = i; j < i + RADIUS_VECTOR_LENGTH; j++) { if (j < strlen(passwd)) encryptedpassword[j] = passwd[j] ^ encryptedpassword[j]; |