The branch, master has been updated
via b6f4a5d s3: Fix some && vs & warnings
from 48e9d7e selftest: Rework Samba3.pm process termination
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b6f4a5d0eedc40e71ddefc30a9c41194ead4f899
Author: Volker Lendecke <[email protected]>
Date: Sat Mar 3 21:40:27 2012 +0100
s3: Fix some && vs & warnings
Signed-off-by: Andreas Schneider <[email protected]>
Autobuild-User: Andreas Schneider <[email protected]>
Autobuild-Date: Sun Mar 4 13:31:25 CET 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_server/epmapper/srv_epmapper.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/epmapper/srv_epmapper.c
b/source3/rpc_server/epmapper/srv_epmapper.c
index c492580..58f2220 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;
}
}
--
Samba Shared Repository
