Author: arekm Date: Wed Mar 12 22:01:05 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
dhcp-ldap.patch (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SOURCES/dhcp-ldap.patch
diff -u SOURCES/dhcp-ldap.patch:1.7 SOURCES/dhcp-ldap.patch:1.8
--- SOURCES/dhcp-ldap.patch:1.7 Sun Feb 3 19:23:06 2008
+++ SOURCES/dhcp-ldap.patch Wed Mar 12 23:01:00 2008
@@ -2257,31 +2257,30 @@
--- dhcp-4.0.0/server/stables.c.ldap 2007-11-20 08:34:37.000000000 -1000
+++ dhcp-4.0.0/server/stables.c 2008-01-22 15:09:56.000000000 -1000
@@ -238,9 +238,107 @@ static struct option server_options[] =
- { "dhcpv6-lease-file-name", "t", &server_universe, 54, 1 },
{ "dhcpv6-pid-file-name", "t", &server_universe, 55, 1 },
{ "limit-addrs-per-ia", "L", &server_universe, 56, 1 },
+ { "delayed-ack", "S", &server_universe, 57, 1 },
+#if defined(LDAP_CONFIGURATION)
-+ { "ldap-server", "t", &server_universe, 57,
1 },
-+ { "ldap-port", "d",
&server_universe, 58, 1 },
-+ { "ldap-username", "t", &server_universe, 59,
1 },
-+ { "ldap-password", "t", &server_universe, 60,
1 },
-+ { "ldap-base-dn", "t", &server_universe, 61,
1 },
-+ { "ldap-method", "Nldap-methods.", &server_universe, 62, 1 },
-+ { "ldap-debug-file", "t", &server_universe, 63,
1 },
-+ { "ldap-dhcp-server-cn", "t", &server_universe, 64, 1 },
-+ { "ldap-referrals", "f", &server_universe, 65,
1 },
++ { "ldap-server", "t", &server_universe, 58,
1 },
++ { "ldap-port", "d",
&server_universe, 59, 1 },
++ { "ldap-username", "t", &server_universe, 60,
1 },
++ { "ldap-password", "t", &server_universe, 61,
1 },
++ { "ldap-base-dn", "t", &server_universe, 62,
1 },
++ { "ldap-method", "Nldap-methods.", &server_universe, 63, 1 },
++ { "ldap-debug-file", "t", &server_universe, 64,
1 },
++ { "ldap-dhcp-server-cn", "t", &server_universe, 65, 1 },
++ { "ldap-referrals", "f", &server_universe, 66,
1 },
+#if defined(USE_SSL)
-+ { "ldap-ssl", "Nldap-ssl-usage.", &server_universe, 66, 1 },
-+ { "ldap-tls-reqcert", "Nldap-tls-reqcert.", &server_universe, 67,
1 },
-+ { "ldap-tls-ca-file", "t", &server_universe, 68,
1 },
-+ { "ldap-tls-ca-dir", "t", &server_universe, 69,
1 },
-+ { "ldap-tls-cert", "t", &server_universe, 70,
1 },
-+ { "ldap-tls-key", "t", &server_universe, 71,
1 },
-+ { "ldap-tls-crlcheck", "Nldap-tls-crlcheck.", &server_universe, 72,
1 },
-+ { "ldap-tls-ciphers", "t", &server_universe, 73,
1 },
-+ { "ldap-tls-randfile", "t", &server_universe, 74,
1 },
++ { "ldap-ssl", "Nldap-ssl-usage.", &server_universe, 67, 1 },
++ { "ldap-tls-reqcert", "Nldap-tls-reqcert.", &server_universe, 68,
1 },
++ { "ldap-tls-ca-file", "t", &server_universe, 69,
1 },
++ { "ldap-tls-ca-dir", "t", &server_universe, 70,
1 },
++ { "ldap-tls-cert", "t", &server_universe, 71,
1 },
++ { "ldap-tls-key", "t", &server_universe, 72,
1 },
++ { "ldap-tls-crlcheck", "Nldap-tls-crlcheck.", &server_universe, 73,
1 },
++ { "ldap-tls-ciphers", "t", &server_universe, 74,
1 },
++ { "ldap-tls-randfile", "t", &server_universe, 75,
1 },
+#else
-+ { "unknown-66", "X", &server_universe, 66,
1 },
+ { "unknown-67", "X", &server_universe, 67,
1 },
+ { "unknown-68", "X", &server_universe, 68,
1 },
+ { "unknown-69", "X", &server_universe, 69,
1 },
@@ -2290,9 +2289,9 @@
+ { "unknown-72", "X", &server_universe, 72,
1 },
+ { "unknown-73", "X", &server_universe, 73,
1 },
+ { "unknown-74", "X", &server_universe, 74,
1 },
++ { "unknown-75", "X", &server_universe, 75,
1 },
+#endif
+#else
-+ { "unknown-57", "X", &server_universe, 57,
1 },
+ { "unknown-58", "X", &server_universe, 58,
1 },
+ { "unknown-59", "X", &server_universe, 59,
1 },
+ { "unknown-60", "X", &server_universe, 60,
1 },
@@ -2301,6 +2300,7 @@
+ { "unknown-63", "X", &server_universe, 63,
1 },
+ { "unknown-64", "X", &server_universe, 64,
1 },
+ { "unknown-65", "X", &server_universe, 65,
1 },
++ { "unknown-66", "X", &server_universe, 66,
1 },
+#endif
{ NULL, NULL, NULL, 0, 0 }
};
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/dhcp-ldap.patch?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
