- fix server options encoding

Changed files:
    dhcp-ldap.patch -> 1.5

diff --git a/dhcp-ldap.patch b/dhcp-ldap.patch
index bf4d07321e2c7a2ba0a30666660e377d1edfbc1a..5065789289dbbea6cd826c9ad721007257e61588 100644 (file)
--- a/dhcp-ldap.patch
+++ b/dhcp-ldap.patch
@@ -5586,25 +5586,25 @@ diff -Naur dhcp-3.0.5/server/stables.c dhcp-3.0.5-ldap/server/stables.c
        { "leasequery", "f",                    &server_universe,  49, 1 },
        { "adaptive-lease-time-threshold", "B", &server_universe,  50, 1 },
 +#if defined(LDAP_CONFIGURATION)
-+      { "ldap-server", "t",                           &server_universe, 47 },
-+      { "ldap-port", "d",                             &server_universe, 48 },
-+      { "ldap-username", "t",                         &server_universe, 49 },
-+      { "ldap-password", "t",                         &server_universe, 50 },
-+      { "ldap-base-dn", "t",                          &server_universe, 51 },
-+      { "ldap-method", "Nldap-methods.",              &server_universe, 52 },
-+      { "ldap-debug-file", "t",                       &server_universe, 53 },
-+      { "ldap-dhcp-server-cn", "t",                   &server_universe, 54 },
-+      { "ldap-referrals", "f",                        &server_universe, 55 },
++      { "ldap-server", "t",                           &server_universe, 51, 1 },
++      { "ldap-port", "d",                             &server_universe, 52, 1 },
++      { "ldap-username", "t",                         &server_universe, 53, 1 },
++      { "ldap-password", "t",                         &server_universe, 54, 1 },
++      { "ldap-base-dn", "t",                          &server_universe, 55, 1 },
++      { "ldap-method", "Nldap-methods.",              &server_universe, 56, 1 },
++      { "ldap-debug-file", "t",                       &server_universe, 57, 1 },
++      { "ldap-dhcp-server-cn", "t",                   &server_universe, 58, 1 },
++      { "ldap-referrals", "f",                        &server_universe, 59, 1 },
 +#if defined(USE_SSL)
-+      { "ldap-ssl", "Nldap-ssl-usage.",               &server_universe, 56 },
-+      { "ldap-tls-reqcert", "Nldap-tls-reqcert.",     &server_universe, 57 },
-+      { "ldap-tls-ca-file", "t",                      &server_universe, 58 },
-+      { "ldap-tls-ca-dir", "t",                       &server_universe, 59 },
-+      { "ldap-tls-cert", "t",                         &server_universe, 60 },
-+      { "ldap-tls-key", "t",                          &server_universe, 61 },
-+      { "ldap-tls-crlcheck", "Nldap-tls-crlcheck.",   &server_universe, 62 },
-+      { "ldap-tls-ciphers", "t",                      &server_universe, 63 },
-+      { "ldap-tls-randfile", "t",                     &server_universe, 64 },
++      { "ldap-ssl", "Nldap-ssl-usage.",               &server_universe, 60, 1 },
++      { "ldap-tls-reqcert", "Nldap-tls-reqcert.",     &server_universe, 61, 1 },
++      { "ldap-tls-ca-file", "t",                      &server_universe, 62, 1 },
++      { "ldap-tls-ca-dir", "t",                       &server_universe, 63, 1 },
++      { "ldap-tls-cert", "t",                         &server_universe, 64, 1 },
++      { "ldap-tls-key", "t",                          &server_universe, 65, 1 },
++      { "ldap-tls-crlcheck", "Nldap-tls-crlcheck.",   &server_universe, 66, 1 },
++      { "ldap-tls-ciphers", "t",                      &server_universe, 67, 1 },
++      { "ldap-tls-randfile", "t",                     &server_universe, 68, 1 },
 +#endif
 +#endif
        { NULL, NULL, NULL, 0, 0 }