rpms/dhcp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Only export the symbols we want in libdhcp4client (#198496)

Browse Source
This commit is contained in:
David Cantrell 2007-02-02 20:41:01 +00:00
parent 2dc4ddd1e9
commit 50e357198b
2 changed files with 106 additions and 433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

534
dhcp-3.0.5-libdhcp4client.patch
View File

@ -1,5 +1,5 @@
--- dhcp-3.0.5/client/dhclient.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 --- dhcp-3.0.5/client/dhclient.c.libdhcp4client 2007-02-02 15:27:55.000000000 -0500
+++ dhcp-3.0.5/client/dhclient.c 2007-01-30 13:29:31.000000000 -0500 +++ dhcp-3.0.5/client/dhclient.c 2007-02-02 15:29:15.000000000 -0500
@@ -78,7 +78,9 @@ @@ -78,7 +78,9 @@
int extended_option_environment = 0; int extended_option_environment = 0;
#endif #endif
@ -11,7 +11,7 @@
static void usage PROTO ((void)); static void usage PROTO ((void));
void do_release(struct client_state *); void do_release(struct client_state *);
@@ -89,10 +91,57 @@ @@ -89,10 +91,58 @@
extern u_int32_t default_requested_options[]; extern u_int32_t default_requested_options[];
@ -54,6 +54,7 @@
+} +}
+ +
+extern void omapi_free_all_pointers(void); +extern void omapi_free_all_pointers(void);
+__attribute__ ((visibility("default")))
+int dhcpv4_client +int dhcpv4_client
+(libdhcp_ctl, argc, argv, envp) +(libdhcp_ctl, argc, argv, envp)
+LIBDHCP_Control *libdhcp_ctl; +LIBDHCP_Control *libdhcp_ctl;
@ -70,7 +71,7 @@
int i; int i;
struct servent *ent; struct servent *ent;
struct interface_info *ip; struct interface_info *ip;
@@ -105,7 +154,6 @@ @@ -105,7 +155,6 @@
omapi_object_t *listener; omapi_object_t *listener;
isc_result_t result; isc_result_t result;
int persist = 0; int persist = 0;
@ -78,7 +79,7 @@
int no_dhclient_conf = 0; int no_dhclient_conf = 0;
int no_dhclient_db = 0; int no_dhclient_db = 0;
int no_dhclient_pid = 0; int no_dhclient_pid = 0;
@@ -119,7 +167,7 @@ @@ -119,7 +168,7 @@
int timeout_arg = 0; int timeout_arg = 0;
char *arg_conf = 0L; char *arg_conf = 0L;
int arg_conf_len=0; int arg_conf_len=0;
@ -87,7 +88,7 @@
/* Make sure we have stdin, stdout and stderr. */ /* Make sure we have stdin, stdout and stderr. */
i = open ("/dev/null", O_RDWR); i = open ("/dev/null", O_RDWR);
if (i == 0) if (i == 0)
@@ -140,7 +188,7 @@ @@ -140,7 +189,7 @@
#if !(defined (DEBUG) || defined (SYSLOG_4_2) || defined (__CYGWIN32__)) #if !(defined (DEBUG) || defined (SYSLOG_4_2) || defined (__CYGWIN32__))
setlogmask (LOG_UPTO (LOG_INFO)); setlogmask (LOG_UPTO (LOG_INFO));
#endif #endif
@ -96,7 +97,7 @@
/* Set up the OMAPI. */ /* Set up the OMAPI. */
status = omapi_init (); status = omapi_init ();
if (status != ISC_R_SUCCESS) if (status != ISC_R_SUCCESS)
@@ -469,9 +517,12 @@ @@ -469,9 +518,12 @@
log_fatal("dhclient(%u) is already running - exiting. ", dhcpid); log_fatal("dhclient(%u) is already running - exiting. ", dhcpid);
return(1); return(1);
} }
@ -111,7 +112,7 @@
if (!quiet) { if (!quiet) {
log_info ("%s %s", message, DHCP_VERSION); log_info ("%s %s", message, DHCP_VERSION);
log_info (copyright); log_info (copyright);
@@ -480,7 +531,7 @@ @@ -480,7 +532,7 @@
log_info ("%s", ""); log_info ("%s", "");
} else } else
log_perror = 0; log_perror = 0;
@ -120,7 +121,7 @@
/* If we're given a relay agent address to insert, for testing /* If we're given a relay agent address to insert, for testing
purposes, figure out what it is. */ purposes, figure out what it is. */
if (relay) { if (relay) {
@@ -767,12 +818,18 @@ @@ -767,12 +819,18 @@
arg_conf_len = 0L; arg_conf_len = 0L;
} }
@ -140,7 +141,7 @@
/* XXX */ /* XXX */
/* config_counter(&snd_counter, &rcv_counter); */ /* config_counter(&snd_counter, &rcv_counter); */
@@ -790,7 +847,7 @@ @@ -790,7 +848,7 @@
if (!persist) { if (!persist) {
/* Nothing more to do. */ /* Nothing more to do. */
log_info ("No broadcast interfaces found - exiting."); log_info ("No broadcast interfaces found - exiting.");
@ -149,7 +150,7 @@
} }
} else if (!release_mode) { } else if (!release_mode) {
/* Call the script with the list of interfaces. */ /* Call the script with the list of interfaces. */
@@ -885,7 +942,7 @@ @@ -885,7 +943,7 @@
dmalloc_longterm = dmalloc_outstanding; dmalloc_longterm = dmalloc_outstanding;
dmalloc_outstanding = 0; dmalloc_outstanding = 0;
#endif #endif
@ -158,7 +159,7 @@
/* If we're not supposed to wait before getting the address, /* If we're not supposed to wait before getting the address,
don't. */ don't. */
if (nowait) if (nowait)
@@ -898,7 +955,125 @@ @@ -898,7 +956,125 @@
/* Start dispatching packets and timeouts... */ /* Start dispatching packets and timeouts... */
dispatch (); dispatch ();
@ -284,7 +285,7 @@
/*NOTREACHED*/ /*NOTREACHED*/
return 0; return 0;
} }
@@ -1091,7 +1266,6 @@ @@ -1091,7 +1267,6 @@
picked = lp; picked = lp;
picked -> next = (struct client_lease *)0; picked -> next = (struct client_lease *)0;
} else { } else {
@ -292,7 +293,7 @@
destroy_client_lease (lp); destroy_client_lease (lp);
} }
} }
@@ -1149,7 +1323,6 @@ @@ -1149,7 +1324,6 @@
struct client_lease *lease; struct client_lease *lease;
struct option_cache *oc; struct option_cache *oc;
struct data_string ds; struct data_string ds;
@ -300,7 +301,7 @@
/* If we're not receptive to an offer right now, or if the offer /* If we're not receptive to an offer right now, or if the offer
has an unrecognizable transaction id, then just drop it. */ has an unrecognizable transaction id, then just drop it. */
@@ -1294,15 +1467,30 @@ @@ -1294,15 +1468,30 @@
client -> new -> rebind += cur_time; client -> new -> rebind += cur_time;
if (client -> new -> rebind < cur_time) if (client -> new -> rebind < cur_time)
client -> new -> rebind = TIME_MAX; client -> new -> rebind = TIME_MAX;
@ -333,7 +334,7 @@
/* Remember the medium. */ /* Remember the medium. */
client -> new -> medium = client -> medium; client -> new -> medium = client -> medium;
@@ -1333,6 +1521,9 @@ @@ -1333,6 +1522,9 @@
return; return;
} }
@ -343,7 +344,7 @@
/* Write out the new lease. */ /* Write out the new lease. */
write_client_lease (client, client -> new, 0, 0); write_client_lease (client, client -> new, 0, 0);
@@ -1368,7 +1559,6 @@ @@ -1368,7 +1560,6 @@
void *cpp; void *cpp;
{ {
struct client_state *client = cpp; struct client_state *client = cpp;
@ -351,7 +352,7 @@
struct option_cache *oc; struct option_cache *oc;
struct data_string ds; struct data_string ds;
@@ -1411,7 +1601,6 @@ @@ -1411,7 +1602,6 @@
void *cpp; void *cpp;
{ {
struct client_state *client = cpp; struct client_state *client = cpp;
@ -359,7 +360,7 @@
/* Cancel all timeouts. */ /* Cancel all timeouts. */
cancel_timeout (state_selecting, client); cancel_timeout (state_selecting, client);
@@ -1434,13 +1623,13 @@ @@ -1434,13 +1624,13 @@
{ {
return 0; return 0;
} }
@ -375,7 +376,7 @@
int write_host (host) int write_host (host)
struct host_decl *host; struct host_decl *host;
{ {
@@ -1524,8 +1713,6 @@ @@ -1524,8 +1714,6 @@
int i; int i;
int stop_selecting; int stop_selecting;
const char *name = packet -> packet_type ? "DHCPOFFER" : "BOOTREPLY"; const char *name = packet -> packet_type ? "DHCPOFFER" : "BOOTREPLY";
@ -384,7 +385,7 @@
char obuf [1024]; char obuf [1024];
#ifdef DEBUG_PACKET #ifdef DEBUG_PACKET
@@ -2013,6 +2200,10 @@ @@ -2013,6 +2201,10 @@
tell the shell script that we failed to allocate an address, tell the shell script that we failed to allocate an address,
and try again later. */ and try again later. */
if (onetry) { if (onetry) {
@ -395,7 +396,7 @@
if (!quiet) if (!quiet)
log_info ("Unable to obtain a lease on first try.%s", log_info ("Unable to obtain a lease on first try.%s",
" Exiting."); " Exiting.");
@@ -2344,7 +2535,6 @@ @@ -2344,7 +2536,6 @@
struct client_lease *lease; struct client_lease *lease;
{ {
unsigned char discover = DHCPDISCOVER; unsigned char discover = DHCPDISCOVER;
@ -403,7 +404,7 @@
struct option_state *options = (struct option_state *)0; struct option_state *options = (struct option_state *)0;
memset (&client -> packet, 0, sizeof (client -> packet)); memset (&client -> packet, 0, sizeof (client -> packet));
@@ -2409,9 +2599,6 @@ @@ -2409,9 +2600,6 @@
struct client_lease *lease; struct client_lease *lease;
{ {
unsigned char request = DHCPREQUEST; unsigned char request = DHCPREQUEST;
@ -413,7 +414,7 @@
struct option_cache *oc; struct option_cache *oc;
memset (&client -> packet, 0, sizeof (client -> packet)); memset (&client -> packet, 0, sizeof (client -> packet));
@@ -2500,7 +2687,6 @@ @@ -2500,7 +2688,6 @@
struct client_lease *lease; struct client_lease *lease;
{ {
unsigned char decline = DHCPDECLINE; unsigned char decline = DHCPDECLINE;
@ -421,7 +422,7 @@
struct option_cache *oc; struct option_cache *oc;
struct option_state *options = (struct option_state *)0; struct option_state *options = (struct option_state *)0;
@@ -2557,7 +2743,6 @@ @@ -2557,7 +2744,6 @@
struct client_lease *lease; struct client_lease *lease;
{ {
unsigned char request = DHCPRELEASE; unsigned char request = DHCPRELEASE;
@ -429,7 +430,7 @@
struct option_cache *oc; struct option_cache *oc;
struct option_state *options = (struct option_state *)0; struct option_state *options = (struct option_state *)0;
@@ -2614,8 +2799,6 @@ @@ -2614,8 +2800,6 @@
void destroy_client_lease (lease) void destroy_client_lease (lease)
struct client_lease *lease; struct client_lease *lease;
{ {
@ -438,7 +439,7 @@
if (lease -> server_name) if (lease -> server_name)
dfree (lease -> server_name, MDL); dfree (lease -> server_name, MDL);
if (lease -> filename) if (lease -> filename)
@@ -2624,7 +2807,9 @@ @@ -2624,7 +2808,9 @@
free_client_lease (lease, MDL); free_client_lease (lease, MDL);
} }
@ -448,7 +449,7 @@
void rewrite_client_leases () void rewrite_client_leases ()
{ {
@@ -2678,8 +2863,6 @@ @@ -2678,8 +2864,6 @@
{ {
const char *name, *dot; const char *name, *dot;
struct data_string ds; struct data_string ds;
@ -457,7 +458,7 @@
memset (&ds, 0, sizeof ds); memset (&ds, 0, sizeof ds);
@@ -2710,9 +2893,7 @@ @@ -2710,9 +2894,7 @@
int i; int i;
struct tm *t; struct tm *t;
static int leases_written; static int leases_written;
@ -467,7 +468,7 @@
int errors = 0; int errors = 0;
char *s; char *s;
@@ -2992,8 +3173,6 @@ @@ -2992,8 +3174,6 @@
int i; int i;
struct data_string data; struct data_string data;
struct option_cache *oc; struct option_cache *oc;
@ -476,7 +477,7 @@
struct envadd_state es; struct envadd_state es;
es.client = client; es.client = client;
@@ -3071,16 +3250,60 @@ @@ -3071,16 +3251,60 @@
int script_go (client) int script_go (client)
struct client_state *client; struct client_state *client;
{ {
@ -540,7 +541,7 @@
if (client) if (client)
scriptName = client -> config -> script_name; scriptName = client -> config -> script_name;
@@ -3146,6 +3369,7 @@ @@ -3146,6 +3370,7 @@
GET_TIME (&cur_time); GET_TIME (&cur_time);
return (WIFEXITED (wstatus) ? return (WIFEXITED (wstatus) ?
WEXITSTATUS (wstatus) : -WTERMSIG (wstatus)); WEXITSTATUS (wstatus) : -WTERMSIG (wstatus));
@ -548,7 +549,7 @@
} }
void client_envadd (struct client_state *client, void client_envadd (struct client_state *client,
@@ -3153,7 +3377,7 @@ @@ -3153,7 +3378,7 @@
{ {
char spbuf [1024]; char spbuf [1024];
char *s; char *s;
@ -557,7 +558,7 @@
struct string_list *val; struct string_list *val;
va_list list; va_list list;
@@ -3236,6 +3460,9 @@ @@ -3236,6 +3461,9 @@
/* Don't become a daemon if the user requested otherwise. */ /* Don't become a daemon if the user requested otherwise. */
if (no_daemon) { if (no_daemon) {
@ -567,7 +568,7 @@
write_client_pid_file (); write_client_pid_file ();
return; return;
} }
@@ -3244,7 +3471,9 @@ @@ -3244,7 +3472,9 @@
if (state) if (state)
return; return;
state = 1; state = 1;
@ -578,7 +579,7 @@
/* Stop logging to stderr... */ /* Stop logging to stderr... */
log_perror = 0; log_perror = 0;
@@ -3588,7 +3817,7 @@ @@ -3588,7 +3818,7 @@
isc_result_t client_dns_update (struct client_state *client, int addp, int ttl) isc_result_t client_dns_update (struct client_state *client, int addp, int ttl)
{ {
@ -587,8 +588,8 @@
ddns_dhcid, client_identifier; ddns_dhcid, client_identifier;
struct option_cache *oc; struct option_cache *oc;
int ignorep; int ignorep;
--- dhcp-3.0.5/common/alloc.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 --- dhcp-3.0.5/common/alloc.c.libdhcp4client 2007-02-02 15:27:55.000000000 -0500
+++ dhcp-3.0.5/common/alloc.c 2007-01-30 13:29:31.000000000 -0500 +++ dhcp-3.0.5/common/alloc.c 2007-02-02 15:27:55.000000000 -0500
@@ -48,7 +48,6 @@ @@ -48,7 +48,6 @@
const char *file; const char *file;
int line; int line;
@ -669,8 +670,8 @@
struct dns_zone *d; struct dns_zone *d;
if (!ptr) { if (!ptr) {
--- dhcp-3.0.5/common/discover.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 --- dhcp-3.0.5/common/discover.c.libdhcp4client 2007-02-02 15:27:55.000000000 -0500
+++ dhcp-3.0.5/common/discover.c 2007-01-30 13:29:31.000000000 -0500 +++ dhcp-3.0.5/common/discover.c 2007-02-02 15:27:55.000000000 -0500
@@ -120,28 +120,30 @@ @@ -120,28 +120,30 @@
For each interface that's of type INET and not the loopback interface, 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 register that interface with the network I/O software, figure out what
@ -760,8 +761,8 @@
isc_result_t status; isc_result_t status;
if (h -> type != dhcp_type_interface) if (h -> type != dhcp_type_interface)
--- dhcp-3.0.5/common/lpf.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 --- dhcp-3.0.5/common/lpf.c.libdhcp4client 2007-02-02 15:27:55.000000000 -0500
+++ dhcp-3.0.5/common/lpf.c 2007-01-30 13:30:23.000000000 -0500 +++ dhcp-3.0.5/common/lpf.c 2007-02-02 15:27:55.000000000 -0500
@@ -89,8 +89,6 @@ @@ -89,8 +89,6 @@
struct sockaddr common; struct sockaddr common;
} sa; } sa;
@ -787,8 +788,47 @@
int length = 0; int length = 0;
int offset = 0; int offset = 0;
int nocsum = 0; int nocsum = 0;
--- dhcp-3.0.5/dst/hmac_link.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 --- dhcp-3.0.5/common/options.c.libdhcp4client 2007-02-02 15:27:55.000000000 -0500
+++ dhcp-3.0.5/dst/hmac_link.c 2007-01-30 13:29:31.000000000 -0500 +++ dhcp-3.0.5/common/options.c 2007-02-02 15:28:51.000000000 -0500
@@ -2153,6 +2153,7 @@
return 1;
}
+__attribute__ ((visibility("default")))
void option_space_foreach (struct packet *packet, struct lease *lease,
struct client_state *client_state,
struct option_state *in_options,
--- dhcp-3.0.5/common/dispatch.c.libdhcp4client 2007-02-02 15:27:55.000000000 -0500
+++ dhcp-3.0.5/common/dispatch.c 2007-02-02 15:29:44.000000000 -0500
@@ -358,6 +358,7 @@
#endif
}
+__attribute__ ((visibility("default")))
void relinquish_timeouts ()
{
#ifdef LIBDHCP
--- dhcp-3.0.5/common/tree.c.libdhcp4client 2007-02-02 15:27:55.000000000 -0500
+++ dhcp-3.0.5/common/tree.c 2007-02-02 15:30:49.000000000 -0500
@@ -40,7 +40,7 @@
#include "dhcpd.h"
#include <omapip/omapip_p.h>
-struct binding_scope *global_scope;
+struct binding_scope __attribute__ ((visibility("default"))) *global_scope;
static int do_host_lookup PROTO ((struct data_string *,
struct dns_host_entry *));
@@ -2615,6 +2615,7 @@
result of that evaluation. There should never be both an expression
and a valid data_string. */
+__attribute__ ((visibility("default")))
int evaluate_option_cache (result, packet, lease, client_state,
in_options, cfg_options, scope, oc, file, line)
struct data_string *result;
--- dhcp-3.0.5/dst/hmac_link.c.libdhcp4client 2007-02-02 15:27:55.000000000 -0500
+++ dhcp-3.0.5/dst/hmac_link.c 2007-02-02 15:27:55.000000000 -0500
@@ -38,6 +38,10 @@ @@ -38,6 +38,10 @@
#include "dst_internal.h" #include "dst_internal.h"
@ -876,389 +916,18 @@
return (0); return (0);
memset(dst_t_func[KEY_HMAC_MD5], 0, sizeof(struct dst_func)); memset(dst_t_func[KEY_HMAC_MD5], 0, sizeof(struct dst_func));
--- dhcp-3.0.5/dst/md5_dgst.c.libdhcp4client 2004-06-14 14:50:06.000000000 -0400 --- dhcp-3.0.5/dst/md5_dgst.c.libdhcp4client 2004-06-14 14:50:06.000000000 -0400
+++ dhcp-3.0.5/dst/md5_dgst.c 2007-01-30 13:29:31.000000000 -0500 +++ dhcp-3.0.5/dst/md5_dgst.c 2007-02-02 15:27:55.000000000 -0500
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
#ifdef USE_MD5 /* Added by ogud@tis.com 1998/1/26 */ #ifdef USE_MD5 /* Added by ogud@tis.com 1998/1/26 */
-const char *MD5_version="MD5 part of SSLeay 0.8.1 19-Jul-1997"; -const char *MD5_version="MD5 part of SSLeay 0.8.1 19-Jul-1997";
+const char *MD5_version __attribute__((visibility ("hidden"))) ="MD5 part of SSLeay 0.8.1 19-Jul-1997"; +const char *MD5_version ="MD5 part of SSLeay 0.8.1 19-Jul-1997";
/* Implemented from RFC1321 The MD5 Message-Digest Algorithm /* Implemented from RFC1321 The MD5 Message-Digest Algorithm
*/ */
@@ -81,6 +81,7 @@
static void md5_block();
#endif
+__attribute__((visibility ("hidden")))
void MD5_Init(c)
MD5_CTX *c;
{
@@ -93,6 +94,7 @@
c->num=0;
}
+__attribute__((visibility ("hidden")))
void MD5_Update(c, data, len)
MD5_CTX *c;
const register unsigned char *data;
@@ -298,6 +300,7 @@
c->D+=D&0xffffffffL;
}
+__attribute__((visibility ("hidden")))
void MD5_Final(md, c)
unsigned char *md;
MD5_CTX *c;
--- dhcp-3.0.5/minires/ns_date.c.libdhcp4client 2004-06-10 13:59:40.000000000 -0400
+++ dhcp-3.0.5/minires/ns_date.c 2007-01-30 13:29:31.000000000 -0500
@@ -56,6 +56,7 @@
1 January 1970 (GMT assumed). Format is yyyymmddhhmmss, all
digits required, no spaces allowed. */
+__attribute__((visibility ("hidden")))
u_int32_t
ns_datetosecs(const char *cp, int *errp) {
struct tm time;
--- dhcp-3.0.5/minires/ns_verify.c.libdhcp4client 2004-06-10 13:59:42.000000000 -0400
+++ dhcp-3.0.5/minires/ns_verify.c 2007-01-30 13:29:31.000000000 -0500
@@ -61,6 +61,7 @@
/* Public. */
+__attribute__((visibility ("hidden")))
u_char *
ns_find_tsig(u_char *msg, u_char *eom) {
HEADER *hp = (HEADER *)msg;
@@ -137,6 +138,7 @@
* - TSIG verification succeeds, error set to BADSIG (ns_r_badsig)
* - TSIG verification succeeds, error set to BADTIME (ns_r_badtime)
*/
+__attribute__((visibility ("hidden")))
isc_result_t
ns_verify(u_char *msg, unsigned *msglen, void *k,
const u_char *querysig, unsigned querysiglen,
--- dhcp-3.0.5/minires/ns_parse.c.libdhcp4client 2004-06-10 13:59:40.000000000 -0400
+++ dhcp-3.0.5/minires/ns_parse.c 2007-01-30 13:29:31.000000000 -0500
@@ -47,7 +47,7 @@
/* Public. */
/* These need to be in the same order as the nres.h:ns_flag enum. */
-struct _ns_flagdata _ns_flagdata[16] = {
+struct _ns_flagdata _ns_flagdata[16] __attribute__((visibility ("hidden"))) = {
{ 0x8000, 15 }, /* qr. */
{ 0x7800, 11 }, /* opcode. */
{ 0x0400, 10 }, /* aa. */
@@ -66,6 +66,7 @@
{ 0x0000, 0 }, /* expansion (6/6). */
};
+__attribute__((visibility ("hidden")))
isc_result_t
ns_skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count,
int *rc) {
@@ -94,6 +95,7 @@
return ISC_R_SUCCESS;
}
+__attribute__((visibility ("hidden")))
isc_result_t
ns_initparse(const u_char *msg, unsigned msglen, ns_msg *handle) {
const u_char *eom = msg + msglen;
@@ -136,6 +138,7 @@
return ISC_R_SUCCESS;
}
+__attribute__((visibility ("hidden")))
isc_result_t
ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) {
int b;
--- dhcp-3.0.5/minires/ns_samedomain.c.libdhcp4client 2004-06-10 13:59:41.000000000 -0400
+++ dhcp-3.0.5/minires/ns_samedomain.c 2007-01-30 13:29:31.000000000 -0500
@@ -53,6 +53,7 @@
* but NOT in "bar.top"
*/
+__attribute__((visibility ("hidden")))
int
ns_samedomain(const char *a, const char *b) {
size_t la, lb;
@@ -152,6 +153,7 @@
* ns_subdomain(a, b)
* is "a" a subdomain of "b"?
*/
+__attribute__((visibility ("hidden")))
int
ns_subdomain(const char *a, const char *b) {
return (ns_samename(a, b) != 1 && ns_samedomain(a, b));
@@ -169,6 +171,7 @@
* foo\\. -> foo\\.
*/
+__attribute__((visibility ("hidden")))
isc_result_t
ns_makecanon(const char *src, char *dst, size_t dstsize) {
size_t n = strlen(src);
@@ -198,6 +201,7 @@
* 1 if names are the same
*/
+__attribute__((visibility ("hidden")))
int
ns_samename(const char *a, const char *b) {
char ta[NS_MAXDNAME], tb[NS_MAXDNAME];
--- dhcp-3.0.5/minires/ns_name.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500
+++ dhcp-3.0.5/minires/ns_name.c 2007-01-30 13:29:31.000000000 -0500
@@ -60,6 +60,7 @@
* The root is returned as "."
* All other domains are returned in non absolute form
*/
+__attribute__((visibility ("hidden")))
int
ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) {
const u_char *cp;
@@ -146,6 +147,7 @@
* Enforces label and domain length limits.
*/
+__attribute__((visibility ("hidden")))
int
ns_name_pton(const char *src, u_char *dst, size_t dstsiz) {
u_char *label, *bp, *eom;
@@ -255,6 +257,7 @@
* Enforces label and domain length limits.
*/
+__attribute__((visibility ("hidden")))
int
ns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz) {
const u_char *cp;
@@ -299,6 +302,7 @@
* return:
* -1 if it fails, or consumed octets if it succeeds.
*/
+__attribute__((visibility ("hidden")))
int
ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
u_char *dst, size_t dstsiz)
@@ -387,6 +391,7 @@
* try to compress names. If 'lastdnptr' is NULL, we don't update the
* list.
*/
+__attribute__((visibility ("hidden")))
int
ns_name_pack(const u_char *src, u_char *dst, unsigned dstsiz,
const u_char **dnptrs, const u_char **lastdnptr)
@@ -479,6 +484,7 @@
* note:
* Root domain returns as "." not "".
*/
+__attribute__((visibility ("hidden")))
int
ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src,
char *dst, size_t dstsiz)
@@ -507,6 +513,7 @@
* If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr'
* is NULL, we don't update the list.
*/
+__attribute__((visibility ("hidden")))
int
ns_name_compress(const char *src, u_char *dst, size_t dstsiz,
const u_char **dnptrs, const u_char **lastdnptr)
@@ -524,6 +531,7 @@
* return:
* 0 on success, -1 (with errno set) on failure.
*/
+__attribute__((visibility ("hidden")))
int
ns_name_skip(const u_char **ptrptr, const u_char *eom) {
const u_char *cp;
--- dhcp-3.0.5/minires/ns_sign.c.libdhcp4client 2004-06-10 13:59:42.000000000 -0400
+++ dhcp-3.0.5/minires/ns_sign.c 2007-01-30 13:29:31.000000000 -0500
@@ -78,6 +78,7 @@
* - bad key / sign failed (-BADKEY)
* - not enough space (NS_TSIG_ERROR_NO_SPACE)
*/
+__attribute__((visibility ("hidden")))
isc_result_t
ns_sign(u_char *msg, unsigned *msglen, unsigned msgsize, int error, void *k,
const u_char *querysig, unsigned querysiglen, u_char *sig,
--- dhcp-3.0.5/minires/res_comp.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500
+++ dhcp-3.0.5/minires/res_comp.c 2007-01-30 13:29:31.000000000 -0500
@@ -103,6 +103,7 @@
* 'exp_dn' is a pointer to a buffer of size 'length' for the result.
* Return size of compressed name or -1 if there was an error.
*/
+__attribute__((visibility ("hidden")))
int
dn_expand(const u_char *msg, const u_char *eom, const u_char *src,
char *dst, unsigned dstsiz)
@@ -119,6 +120,7 @@
* Return the size of the compressed name or -1.
* 'length' is the size of the array pointed to by 'comp_dn'.
*/
+__attribute__((visibility ("hidden")))
int
dn_comp(const char *src, u_char *dst, unsigned dstsiz,
u_char **dnptrs, u_char **lastdnptr)
@@ -131,6 +133,7 @@
/*
* Skip over a compressed domain name. Return the size or -1.
*/
+__attribute__((visibility ("hidden")))
int
dn_skipname(const u_char *ptr, const u_char *eom) {
const u_char *saveptr = ptr;
--- dhcp-3.0.5/minires/res_mkupdate.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500
+++ dhcp-3.0.5/minires/res_mkupdate.c 2007-01-30 13:29:31.000000000 -0500
@@ -936,6 +936,7 @@
static struct valuelist *servicelist, *protolist;
+__attribute__((visibility ("hidden")))
void
res_buildservicelist() {
struct servent *sp;
@@ -968,6 +969,7 @@
endservent();
}
+__attribute__((visibility ("hidden")))
void
res_destroyservicelist() {
struct valuelist *slp, *slp_next;
@@ -981,6 +983,7 @@
servicelist = (struct valuelist *)0;
}
+__attribute__((visibility ("hidden")))
void
res_buildprotolist() {
struct protoent *pp;
@@ -1010,6 +1013,7 @@
endprotoent();
}
+__attribute__((visibility ("hidden")))
void
res_destroyprotolist() {
struct valuelist *plp, *plp_next;
@@ -1047,6 +1051,7 @@
/*
* Convert service name or (ascii) number to int.
*/
+__attribute__((visibility ("hidden")))
int
res_servicenumber(const char *p) {
if (servicelist == (struct valuelist *)0)
@@ -1057,6 +1062,7 @@
/*
* Convert protocol name or (ascii) number to int.
*/
+__attribute__((visibility ("hidden")))
int
res_protocolnumber(const char *p) {
if (protolist == (struct valuelist *)0)
@@ -1115,6 +1121,7 @@
return (0);
}
+__attribute__((visibility ("hidden")))
const char *
res_protocolname(int num) {
static char number[8];
@@ -1130,6 +1137,7 @@
return (pp->p_name);
}
+__attribute__((visibility ("hidden")))
const char *
res_servicename(u_int16_t port, const char *proto) { /* Host byte order. */
static char number[8];
--- dhcp-3.0.5/minires/res_findzonecut.c.libdhcp4client 2004-06-10 13:59:43.000000000 -0400
+++ dhcp-3.0.5/minires/res_findzonecut.c 2007-01-30 13:29:31.000000000 -0500
@@ -139,6 +139,7 @@
* keep going. for the NS and A queries this means we just give up.
*/
+__attribute__((visibility ("hidden")))
isc_result_t
res_findzonecut(res_state statp, const char *dname, ns_class class, int opts,
char *zname, size_t zsize, struct in_addr *addrs, int naddrs,
--- dhcp-3.0.5/minires/res_send.c.libdhcp4client 2004-06-10 13:59:44.000000000 -0400
+++ dhcp-3.0.5/minires/res_send.c 2007-01-30 13:29:31.000000000 -0500
@@ -128,6 +128,7 @@
* author:
* paul vixie, 29may94
*/
+__attribute__((visibility ("hidden")))
int
res_ourserver_p(const res_state statp, const struct sockaddr_in *inp) {
struct sockaddr_in ina;
@@ -158,6 +159,7 @@
* author:
* paul vixie, 29may94
*/
+__attribute__((visibility ("hidden")))
int
res_nameinquery(const char *name, int type, int class,
const u_char *buf, const u_char *eom)
@@ -195,6 +197,7 @@
* author:
* paul vixie, 29may94
*/
+__attribute__((visibility ("hidden")))
int
res_queriesmatch(const u_char *buf1, const u_char *eom1,
const u_char *buf2, const u_char *eom2)
@@ -233,6 +236,7 @@
return (1);
}
+__attribute__((visibility ("hidden")))
isc_result_t
res_nsend(res_state statp,
double *buf, unsigned buflen,
@@ -832,6 +836,7 @@
*
* This routine is not expected to be user visible.
*/
+__attribute__((visibility ("hidden")))
void
res_nclose(res_state statp) {
if (statp->_sock >= 0) {
--- dhcp-3.0.5/minires/res_mkquery.c.libdhcp4client 2004-06-10 13:59:43.000000000 -0400
+++ dhcp-3.0.5/minires/res_mkquery.c 2007-01-30 13:29:31.000000000 -0500
@@ -96,6 +96,7 @@
* Form all types of queries.
* Returns the size of the result or -1.
*/
+__attribute__((visibility ("hidden")))
isc_result_t
res_nmkquery(res_state statp,
int op, /* opcode of query */
--- dhcp-3.0.5/minires/res_sendsigned.c.libdhcp4client 2004-06-10 13:59:44.000000000 -0400
+++ dhcp-3.0.5/minires/res_sendsigned.c 2007-01-30 13:29:31.000000000 -0500
@@ -41,6 +41,7 @@
#include <isc-dhcp/dst.h>
/* res_nsendsigned */
+__attribute__((visibility ("hidden")))
isc_result_t
res_nsendsigned(res_state statp,
double *msg, unsigned msglen, ns_tsig_key *key,
--- dhcp-3.0.5/minires/res_init.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500
+++ dhcp-3.0.5/minires/res_init.c 2007-01-30 13:29:31.000000000 -0500
@@ -484,6 +484,7 @@
}
#endif
+__attribute__((visibility ("hidden")))
u_int
res_randomid(void) {
struct timeval now;
--- dhcp-3.0.5/omapip/alloc.c.libdhcp4client 2006-02-22 17:43:27.000000000 -0500 --- dhcp-3.0.5/omapip/alloc.c.libdhcp4client 2006-02-22 17:43:27.000000000 -0500
+++ dhcp-3.0.5/omapip/alloc.c 2007-01-30 13:29:31.000000000 -0500 +++ dhcp-3.0.5/omapip/alloc.c 2007-02-02 15:27:55.000000000 -0500
@@ -40,6 +40,41 @@ @@ -40,6 +40,41 @@
#include <omapip/omapip_p.h> #include <omapip/omapip_p.h>
@ -1330,8 +999,8 @@
} }
#if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \ #if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \
--- dhcp-3.0.5/omapip/dispatch.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 --- dhcp-3.0.5/omapip/dispatch.c.libdhcp4client 2007-02-02 15:27:55.000000000 -0500
+++ dhcp-3.0.5/omapip/dispatch.c 2007-01-30 13:29:31.000000000 -0500 +++ dhcp-3.0.5/omapip/dispatch.c 2007-02-02 15:27:55.000000000 -0500
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
#include <omapip/omapip_p.h> #include <omapip/omapip_p.h>
@ -1341,8 +1010,8 @@
TIME cur_time; TIME cur_time;
OMAPI_OBJECT_ALLOC (omapi_io, OMAPI_OBJECT_ALLOC (omapi_io,
--- dhcp-3.0.5/omapip/errwarn.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 --- dhcp-3.0.5/omapip/errwarn.c.libdhcp4client 2007-02-02 15:27:55.000000000 -0500
+++ dhcp-3.0.5/omapip/errwarn.c 2007-01-30 13:29:31.000000000 -0500 +++ dhcp-3.0.5/omapip/errwarn.c 2007-02-02 15:27:55.000000000 -0500
@@ -39,6 +39,11 @@ @@ -39,6 +39,11 @@
#include <omapip/omapip_p.h> #include <omapip/omapip_p.h>
#include <errno.h> #include <errno.h>
@ -1465,7 +1134,7 @@
} }
--- dhcp-3.0.5/configure.libdhcp4client 2004-09-10 17:02:30.000000000 -0400 --- dhcp-3.0.5/configure.libdhcp4client 2004-09-10 17:02:30.000000000 -0400
+++ dhcp-3.0.5/configure 2007-01-30 13:29:31.000000000 -0500 +++ dhcp-3.0.5/configure 2007-02-02 15:27:55.000000000 -0500
@@ -246,7 +246,7 @@ @@ -246,7 +246,7 @@
fi fi
@ -1475,9 +1144,9 @@
fi fi
for foo in $dirs; do for foo in $dirs; do
--- /dev/null 2007-01-30 11:05:20.939899920 -0500 --- /dev/null 2007-02-02 08:56:33.488585704 -0500
+++ dhcp-3.0.5/libdhcp4client/Makefile.dist 2007-01-30 13:29:31.000000000 -0500 +++ dhcp-3.0.5/libdhcp4client/Makefile.dist 2007-02-02 15:27:55.000000000 -0500
@@ -0,0 +1,127 @@ @@ -0,0 +1,128 @@
+# Makefile.dist for libdhcp4client +# Makefile.dist for libdhcp4client
+# +#
+# We get the libdhcp4client library from the patched ISC source code. We +# We get the libdhcp4client library from the patched ISC source code. We
@ -1529,7 +1198,8 @@
+ +
+INCLUDES = -I$(TOP) -I$(TOP)/includes -I$(TOP)/dst -I. +INCLUDES = -I$(TOP) -I$(TOP)/includes -I$(TOP)/dst -I.
+CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) \ +CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) \
+ -DCLIENT_PATH=${CLIENT_PATH} -DLIBDHCP -DUSE_MD5 + -DCLIENT_PATH=${CLIENT_PATH} -DLIBDHCP -DUSE_MD5 \
+ -fvisibility=hidden
+ +
+all: $(PROGS) +all: $(PROGS)
+ +
@ -1605,8 +1275,8 @@
+ $(CC) -shared -o $@ -Wl,-soname,$@ $(OBJS) `$(AR) t libres.a | grep -v res_query.o` + $(CC) -shared -o $@ -Wl,-soname,$@ $(OBJS) `$(AR) t libres.a | grep -v res_query.o`
+ +
+# Dependencies (semi-automatically-generated) +# Dependencies (semi-automatically-generated)
--- /dev/null 2007-01-30 11:05:20.939899920 -0500 --- /dev/null 2007-02-02 08:56:33.488585704 -0500
+++ dhcp-3.0.5/libdhcp4client/dhcp4client.h 2007-01-30 13:29:31.000000000 -0500 +++ dhcp-3.0.5/libdhcp4client/dhcp4client.h 2007-02-02 15:27:55.000000000 -0500
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
+/* dhcp4client.h +/* dhcp4client.h
+ * + *
@ -1632,8 +1302,8 @@
+extern int dhcpv4_client( struct libdhcp_control_s *dhc_ctl, int argc, char **argv, char **envp); +extern int dhcpv4_client( struct libdhcp_control_s *dhc_ctl, int argc, char **argv, char **envp);
+ /* The ISC IPv4 DHCP client main() function . + /* The ISC IPv4 DHCP client main() function .
+ */ + */
--- /dev/null 2007-01-30 11:05:20.939899920 -0500 --- /dev/null 2007-02-02 08:56:33.488585704 -0500
+++ dhcp-3.0.5/libdhcp4client/libdhcp_control.h 2007-01-30 13:29:31.000000000 -0500 +++ dhcp-3.0.5/libdhcp4client/libdhcp_control.h 2007-02-02 15:27:55.000000000 -0500
@@ -0,0 +1,102 @@ @@ -0,0 +1,102 @@
+/* libdhcp_control.h +/* libdhcp_control.h
+ * + *
@ -1738,7 +1408,7 @@
+ +
+#endif +#endif
--- dhcp-3.0.5/Makefile.dist.libdhcp4client 2004-06-10 13:59:10.000000000 -0400 --- dhcp-3.0.5/Makefile.dist.libdhcp4client 2004-06-10 13:59:10.000000000 -0400
+++ dhcp-3.0.5/Makefile.dist 2007-01-30 13:29:31.000000000 -0500 +++ dhcp-3.0.5/Makefile.dist 2007-02-02 15:27:55.000000000 -0500
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
# http://www.isc.org/ # http://www.isc.org/

5
dhcp.spec
View File

@ -8,7 +8,7 @@
Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent. Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent.
Name: dhcp Name: dhcp
Version: 3.0.5 Version: 3.0.5
Release: 13%{?dist} Release: 14%{?dist}
Epoch: 12 Epoch: 12
License: distributable License: distributable
Group: System Environment/Daemons Group: System Environment/Daemons
@ -354,6 +354,9 @@ exit 0
%{_libdir}/libdhcp4client.so %{_libdir}/libdhcp4client.so
%changelog %changelog
* Fri Feb 02 2007 David Cantrell <dcantrell@redhat.com> - 12:3.0.5-14
- Only export the symbols we want in libdhcp4client (#198496)
* Wed Jan 31 2007 David Cantrell <dcantrell@redhat.com> - 12:3.0.5-13 * Wed Jan 31 2007 David Cantrell <dcantrell@redhat.com> - 12:3.0.5-13
- Add support for dhcpd(8) to read dhcpd.conf from an LDAP server (#224352) - Add support for dhcpd(8) to read dhcpd.conf from an LDAP server (#224352)
- Remove invalid ja_JP.eucJP man pages from /usr/share/doc - Remove invalid ja_JP.eucJP man pages from /usr/share/doc