diff options
| author | Jeremy Allison <jra@samba.org> | 2008-01-04 23:24:15 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-01-04 23:24:15 -0800 |
| commit | 99e349b35da5ea5df0889a8eccc0c9774ecc24e9 (patch) | |
| tree | 0ca6516e26368e98ca72ba49d27838591a38f07b | |
| parent | c6a2292724036340f766d774e64d6738d702478d (diff) | |
| download | samba-99e349b35da5ea5df0889a8eccc0c9774ecc24e9.tar.gz samba-99e349b35da5ea5df0889a8eccc0c9774ecc24e9.tar.bz2 samba-99e349b35da5ea5df0889a8eccc0c9774ecc24e9.zip | |
More logical operations on booleans. IBM checker.
Jeremy.
(This used to be commit e289a0c8592f9e5c58100ddcde2577b452725b88)
| -rw-r--r-- | source3/auth/auth_domain.c | 4 | ||||
| -rw-r--r-- | source3/auth/auth_winbind.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c index b2c87174fd..1de9869f90 100644 --- a/source3/auth/auth_domain.c +++ b/source3/auth/auth_domain.c @@ -270,7 +270,9 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx, &info3); if (NT_STATUS_IS_OK(nt_status)) { - (*server_info)->was_mapped |= user_info->was_mapped; + if (user_info->was_mapped) { + (*server_info)->was_mapped = user_info->was_mapped; + } if ( ! (*server_info)->guest) { /* if a real user check pam account restrictions */ diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c index 959c550524..b24aa3a75b 100644 --- a/source3/auth/auth_winbind.c +++ b/source3/auth/auth_winbind.c @@ -134,7 +134,9 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context, } if (NT_STATUS_IS_OK(nt_status)) { - (*server_info)->was_mapped |= user_info->was_mapped; + if (user_info->was_mapped) { + (*server_info)->was_mapped = user_info->was_mapped; + } } } } else if (NT_STATUS_IS_OK(nt_status)) { |