oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

min instead of MIN

Browse Source 
The MIN macro is not defined everywhere.  use min().

Change-Id: I47413080364e215ad2a2075403b224867deba037
This commit is contained in:
Jeffrey Altman
2014-02-04 23:18:08 -05:00
parent 8de592ab5a
commit 3e2ca4be37
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ntlm/ntlm.c
View File

@@ -1006,21 +1006,21 @@ heim_ntlm_decode_type3(const struct ntlm_buf *buf,
CHECK(type, 3);
CHECK(ret_sec_buffer(in, &lm), 0);
if (lm.allocated)
min_offset = MIN(min_offset, lm.offset);
min_offset = min(min_offset, lm.offset);
CHECK(ret_sec_buffer(in, &ntlm), 0);
if (ntlm.allocated)
min_offset = MIN(min_offset, ntlm.offset);
min_offset = min(min_offset, ntlm.offset);
CHECK(ret_sec_buffer(in, &target), 0);
min_offset = MIN(min_offset, target.offset);
min_offset = min(min_offset, target.offset);
CHECK(ret_sec_buffer(in, &username), 0);
min_offset = MIN(min_offset, username.offset);
min_offset = min(min_offset, username.offset);
CHECK(ret_sec_buffer(in, &ws), 0);
if (ws.allocated)
min_offset = MIN(min_offset, ws.offset);
min_offset = min(min_offset, ws.offset);
if (min_offset >= 52) {
CHECK(ret_sec_buffer(in, &sessionkey), 0);
min_offset = MIN(min_offset, sessionkey.offset);
min_offset = min(min_offset, sessionkey.offset);
CHECK(krb5_ret_uint32(in, &type3->flags), 0);
}
if (min_offset >= 52 + SIZE_SEC_BUFFER + 4 + SIZE_OS_VERSION) {