From: Volker Lendecke <vl@samba.org>
Date: Sat, 3 Mar 2012 20:40:27 +0000 (+0100)
Subject: s3: Fix some && vs & warnings
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=b6f4a5d0eedc40e71ddefc30a9c41194ead4f899

s3: Fix some && vs & warnings

Signed-off-by: Andreas Schneider <asn@samba.org>

Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Sun Mar  4 13:31:25 CET 2012 on sn-devel-104
---

diff --git a/source3/rpc_server/epmapper/srv_epmapper.c b/source3/rpc_server/epmapper/srv_epmapper.c
index c492580258c..58f22202643 100644
--- a/source3/rpc_server/epmapper/srv_epmapper.c
+++ b/source3/rpc_server/epmapper/srv_epmapper.c
@@ -743,7 +743,7 @@ error_status_t _epm_Lookup(struct pipes_struct *p,
 					if (r->in.interface_id->vers_major ==
 					    (eps->e[i].syntax_id.if_version >> 16) &&
 					    r->in.interface_id->vers_minor <=
-					    (eps->e[i].syntax_id.if_version && 0xFFFF)) {
+					    (eps->e[i].syntax_id.if_version & 0xFFFF)) {
 						match = true;
 					}
 					break;
@@ -756,7 +756,7 @@ error_status_t _epm_Lookup(struct pipes_struct *p,
 					if (r->in.interface_id->vers_major ==
 					    (eps->e[i].syntax_id.if_version >> 16) &&
 					    r->in.interface_id->vers_minor ==
-					    (eps->e[i].syntax_id.if_version && 0xFFFF)) {
+					    (eps->e[i].syntax_id.if_version & 0xFFFF)) {
 						match = true;
 					}
 					match = true;
@@ -789,7 +789,7 @@ error_status_t _epm_Lookup(struct pipes_struct *p,
 						if (r->in.interface_id->vers_major ==
 						    (eps->e[i].syntax_id.if_version >> 16) &&
 						    r->in.interface_id->vers_minor >=
-						    (eps->e[i].syntax_id.if_version && 0xFFFF)) {
+						    (eps->e[i].syntax_id.if_version & 0xFFFF)) {
 							match = true;
 						}
 					}