projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
214 spelling fixes
[exim.git]
/
src
/
src
/
auths
/
cram_md5.c
diff --git
a/src/src/auths/cram_md5.c
b/src/src/auths/cram_md5.c
index 28526a6329a659d67a05a773e77373b4ef1f6d0b..1ae38a9a63b9301e6a8fb84072b8239dc1d81503 100644
(file)
--- a/
src/src/auths/cram_md5.c
+++ b/
src/src/auths/cram_md5.c
@@
-38,7
+38,7
@@
address can appear in the tables drtables.c. */
int auth_cram_md5_options_count =
sizeof(auth_cram_md5_options)/sizeof(optionlist);
int auth_cram_md5_options_count =
sizeof(auth_cram_md5_options)/sizeof(optionlist);
-/* Default private options block for the con
tid
ion authentication method. */
+/* Default private options block for the con
dit
ion authentication method. */
auth_cram_md5_options_block auth_cram_md5_option_defaults = {
NULL, /* server_secret */
auth_cram_md5_options_block auth_cram_md5_option_defaults = {
NULL, /* server_secret */
@@
-73,7
+73,7
@@
if (ob->client_secret != NULL)
/*************************************************
/*************************************************
-* Pe
form the CRAM-MD5 algorithm
*
+* Pe
rform the CRAM-MD5 algorithm
*
*************************************************/
/* The CRAM-MD5 algorithm is described in RFC 2195. It computes
*************************************************/
/* The CRAM-MD5 algorithm is described in RFC 2195. It computes
@@
-261,9
+261,9
@@
int i;
uschar digest[16];
/* If expansion of either the secret or the user name failed, return CANCELLED
uschar digest[16];
/* If expansion of either the secret or the user name failed, return CANCELLED
-or ERROR, as approriate. */
+or ERROR, as appro
p
riate. */
-if (
secret == NULL || name == NULL
)
+if (
!secret || !name
)
{
if (expand_string_forcedfail)
{
{
if (expand_string_forcedfail)
{
@@
-272,7
+272,7
@@
if (secret == NULL || name == NULL)
}
string_format(buffer, buffsize, "expansion of \"%s\" failed in "
"%s authenticator: %s",
}
string_format(buffer, buffsize, "expansion of \"%s\" failed in "
"%s authenticator: %s",
-
(secret == NULL)
? ob->client_secret : ob->client_name,
+
!secret
? ob->client_secret : ob->client_name,
ablock->name, expand_string_message);
return ERROR;
}
ablock->name, expand_string_message);
return ERROR;
}
@@
-282,7
+282,7
@@
in base 64. */
if (smtp_write_command(outblock, FALSE, "AUTH %s\r\n", ablock->public_name) < 0)
return FAIL_SEND;
if (smtp_write_command(outblock, FALSE, "AUTH %s\r\n", ablock->public_name) < 0)
return FAIL_SEND;
-if (
smtp_read_response(inblock, (uschar *)buffer, buffsize, '3', timeout) < 0
)
+if (
!smtp_read_response(inblock, buffer, buffsize, '3', timeout)
)
return FAIL;
if (b64decode(buffer + 4, &challenge) < 0)
return FAIL;
if (b64decode(buffer + 4, &challenge) < 0)
@@
-299,8
+299,7
@@
compute_cram_md5(secret, challenge, digest);
/* Create the response from the user name plus the CRAM-MD5 digest */
string_format(big_buffer, big_buffer_size - 36, "%s", name);
/* Create the response from the user name plus the CRAM-MD5 digest */
string_format(big_buffer, big_buffer_size - 36, "%s", name);
-p = big_buffer;
-while (*p != 0) p++;
+for (p = big_buffer; *p; ) p++;
*p++ = ' ';
for (i = 0; i < 16; i++)
*p++ = ' ';
for (i = 0; i < 16; i++)
@@
-317,8
+316,8
@@
buffer[0] = 0;
if (smtp_write_command(outblock, FALSE, "%s\r\n", b64encode(big_buffer,
p - big_buffer)) < 0) return FAIL_SEND;
if (smtp_write_command(outblock, FALSE, "%s\r\n", b64encode(big_buffer,
p - big_buffer)) < 0) return FAIL_SEND;
-return smtp_read_response(inblock, (uschar *)buffer, buffsize, '2', timeout)
?
- OK : FAIL;
+return smtp_read_response(inblock, (uschar *)buffer, buffsize, '2', timeout)
+
?
OK : FAIL;
}
#endif /* STAND_ALONE */
}
#endif /* STAND_ALONE */