Revert "remote arch doesn't work"
authorStefan Metzmacher <metze@samba.org>
Fri, 20 Aug 2010 16:20:03 +0000 (18:20 +0200)
committerStefan Metzmacher <metze@samba.org>
Thu, 26 Aug 2010 06:49:42 +0000 (08:49 +0200)
This reverts commit 676aeddb5a5cea5794953960c3cd51f18a30a975.

source3/smbd/negprot.c

index fb753694c366aa1600ba7d3ada03a9881b76c7b9..dd4d66aa29b632bbb5138eb536bea274d16fbcac 100644 (file)
@@ -519,7 +519,7 @@ protocol [SMB 2.???]
 #define ARCH_W2K8     0x10C    /* W2K8 is like XP/2K */
 #define ARCH_WIN7     0x30C    /* Win7 is like W2K8 */
  
-#define ARCH_ALL      0x7F
+#define ARCH_ALL      0x3FF
  
 /* List of supported protocols, most desired first */
 static const struct {
@@ -631,11 +631,11 @@ void reply_negprot(struct smb_request *req)
                        arch &= ( ARCH_WIN95 | ARCH_WINNT | ARCH_WIN2K
                                  | ARCH_CIFSFS);
                else if (strcsequal(cliprotos[i], "SMB 2.001"))
-                       arch = ARCH_VISTA;
+                       arch &= ( ARCH_VISTA );
                else if (strcsequal(cliprotos[i], "SMB 2.002"))
-                       arch = ARCH_W2K8;
+                       arch &= ( ARCH_W2K8 );
                else if (strcsequal(cliprotos[i], "SMB 2.???"))
-                       arch = ARCH_WIN7;
+                       arch &= ( ARCH_WIN7 );
                else if (strcsequal(cliprotos[i], "LANMAN2.1"))
                        arch &= ( ARCH_WINNT | ARCH_WIN2K | ARCH_OS2 );
                else if (strcsequal(cliprotos[i], "LM1.2X002"))