if pidfile turned out to be !regular file, do not unlink it.

[oweals/busybox.git] / networking / udhcp / options.c

diff --git a/networking/udhcp/options.c b/networking/udhcp/options.c
index bda6efc7e5cebb37a78f0a44faaefd44881590a9..3168fc69aa68d9e6d60c306b0831c7190934fc4f 100644 (file)
--- a/networking/udhcp/options.c
+++ b/networking/udhcp/options.c
@@ -11,7 +11,7 @@
 
 /* supported options are easily added here */
 const struct dhcp_option dhcp_options[] = {
-       /* name[10]     flags                                   code */
+       /* name[12]     flags                                   code */
        {"subnet",      OPTION_IP | OPTION_REQ,                 0x01},
        {"timezone",    OPTION_S32,                             0x02},
        {"router",      OPTION_IP | OPTION_LIST | OPTION_REQ,   0x03},
@@ -43,17 +43,23 @@ const struct dhcp_option dhcp_options[] = {
        {"tftp",        OPTION_STRING,                          0x42},
        {"bootfile",    OPTION_STRING,                          0x43},
        {"userclass",   OPTION_STRING,                          0x4D},
+#if ENABLE_FEATURE_RFC3397
+       {"search",      OPTION_STR1035 | OPTION_LIST | OPTION_REQ, 0x77},
+#endif
        /* MSIE's "Web Proxy Autodiscovery Protocol" support */
        {"wpad",        OPTION_STRING,                          0xfc},
        {"",            0x00,                                   0x00}
 };
 
 /* Lengths of the different option types */
-const unsigned char option_lengths[] = {
+const unsigned char option_lengths[] ALIGN1 = {
        [OPTION_IP] =      4,
        [OPTION_IP_PAIR] = 8,
        [OPTION_BOOLEAN] = 1,
        [OPTION_STRING] =  1,
+#if ENABLE_FEATURE_RFC3397
+       [OPTION_STR1035] = 1,
+#endif
        [OPTION_U8] =      1,
        [OPTION_U16] =     2,
        [OPTION_S16] =     2,