diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-01 15:35:59 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-01 16:42:02 +0100 |
| commit | f2b9160f099805e50607e71e93d8344bfe073b48 (patch) | |
| tree | b28336292294f11971ae7ce92a47b247d2d6580b /sal | |
| parent | 746074a0c05f47532e4c126a7d6ea0f4dd88d444 (diff) | |
humour me, and sync this with osl/w32/security.c
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/qa/osl/security/osl_Security.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index ea59027de43e..afd441bfbc2b 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx @@ -523,7 +523,7 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, psia=GetSidIdentifierAuthority(pSid); /* obtain sidsubauthority count */ - dwSubAuthorities=*GetSidSubAuthorityCount(pSid)<=5?*GetSidSubAuthorityCount(pSid):5; + dwSubAuthorities=min(*GetSidSubAuthorityCount(pSid), 5); /* buffer length: S-SID_REVISION- + identifierauthority- + subauthorities- + NULL */ Ident=(sal_Char * )malloc(88*sizeof(sal_Char)); |