diff --git a/lib/msf/core/exploit/smb/server/share.rb b/lib/msf/core/exploit/smb/server/share.rb
index 6f66c7e217..90b1847a1d 100644
--- a/lib/msf/core/exploit/smb/server/share.rb
+++ b/lib/msf/core/exploit/smb/server/share.rb
@@ -29,7 +29,7 @@ module Msf
 
       include Msf::Exploit::Remote::SMB::Server
 
-      FLAGS = CONST::FLAGS_REQ_RES + CONST::FLAGS_CASE_SENSITIVE
+      FLAGS = CONST::FLAGS_REQ_RES | CONST::FLAGS_CASE_SENSITIVE
 
       FLAGS2 = CONST::FLAGS2_UNICODE_STRINGS |
         CONST::FLAGS2_EXTENDED_SECURITY |
diff --git a/lib/msf/core/exploit/smb/server/share/information_level/find.rb b/lib/msf/core/exploit/smb/server/share/information_level/find.rb
index b1762ce42f..45f3846ced 100644
--- a/lib/msf/core/exploit/smb/server/share/information_level/find.rb
+++ b/lib/msf/core/exploit/smb/server/share/information_level/find.rb
@@ -59,7 +59,7 @@ module Msf
             find_file.v['FileName'] = data
 
             pkt['Payload']['SMB'].v['Command'] = CONST::SMB_COM_TRANSACTION2
-            pkt['Payload']['SMB'].v['Flags1'] = 0x88
+            pkt['Payload']['SMB'].v['Flags1'] = FLAGS
             pkt['Payload']['SMB'].v['Flags2'] = FLAGS2
             pkt['Payload']['SMB'].v['WordCount'] = 10
             pkt['Payload'].v['ParamCountTotal'] = 10
@@ -108,7 +108,7 @@ module Msf
 
             # If its asking for a file, return file
             pkt['Payload']['SMB'].v['Command'] = CONST::SMB_COM_TRANSACTION2
-            pkt['Payload']['SMB'].v['Flags1'] = 0x88
+            pkt['Payload']['SMB'].v['Flags1'] = FLAGS
             pkt['Payload']['SMB'].v['Flags2'] = FLAGS2
             pkt['Payload']['SMB'].v['WordCount'] = 10
             pkt['Payload'].v['ParamCountTotal'] = 10
diff --git a/lib/msf/core/exploit/smb/server/share/information_level/query.rb b/lib/msf/core/exploit/smb/server/share/information_level/query.rb
index 06aa51eb36..8c135cb643 100644
--- a/lib/msf/core/exploit/smb/server/share/information_level/query.rb
+++ b/lib/msf/core/exploit/smb/server/share/information_level/query.rb
@@ -12,8 +12,8 @@ module Msf
             pkt = CONST::SMB_TRANS_RES_PKT.make_struct
             smb_set_defaults(c, pkt)
             pkt['Payload']['SMB'].v['Command'] = CONST::SMB_COM_TRANSACTION2
-            pkt['Payload']['SMB'].v['ErrorClass'] = 0xC0000034 # OBJECT_NAME_NOT_FOUND
-            pkt['Payload']['SMB'].v['Flags1'] = 0x88
+            pkt['Payload']['SMB'].v['ErrorClass'] = CONST::SMB_STATUS_OBJECT_NAME_NOT_FOUND
+            pkt['Payload']['SMB'].v['Flags1'] = FLAGS
             pkt['Payload']['SMB'].v['Flags2'] = FLAGS2
             c.put(pkt.to_s)
             return
@@ -35,7 +35,7 @@ module Msf
             smb_set_defaults(c, pkt)
 
             pkt['Payload']['SMB'].v['Command'] = CONST::SMB_COM_TRANSACTION2
-            pkt['Payload']['SMB'].v['Flags1'] = 0x88
+            pkt['Payload']['SMB'].v['Flags1'] = FLAGS
             pkt['Payload']['SMB'].v['Flags2'] = FLAGS2
             pkt['Payload']['SMB'].v['WordCount'] = 10
             pkt['Payload'].v['ParamCountTotal'] = 2
@@ -73,8 +73,8 @@ module Msf
               attrib = CONST::SMB_EXT_FILE_ATTR_DIRECTORY # File attributes => directory
             else
               pkt['Payload']['SMB'].v['Command'] = CONST::SMB_COM_TRANSACTION2
-              pkt['Payload']['SMB'].v['ErrorClass'] = 0xC0000034 # OBJECT_NAME_NOT_FOUND
-              pkt['Payload']['SMB'].v['Flags1'] = 0x88
+              pkt['Payload']['SMB'].v['ErrorClass'] = CONST::SMB_STATUS_OBJECT_NAME_NOT_FOUND # OBJECT_NAME_NOT_FOUND
+              pkt['Payload']['SMB'].v['Flags1'] = FLAGS
               pkt['Payload']['SMB'].v['Flags2'] = FLAGS2
               c.put(pkt.to_s)
               return
@@ -95,7 +95,7 @@ module Msf
             query_path_info.v['ExtFileAttributes'] = attrib
 
             pkt['Payload']['SMB'].v['Command'] = CONST::SMB_COM_TRANSACTION2
-            pkt['Payload']['SMB'].v['Flags1'] = 0x88
+            pkt['Payload']['SMB'].v['Flags1'] = FLAGS
             pkt['Payload']['SMB'].v['Flags2'] = FLAGS2
             pkt['Payload']['SMB'].v['WordCount'] = 10
             pkt['Payload'].v['ParamCountTotal'] = 2
@@ -135,7 +135,7 @@ module Msf
               attrib = 1 # File attributes => directory
             else
               pkt['Payload']['SMB'].v['Command'] = CONST::SMB_COM_TRANSACTION2
-              pkt['Payload']['SMB'].v['ErrorClass'] = 0xC0000034 # OBJECT_NAME_NOT_FOUND
+              pkt['Payload']['SMB'].v['ErrorClass'] = CONST::SMB_STATUS_OBJECT_NAME_NOT_FOUND # OBJECT_NAME_NOT_FOUND
               pkt['Payload']['SMB'].v['Flags1'] = 0x88
               pkt['Payload']['SMB'].v['Flags2'] = FLAGS2
               c.put(pkt.to_s)
@@ -156,7 +156,7 @@ module Msf
             smb_set_defaults(c, pkt)
 
             pkt['Payload']['SMB'].v['Command'] = CONST::SMB_COM_TRANSACTION2
-            pkt['Payload']['SMB'].v['Flags1'] = 0x88
+            pkt['Payload']['SMB'].v['Flags1'] = FLAGS
             pkt['Payload']['SMB'].v['Flags2'] = FLAGS2
             pkt['Payload']['SMB'].v['WordCount'] = 10
             pkt['Payload'].v['ParamCountTotal'] = 2