rpms/dhcp/devel dhcp-3.0.4-libdhcp4client.patch,1.3,1.4
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri May 26 23:42:35 UTC 2006
Author: jvdias
Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32683
Modified Files:
dhcp-3.0.4-libdhcp4client.patch
Log Message:
refresh after dhclient updates
dhcp-3.0.4-libdhcp4client.patch:
includes/dhcp4client.h | 24 +++
includes/libdhcp_control.h | 103 ++++++++++++++
libdhcp4client/client/dhclient.c | 283 +++++++++++++++++++++++++++++++++++++--
libdhcp4client/common/alloc.c | 6
libdhcp4client/common/discover.c | 17 +-
libdhcp4client/common/lpf.c | 1
libdhcp4client/dst/hmac_link.c | 32 +++-
libdhcp4client/omapip/alloc.c | 42 +++++
libdhcp4client/omapip/dispatch.c | 2
libdhcp4client/omapip/errwarn.c | 48 ++++++
10 files changed, 530 insertions(+), 28 deletions(-)
Index: dhcp-3.0.4-libdhcp4client.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.4-libdhcp4client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dhcp-3.0.4-libdhcp4client.patch 26 May 2006 17:07:30 -0000 1.3
+++ dhcp-3.0.4-libdhcp4client.patch 26 May 2006 23:42:32 -0000 1.4
@@ -1,5 +1,5 @@
---- dhcp-3.0.4/libdhcp4client/common/alloc.c.libdhcp4client 2006-05-25 20:57:06.000000000 -0400
-+++ dhcp-3.0.4/libdhcp4client/common/alloc.c 2006-05-25 20:57:55.000000000 -0400
+--- dhcp-3.0.4/libdhcp4client/common/alloc.c.libdhcp4client 2006-05-26 19:32:03.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/common/alloc.c 2006-05-26 19:32:51.000000000 -0400
@@ -1016,9 +1016,11 @@
rc_register (file, line, ptr, bp, bp -> refcnt, 0, RC_MISC);
return 1;
@@ -14,8 +14,8 @@
#if defined (DEBUG_MEMORY_LEAKAGE) || \
defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT)
void relinquish_free_packets ()
---- dhcp-3.0.4/libdhcp4client/common/discover.c.libdhcp4client 2006-05-25 20:57:06.000000000 -0400
-+++ dhcp-3.0.4/libdhcp4client/common/discover.c 2006-05-25 20:57:55.000000000 -0400
+--- dhcp-3.0.4/libdhcp4client/common/discover.c.libdhcp4client 2006-05-26 19:32:03.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/common/discover.c 2006-05-26 19:32:51.000000000 -0400
@@ -120,7 +120,9 @@
For each interface that's of type INET and not the loopback interface,
register that interface with the network I/O software, figure out what
@@ -60,7 +60,7 @@
if (fallback_interface) {
if (fcntl (fallback_interface -> rfdesc, F_SETFD, 1) < 0)
--- dhcp-3.0.4/libdhcp4client/common/lpf.c.libdhcp4client 2004-11-24 12:39:15.000000000 -0500
-+++ dhcp-3.0.4/libdhcp4client/common/lpf.c 2006-05-25 20:57:55.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/common/lpf.c 2006-05-26 19:32:51.000000000 -0400
@@ -216,6 +216,7 @@
struct interface_info *info;
{
@@ -70,7 +70,7 @@
/* Set up the bpf filter program structure. This is defined in
bpf.c */
--- dhcp-3.0.4/libdhcp4client/dst/hmac_link.c.libdhcp4client 2001-02-22 02:22:08.000000000 -0500
-+++ dhcp-3.0.4/libdhcp4client/dst/hmac_link.c 2006-05-25 20:57:55.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/dst/hmac_link.c 2006-05-26 19:32:51.000000000 -0400
@@ -38,6 +38,10 @@
#include "dst_internal.h"
@@ -158,7 +158,7 @@
return (0);
memset(dst_t_func[KEY_HMAC_MD5], 0, sizeof(struct dst_func));
--- dhcp-3.0.4/libdhcp4client/omapip/alloc.c.libdhcp4client 2006-02-22 17:43:27.000000000 -0500
-+++ dhcp-3.0.4/libdhcp4client/omapip/alloc.c 2006-05-25 20:57:55.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/omapip/alloc.c 2006-05-26 19:32:51.000000000 -0400
@@ -40,6 +40,41 @@
#include <omapip/omapip_p.h>
@@ -222,8 +222,8 @@
}
#if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \
---- dhcp-3.0.4/libdhcp4client/omapip/dispatch.c.libdhcp4client 2006-05-25 20:57:06.000000000 -0400
-+++ dhcp-3.0.4/libdhcp4client/omapip/dispatch.c 2006-05-25 20:57:55.000000000 -0400
+--- dhcp-3.0.4/libdhcp4client/omapip/dispatch.c.libdhcp4client 2006-05-26 19:32:03.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/omapip/dispatch.c 2006-05-26 19:32:51.000000000 -0400
@@ -34,7 +34,7 @@
#include <omapip/omapip_p.h>
@@ -233,8 +233,8 @@
TIME cur_time;
OMAPI_OBJECT_ALLOC (omapi_io,
---- dhcp-3.0.4/libdhcp4client/omapip/errwarn.c.libdhcp4client 2006-05-25 20:57:06.000000000 -0400
-+++ dhcp-3.0.4/libdhcp4client/omapip/errwarn.c 2006-05-25 20:57:55.000000000 -0400
+--- dhcp-3.0.4/libdhcp4client/omapip/errwarn.c.libdhcp4client 2006-05-26 19:32:03.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/omapip/errwarn.c 2006-05-26 19:32:51.000000000 -0400
@@ -39,6 +39,11 @@
#include <omapip/omapip_p.h>
#include <errno.h>
@@ -346,8 +346,8 @@
return 0;
}
---- dhcp-3.0.4/libdhcp4client/client/dhclient.c.libdhcp4client 2006-05-25 20:57:06.000000000 -0400
-+++ dhcp-3.0.4/libdhcp4client/client/dhclient.c 2006-05-25 21:03:53.000000000 -0400
+--- dhcp-3.0.4/libdhcp4client/client/dhclient.c.libdhcp4client 2006-05-26 19:32:03.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/client/dhclient.c 2006-05-26 19:32:51.000000000 -0400
@@ -78,7 +78,9 @@
int extended_option_environment = 0;
#endif
@@ -420,7 +420,7 @@
int i;
struct servent *ent;
struct interface_info *ip;
-@@ -116,7 +167,7 @@
+@@ -117,7 +168,7 @@
int timeout_arg = 0;
char *arg_conf = 0L;
int arg_conf_len=0;
@@ -429,7 +429,7 @@
/* Make sure we have stdin, stdout and stderr. */
i = open ("/dev/null", O_RDWR);
if (i == 0)
-@@ -137,7 +188,7 @@
+@@ -138,7 +189,7 @@
#if !(defined (DEBUG) || defined (SYSLOG_4_2) || defined (__CYGWIN32__))
setlogmask (LOG_UPTO (LOG_INFO));
#endif
@@ -438,7 +438,7 @@
/* Set up the OMAPI. */
status = omapi_init ();
if (status != ISC_R_SUCCESS)
-@@ -439,9 +490,12 @@
+@@ -443,9 +494,12 @@
log_fatal("dhclient(%u) is already running - exiting. ", dhcpid);
return(1);
}
@@ -453,7 +453,7 @@
if (!quiet) {
log_info ("%s %s", message, DHCP_VERSION);
log_info (copyright);
-@@ -450,7 +504,7 @@
+@@ -454,7 +508,7 @@
log_info ("%s", "");
} else
log_perror = 0;
@@ -462,7 +462,7 @@
/* If we're given a relay agent address to insert, for testing
purposes, figure out what it is. */
if (relay) {
-@@ -702,12 +756,18 @@
+@@ -727,12 +781,18 @@
arg_conf_len = 0L;
}
@@ -482,7 +482,7 @@
/* XXX */
/* config_counter(&snd_counter, &rcv_counter); */
-@@ -725,7 +785,7 @@
+@@ -750,7 +810,7 @@
if (!persist) {
/* Nothing more to do. */
log_info ("No broadcast interfaces found - exiting.");
@@ -491,7 +491,7 @@
}
} else if (!release_mode) {
/* Call the script with the list of interfaces. */
-@@ -820,7 +880,7 @@
+@@ -845,7 +905,7 @@
dmalloc_longterm = dmalloc_outstanding;
dmalloc_outstanding = 0;
#endif
@@ -500,7 +500,7 @@
/* If we're not supposed to wait before getting the address,
don't. */
if (nowait)
-@@ -833,7 +893,123 @@
+@@ -858,7 +918,123 @@
/* Start dispatching packets and timeouts... */
dispatch ();
@@ -624,7 +624,7 @@
/*NOTREACHED*/
return 0;
}
-@@ -1227,8 +1403,25 @@
+@@ -1252,8 +1428,25 @@
client -> new -> rebind += cur_time;
if (client -> new -> rebind < cur_time)
client -> new -> rebind = TIME_MAX;
@@ -650,7 +650,7 @@
}
void bind_lease (client)
-@@ -1266,6 +1459,9 @@
+@@ -1291,6 +1484,9 @@
return;
}
@@ -660,7 +660,7 @@
/* Write out the new lease. */
write_client_lease (client, client -> new, 0, 0);
-@@ -1367,13 +1563,13 @@
+@@ -1392,13 +1588,13 @@
{
return 0;
}
@@ -676,7 +676,7 @@
int write_host (host)
struct host_decl *host;
{
-@@ -1925,6 +2121,10 @@
+@@ -1950,6 +2146,10 @@
tell the shell script that we failed to allocate an address,
and try again later. */
if (onetry) {
@@ -687,7 +687,7 @@
if (!quiet)
log_info ("Unable to obtain a lease on first try.%s",
" Exiting.");
-@@ -2536,7 +2736,9 @@
+@@ -2561,7 +2761,9 @@
free_client_lease (lease, MDL);
}
@@ -697,7 +697,7 @@
void rewrite_client_leases ()
{
-@@ -2984,6 +3186,54 @@
+@@ -3009,6 +3211,54 @@
int script_go (client)
struct client_state *client;
{
@@ -752,7 +752,7 @@
int rval;
char *scriptName;
char *argv [2];
-@@ -2992,7 +3242,9 @@
+@@ -3017,7 +3267,9 @@
char reason [] = "REASON=NBI";
static char client_path [] = CLIENT_PATH;
int i;
@@ -762,7 +762,7 @@
int pid, wpid, wstatus;
if (client)
-@@ -3149,6 +3401,9 @@
+@@ -3174,6 +3426,9 @@
/* Don't become a daemon if the user requested otherwise. */
if (no_daemon) {
@@ -772,7 +772,7 @@
write_client_pid_file ();
return;
}
-@@ -3157,7 +3412,9 @@
+@@ -3182,7 +3437,9 @@
if (state)
return;
state = 1;
@@ -783,8 +783,8 @@
/* Stop logging to stderr... */
log_perror = 0;
---- /dev/null 2006-05-25 14:24:27.864979750 -0400
-+++ dhcp-3.0.4/includes/dhcp4client.h 2006-05-25 20:57:55.000000000 -0400
+--- /dev/null 2006-05-26 15:59:39.834806750 -0400
++++ dhcp-3.0.4/includes/dhcp4client.h 2006-05-26 19:32:51.000000000 -0400
@@ -0,0 +1,24 @@
+/* dhcp4client.h
+ *
@@ -810,8 +810,8 @@
+extern int dhcpv4_client( struct libdhcp_control_s *dhc_ctl, int argc, char **argv, char **envp);
+ /* The ISC IPv4 DHCP client main() function .
+ */
---- /dev/null 2006-05-25 14:24:27.864979750 -0400
-+++ dhcp-3.0.4/includes/libdhcp_control.h 2006-05-25 20:57:55.000000000 -0400
+--- /dev/null 2006-05-26 15:59:39.834806750 -0400
++++ dhcp-3.0.4/includes/libdhcp_control.h 2006-05-26 19:32:51.000000000 -0400
@@ -0,0 +1,103 @@
+/* libdhcp_control.h
+ *
More information about the fedora-cvs-commits
mailing list