s3: Fix some && vs & warnings
authorVolker Lendecke <vl@samba.org>
Sat, 3 Mar 2012 20:40:27 +0000 (21:40 +0100)
committerAndreas Schneider <asn@cryptomilk.org>
Sun, 4 Mar 2012 12:31:25 +0000 (13:31 +0100)
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

source3/rpc_server/epmapper/srv_epmapper.c

index c492580..58f2220 100644 (file)
@@ -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;
                                                }
                                        }