Attachment #5109 for bug #26309

View | Details | Raw Unified | Return to bug 26309
Collapse All | Expand All

Lines 46-52 Link Here

(-)dhcp-3.1.orig/common/conflex.c (-2 / +2 lines)
46	static enum dhcp_token read_string PROTO ((struct parse *));	46	static enum dhcp_token read_string PROTO ((struct parse *));
47	static enum dhcp_token read_number PROTO ((int, struct parse *));	47	static enum dhcp_token read_number PROTO ((int, struct parse *));
48	static enum dhcp_token read_num_or_name PROTO ((int, struct parse *));	48	static enum dhcp_token read_num_or_name PROTO ((int, struct parse *));
49	static enum dhcp_token intern PROTO ((unsigned char *, enum dhcp_token));	49	static enum dhcp_token intern PROTO ((char *, enum dhcp_token));
50		50
51	isc_result_t new_parse (cfile, file, inbuf, buflen, name, eolp)	51	isc_result_t new_parse (cfile, file, inbuf, buflen, name, eolp)
52	struct parse **cfile;	52	struct parse **cfile;
Lines 528-534 Link Here
528	}	528	}
529		529
530	static enum dhcp_token intern (atom, dfv)	530	static enum dhcp_token intern (atom, dfv)
531	unsigned char *atom;	531	char *atom;
532	enum dhcp_token dfv;	532	enum dhcp_token dfv;
533	{	533	{
534	if (!isascii (atom [0]))	534	if (!isascii (atom [0]))

Lines 678-684 Link Here

(-)dhcp-3.1.orig/common/dns.c (-1 / +1 lines)
678	/*	678	/*
679	* Conflict detection override: delete DHCID RRs.	679	* Conflict detection override: delete DHCID RRs.
680	*/	680	*/
681	updrec = minires_mkupdrec(S_UPDATE, ddns_fwd_name->data,	681	updrec = minires_mkupdrec(S_UPDATE, (char *)ddns_fwd_name->data,
682	C_IN, T_DHCID, 0);	682	C_IN, T_DHCID, 0);
683		683
684	if (!updrec) {	684	if (!updrec) {

Lines 2236-2242 Link Here

(-)dhcp-3.1.orig/common/options.c (-2 / +2 lines)
2236	"refers to unknown "	2236	"refers to unknown "
2237	"option space '%.*s'.",	2237	"option space '%.*s'.",
2238	oc->option->code,	2238	oc->option->code,
2239	end - start, start);	2239	(int) (end - start), start);
2240	break;	2240	break;
2241	}	2241	}
2242		2242
Lines 2278-2284 Link Here
2278	int status = 0;	2278	int status = 0;
2279	int i;	2279	int i;
2280		2280
2281	universe_hash_lookup(&u, universe_hash, name->data, name->len, MDL);	2281	universe_hash_lookup(&u, universe_hash, (char *)name->data, name->len, MDL);
2282	if (u == NULL) {	2282	if (u == NULL) {
2283	log_error("option_space_encapsulate: option space %.*s does "	2283	log_error("option_space_encapsulate: option space %.*s does "
2284	"not exist, but is configured.",	2284	"not exist, but is configured.",

Lines 614-620 Link Here

(-)dhcp-3.1.orig/common/parse.c (-1 / +1 lines)
614	int base;	614	int base;
615	unsigned size;	615	unsigned size;
616	{	616	{
617	const unsigned char *ptr = str;	617	const char *ptr = str;
618	int negative = 0;	618	int negative = 0;
619	u_int32_t val = 0;	619	u_int32_t val = 0;
620	int tval;	620	int tval;

Lines 45-51 Link Here

(-)dhcp-3.1.orig/common/print.c (-1 / +1 lines)
45	char quotify_string (const char s, const char *file, int line)	45	char quotify_string (const char s, const char *file, int line)
46	{	46	{
47	unsigned len = 0;	47	unsigned len = 0;
48	const unsigned char *sp;	48	const char *sp;
49	char buf, nsp;	49	char buf, nsp;
50		50
51	for (sp = s; sp && *sp; sp++) {	51	for (sp = s; sp && *sp; sp++) {

Lines 473-479 Link Here

(-)dhcp-3.1.orig/dst/dst_api.c (-1 / +1 lines)
473	int proto, alg, dlen;	473	int proto, alg, dlen;
474	int c;	474	int c;
475	char name[PATH_MAX], enckey[RAW_KEY_SIZE];	475	char name[PATH_MAX], enckey[RAW_KEY_SIZE];
476	unsigned char *notspace;	476	char *notspace;
477	u_char deckey[RAW_KEY_SIZE];	477	u_char deckey[RAW_KEY_SIZE];
478	FILE *fp;	478	FILE *fp;
479		479

Lines 2096-2102 Link Here

(-)dhcp-3.1.orig/includes/dhcpd.h (-1 / +1 lines)
2096	#if defined (FAILOVER_PROTOCOL)	2096	#if defined (FAILOVER_PROTOCOL)
2097	int write_failover_state (dhcp_failover_state_t *);	2097	int write_failover_state (dhcp_failover_state_t *);
2098	#endif	2098	#endif
2099	int db_printable PROTO ((const unsigned char *));	2099	int db_printable PROTO ((const char *));
2100	int db_printable_len PROTO ((const unsigned char *, unsigned));	2100	int db_printable_len PROTO ((const unsigned char *, unsigned));
2101	isc_result_t write_named_billing_class(const void , unsigned, void );	2101	isc_result_t write_named_billing_class(const void , unsigned, void );
2102	void write_billing_classes (void);	2102	void write_billing_classes (void);

Lines 48-54 Link Here

(-)dhcp-3.1.orig/minires/ns_date.c (-2 / +2 lines)
48		48
49	/* Forward. */	49	/* Forward. */
50		50
51	static int datepart(const unsigned char , int, int, int, int );	51	static int datepart(const char , int, int, int, int );
52		52
53	/* Public. */	53	/* Public. */
54		54
Lines 118-124 Link Here
118	* Don't reset the flag if there is no error.	118	* Don't reset the flag if there is no error.
119	*/	119	*/
120	static int	120	static int
121	datepart(const unsigned char buf, int size, int min, int max, int errp) {	121	datepart(const char buf, int size, int min, int max, int errp) {
122	int result = 0;	122	int result = 0;
123	int i;	123	int i;
124		124

Lines 154-160 Link Here

(-)dhcp-3.1.orig/minires/res_init.c (-1 / +1 lines)
154	int	154	int
155	minires_vinit(res_state statp, int preinit) {	155	minires_vinit(res_state statp, int preinit) {
156	register FILE *fp;	156	register FILE *fp;
157	register unsigned char *cp;	157	register char *cp;
158	register char **pp;	158	register char **pp;
159	register int n;	159	register int n;
160	char buf[BUFSIZ];	160	char buf[BUFSIZ];

Lines 384-390 Link Here

(-)dhcp-3.1.orig/minires/res_query.c (-1 / +1 lines)
384	const char *	384	const char *
385	res_hostalias(const res_state statp, const char name, char dst, size_t siz) {	385	res_hostalias(const res_state statp, const char name, char dst, size_t siz) {
386	char *file;	386	char *file;
387	unsigned char cp1, cp2;	387	char cp1, cp2;
388	char buf[BUFSIZ];	388	char buf[BUFSIZ];
389	FILE *fp;	389	FILE *fp;
390		390




		return (unsigned char *) "No table.";

	if (table->hash_count == 0)
		return (unsigned char *) "Invalid hash table.";

	for (i = 0 ; i < table->hash_count ; i++) {
		curlen = 0;

	    pct > 2147483647 ||
	    minlen > 2147483647 ||
	    maxlen > 2147483647)
		return (unsigned char *) "Report out of range for display.";

	sprintf((char *) retbuf, "Contents/Size (%%): %u/%u (%u%%). Min/max: %u/%u",
		contents, table->hash_count, pct, minlen, maxlen);

	return retbuf;

Lines 539-545 Link Here

(-)dhcp-3.1.orig/server/db.c (-1 / +1 lines)
539	#endif	539	#endif
540		540
541	int db_printable (s)	541	int db_printable (s)
542	const unsigned char *s;	542	const char *s;
543	{	543	{
544	int i;	544	int i;
545	for (i = 0; s [i]; i++)	545	for (i = 0; s [i]; i++)

Lines 4002-4008 Link Here

(-)dhcp-3.1.orig/server/dhcp.c (-1 / +1 lines)
4002	if (option_cache_allocate(&oc, MDL)) {	4002	if (option_cache_allocate(&oc, MDL)) {
4003	a = &packet->interface->primary_address;	4003	a = &packet->interface->primary_address;
4004	if (make_const_data(&oc->expression,	4004	if (make_const_data(&oc->expression,
4005	(char )a, sizeof(a),	4005	(unsigned char )a, sizeof(a),
4006	0, 0, MDL)) {	4006	0, 0, MDL)) {
4007	option_code_hash_lookup(&oc->option,	4007	option_code_hash_lookup(&oc->option,
4008	dhcp_universe.code_hash,	4008	dhcp_universe.code_hash,

Lines 201-207 Link Here

(-)dhcp-3.1.orig/server/dhcpd.c (-1 / +1 lines)
201	int fd;	201	int fd;
202	int i, status;	202	int i, status;
203	struct servent *ent;	203	struct servent *ent;
204	unsigned char *s;	204	char *s;
205	int cftest = 0;	205	int cftest = 0;
206	int lftest = 0;	206	int lftest = 0;
207	#ifndef DEBUG	207	#ifndef DEBUG

Lines 527-533 Link Here

(-)dhcp-3.1.orig/server/failover.c (-1 / +1 lines)
527	slen = strlen(sname);	527	slen = strlen(sname);
528	} else if (link->imsg->options_present &	528	} else if (link->imsg->options_present &
529	FTB_RELATIONSHIP_NAME) {	529	FTB_RELATIONSHIP_NAME) {
530	sname = link->imsg->relationship_name.data;	530	sname = (char *)link->imsg->relationship_name.data;
531	slen = link->imsg->relationship_name.count;	531	slen = link->imsg->relationship_name.count;
532	} else {	532	} else {
533	sname = "unknown";	533	sname = "unknown";

Return to bug 26309

Lines 352-358 Link Here

(-)dhcp-3.1.orig/omapip/hash.c (-3 / +3 lines)
352	return (unsigned char *) "No table.";	352	return (unsigned char *) "No table.";
353		353
354	if (table->hash_count == 0)	354	if (table->hash_count == 0)
355	return (char *) "Invalid hash table.";	355	return (unsigned char *) "Invalid hash table.";
356		356
357	for (i = 0 ; i < table->hash_count ; i++) {	357	for (i = 0 ; i < table->hash_count ; i++) {
358	curlen = 0;	358	curlen = 0;
Lines 381-389 Link Here
381	pct > 2147483647 \|\|	381	pct > 2147483647 \|\|
382	minlen > 2147483647 \|\|	382	minlen > 2147483647 \|\|
383	maxlen > 2147483647)	383	maxlen > 2147483647)
384	return (char *) "Report out of range for display.";	384	return (unsigned char *) "Report out of range for display.";
385		385
386	sprintf(retbuf, "Contents/Size (%%): %u/%u (%u%%). Min/max: %u/%u",	386	sprintf((char *) retbuf, "Contents/Size (%%): %u/%u (%u%%). Min/max: %u/%u",
387	contents, table->hash_count, pct, minlen, maxlen);	387	contents, table->hash_count, pct, minlen, maxlen);
388		388
389	return retbuf;	389	return retbuf;