[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1103-g7e8e91a

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  7e8e91aeb3795d26ae8591665981bc42d8b6122f (commit)
       via  e289a0c8592f9e5c58100ddcde2577b452725b88 (commit)
      from  7f9fe7da1e25bcc730f4c4226bf77f6d39b5ace4 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 7e8e91aeb3795d26ae8591665981bc42d8b6122f
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jan 4 23:26:47 2008 -0800

    More logical operation on bool.
    Jeremy.

commit e289a0c8592f9e5c58100ddcde2577b452725b88
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jan 4 23:24:15 2008 -0800

    More logical operations on booleans. IBM checker.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/auth/auth_domain.c    |    4 +++-
 source/auth/auth_winbind.c   |    4 +++-
 source/nmbd/nmbd_elections.c |    4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/auth/auth_domain.c b/source/auth/auth_domain.c
index b2c8717..1de9869 100644
--- a/source/auth/auth_domain.c
+++ b/source/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/source/auth/auth_winbind.c b/source/auth/auth_winbind.c
index 959c550..b24aa3a 100644
--- a/source/auth/auth_winbind.c
+++ b/source/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)) {
diff --git a/source/nmbd/nmbd_elections.c b/source/nmbd/nmbd_elections.c
index bafe87c..b50d215 100644
--- a/source/nmbd/nmbd_elections.c
+++ b/source/nmbd/nmbd_elections.c
@@ -336,7 +336,9 @@ bool check_elections(void)
 	for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
 		struct work_record *work;
 		for (work = subrec->workgrouplist; work; work = work->next) {
-			run_any_election |= work->RunningElection;
+			if (work->RunningElection) {
+				run_any_election = work->RunningElection;
+			}
 
 			/* 
 			 * Start an election if we have any chance of winning.


-- 
Samba Shared Repository