From 3de3c7c8b0ad2dcd7d1a7ae7e1007c4928570786 Mon Sep 17 00:00:00 2001
From: fyodor <fyodor@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Fri, 9 Mar 2012 01:07:46 +0000
Subject: [PATCH] resort nmap-os-db (there are only a few fingerprints which
 needed this)

---
 nmap-os-db | 78 +++++++++++++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/nmap-os-db b/nmap-os-db
index 8f878db6f..c7d1ac369 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -45402,24 +45402,6 @@ T7(R=Y%DF=Y%T=FA-104%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FA-104%TG=FF%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
-# version 6.1 (Build 7601: Service Pack 1)
-Fingerprint Microsoft Windows Server 2008 SP1
-Class Microsoft | Windows | 2008 | general purpose
-CPE cpe:/o:microsoft:windows_server_2008 auto
-SEQ(SP=FF-109%GCD=1-6%ISR=105-10F%TI=I%II=I%SS=S%TS=7)
-OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
-WIN(W1=2000|FFFF%W2=2000|FFFF%W3=2000|FFFF%W4=2000|FFFF%W5=2000|FFFF%W6=2000|FFFF)
-ECN(R=Y%DF=N%T=7B-85%TG=80%W=2000|FFFF%O=M5B4NW8NNS%CC=N)
-T1(R=Y%DF=N%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0)
-T2(R=N)
-T3(R=N)
-T4(R=N)
-T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%RD=0)
-T6(R=N)
-T7(R=N)
-U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
 # Version 6.1 (Build 7600)
 Fingerprint Microsoft Windows Server 2008
 Class Microsoft | Windows | 2008 | general purpose
@@ -45546,6 +45528,24 @@ T7(R=N)
 U1(DF=N%T=7A-84%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7A-84%TG=80%CD=Z)
 
+# version 6.1 (Build 7601: Service Pack 1)
+Fingerprint Microsoft Windows Server 2008 SP1
+Class Microsoft | Windows | 2008 | general purpose
+CPE cpe:/o:microsoft:windows_server_2008 auto
+SEQ(SP=FF-109%GCD=1-6%ISR=105-10F%TI=I%II=I%SS=S%TS=7)
+OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
+WIN(W1=2000|FFFF%W2=2000|FFFF%W3=2000|FFFF%W4=2000|FFFF%W5=2000|FFFF%W6=2000|FFFF)
+ECN(R=Y%DF=N%T=7B-85%TG=80%W=2000|FFFF%O=M5B4NW8NNS%CC=N)
+T1(R=Y%DF=N%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0)
+T2(R=N)
+T3(R=N)
+T4(R=N)
+T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%RD=0)
+T6(R=N)
+T7(R=N)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
 # MacBook Pro running Macos X 10.5.5
 # Version 6.0 (Build 6001: Service Pack 1)
 # 10.6.3 (Snow Leopard)
@@ -45971,27 +45971,6 @@ T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
-# Version 6.1 (Build 7600)
-# 2008R2 Enterprise
-Fingerprint Microsoft Windows 7 or Windows Server 2008 R2
-Class Microsoft | Windows | 7 | general purpose
-CPE cpe:/o:microsoft:windows_7 auto
-Class Microsoft | Windows | 2008 | general purpose
-CPE cpe:/o:microsoft:windows_server_2008 auto
-SEQ(SP=F5-10B%GCD=1-6%ISR=F0-112%TI=I%CI=I%II=I%SS=O|S%TS=7)
-OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=|M5B4NW8ST11%O6=|M5B4ST11)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=0|2000%W6=0|2000)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=0%O=%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
 # Ver 6.1 (Build 7600)
 Fingerprint Microsoft Windows 7
 Class Microsoft | Windows | 7 | general purpose
@@ -46197,6 +46176,27 @@ T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%RD=0)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
+# Version 6.1 (Build 7600)
+# 2008R2 Enterprise
+Fingerprint Microsoft Windows 7 or Windows Server 2008 R2
+Class Microsoft | Windows | 7 | general purpose
+CPE cpe:/o:microsoft:windows_7 auto
+Class Microsoft | Windows | 2008 | general purpose
+CPE cpe:/o:microsoft:windows_server_2008 auto
+SEQ(SP=F5-10B%GCD=1-6%ISR=F0-112%TI=I%CI=I%II=I%SS=O|S%TS=7)
+OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=|M5B4NW8ST11%O6=|M5B4ST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=0|2000%W6=0|2000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=0%O=%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
 # 6.0.6001
 # version 6.1 (build 7600)
 Fingerprint Microsoft Windows 7 or Windows Server 2008 SP1