DHCP: Fix printing for option 116 "Auto-Configure" (RFC 2563)

(cherry picked from commit 52f6a29fa43417b129280b9f6b7d59461434acdf)

diff --git a/print-bootp.c b/print-bootp.c
index a1781da6df65dc3eb4956afaf678514e1c96f5fb..9af5e2ab36d549be2c575dc9c2174c3419387cea 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -178,7 +178,7 @@ struct bootp {
 /* RFC 2485 */
 #define        TAG_OPEN_GROUP_UAP      ((uint8_t)  98)
 /* RFC 2563 */
-#define        TAG_DISABLE_AUTOCONF    ((uint8_t) 116)
+#define        TAG_AUTO_CONFIGURE      ((uint8_t) 116)
 /* RFC 2610 */
 #define        TAG_SLP_DA              ((uint8_t)  78)
 #define        TAG_SLP_SCOPE           ((uint8_t)  79)
@@ -486,7 +486,7 @@ static const struct tok tag2str[] = {
 /* RFC 2485 */
        { TAG_OPEN_GROUP_UAP,   "aUAP" },
 /* RFC 2563 */
-       { TAG_DISABLE_AUTOCONF, "BNOAUTO" },
+       { TAG_AUTO_CONFIGURE,   "BAuto-Configure" },
 /* RFC 2610 */
        { TAG_SLP_DA,           "bSLP-DA" },    /*"b" is a little wrong */
        { TAG_SLP_SCOPE,        "bSLP-SCOPE" }, /*"b" is a little wrong */

diff --git a/tests/eapon1-v-nosmb.out b/tests/eapon1-v-nosmb.out
index 1c75b181b40aaa8eb2619e54420e2b7760bda53b..8df62b570ed681241678826c8eb5757d880a6dd5 100644 (file)
--- a/tests/eapon1-v-nosmb.out
+++ b/tests/eapon1-v-nosmb.out
@@ -37,7 +37,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -52,7 +52,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -83,7 +83,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -98,7 +98,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -113,7 +113,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -159,7 +159,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -202,7 +202,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -245,7 +245,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -302,7 +302,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"

diff --git a/tests/eapon1-v.out b/tests/eapon1-v.out
index 216594f7f474e87e717adbb40301497dcabbad34..79d78ef1a3897fd7342144a1208816fa602f281c 100644 (file)
--- a/tests/eapon1-v.out
+++ b/tests/eapon1-v.out
@@ -37,7 +37,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -52,7 +52,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -83,7 +83,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -98,7 +98,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -113,7 +113,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -159,7 +159,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -202,7 +202,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -245,7 +245,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"
@@ -302,7 +302,7 @@
          Vendor-rfc1048 Extensions
            Magic Cookie 0x63825363
            DHCP-Message (53), length 1: Discover
-           NOAUTO (116), length 1: Y
+           Auto-Configure (116), length 1: Y
            Client-ID (61), length 7: ether 00:04:23:57:a5:7a
            Requested-IP (50), length 4: 192.168.1.249
            Hostname (12), length 8: "DJP95S0J"