summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-03-03 21:40:27 +0100
committerAndreas Schneider <asn@cryptomilk.org>2012-03-04 13:31:25 +0100
commitb6f4a5d0eedc40e71ddefc30a9c41194ead4f899 (patch)
tree7636e8c17a17bf56f9e6e024cc12aacf75d2ec0a
parent48e9d7efce1be3b09ed19b3d9a5bf3a3df3800e7 (diff)
downloadsamba-b6f4a5d0eedc40e71ddefc30a9c41194ead4f899.tar.gz
samba-b6f4a5d0eedc40e71ddefc30a9c41194ead4f899.tar.bz2
samba-b6f4a5d0eedc40e71ddefc30a9c41194ead4f899.zip
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
-rw-r--r--source3/rpc_server/epmapper/srv_epmapper.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/rpc_server/epmapper/srv_epmapper.c b/source3/rpc_server/epmapper/srv_epmapper.c
index c492580258..58f2220264 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;
}
}