diff -uNr dhcp-3.1.orig/common/conflex.c dhcp-3.1/common/conflex.c
--- dhcp-3.1.orig/common/conflex.c	2009-09-02 00:32:27.000000000 +0400
+++ dhcp-3.1/common/conflex.c	2011-09-13 14:36:49.000000000 +0400
@@ -46,7 +46,7 @@
 static enum dhcp_token read_string PROTO ((struct parse *));
 static enum dhcp_token read_number PROTO ((int, struct parse *));
 static enum dhcp_token read_num_or_name PROTO ((int, struct parse *));
-static enum dhcp_token intern PROTO ((unsigned char *, enum dhcp_token));
+static enum dhcp_token intern PROTO ((char *, enum dhcp_token));
 
 isc_result_t new_parse (cfile, file, inbuf, buflen, name, eolp)
 	struct parse **cfile;
@@ -528,7 +528,7 @@
 }
 
 static enum dhcp_token intern (atom, dfv)
-	unsigned char *atom;
+	char *atom;
 	enum dhcp_token dfv;
 {
 	if (!isascii (atom [0]))
diff -uNr dhcp-3.1.orig/common/dns.c dhcp-3.1/common/dns.c
--- dhcp-3.1.orig/common/dns.c	2011-09-13 14:32:01.000000000 +0400
+++ dhcp-3.1/common/dns.c	2011-09-13 14:40:47.000000000 +0400
@@ -678,7 +678,7 @@
 		/*
 		 * Conflict detection override: delete DHCID RRs.
 		 */
-		updrec = minires_mkupdrec(S_UPDATE, ddns_fwd_name->data,
+		updrec = minires_mkupdrec(S_UPDATE, (char *)ddns_fwd_name->data,
 					  C_IN, T_DHCID, 0);
 
 		if (!updrec) {
diff -uNr dhcp-3.1.orig/common/options.c dhcp-3.1/common/options.c
--- dhcp-3.1.orig/common/options.c	2011-07-07 23:18:47.000000000 +0400
+++ dhcp-3.1/common/options.c	2011-09-13 14:39:56.000000000 +0400
@@ -2236,7 +2236,7 @@
 						  "refers to unknown "
 						  "option space '%.*s'.",
 						  oc->option->code,
-						  end - start, start);
+						  (int) (end - start), start);
 					break;
 				}
 
@@ -2278,7 +2278,7 @@
 	int status = 0;
 	int i;
 
-	universe_hash_lookup(&u, universe_hash, name->data, name->len, MDL);
+	universe_hash_lookup(&u, universe_hash, (char *)name->data, name->len, MDL);
 	if (u == NULL) {
 		log_error("option_space_encapsulate: option space %.*s does "
 			  "not exist, but is configured.",
diff -uNr dhcp-3.1.orig/common/parse.c dhcp-3.1/common/parse.c
--- dhcp-3.1.orig/common/parse.c	2011-09-13 14:32:01.000000000 +0400
+++ dhcp-3.1/common/parse.c	2011-09-13 14:34:24.000000000 +0400
@@ -614,7 +614,7 @@
 	int base;
 	unsigned size;
 {
-	const unsigned char *ptr = str;
+	const char *ptr = str;
 	int negative = 0;
 	u_int32_t val = 0;
 	int tval;
diff -uNr dhcp-3.1.orig/common/print.c dhcp-3.1/common/print.c
--- dhcp-3.1.orig/common/print.c	2011-09-13 14:32:01.000000000 +0400
+++ dhcp-3.1/common/print.c	2011-09-13 14:37:13.000000000 +0400
@@ -45,7 +45,7 @@
 char *quotify_string (const char *s, const char *file, int line)
 {
 	unsigned len = 0;
-	const unsigned char *sp;
+	const char *sp;
 	char *buf, *nsp;
 
 	for (sp = s; sp && *sp; sp++) {
diff -uNr dhcp-3.1.orig/dst/dst_api.c dhcp-3.1/dst/dst_api.c
--- dhcp-3.1.orig/dst/dst_api.c	2011-09-13 14:32:01.000000000 +0400
+++ dhcp-3.1/dst/dst_api.c	2011-09-13 14:42:49.000000000 +0400
@@ -473,7 +473,7 @@
 	int proto, alg, dlen;
 	int c;
 	char name[PATH_MAX], enckey[RAW_KEY_SIZE];
-        unsigned char *notspace;
+        char *notspace;
 	u_char deckey[RAW_KEY_SIZE];
 	FILE *fp;
 
diff -uNr dhcp-3.1.orig/includes/dhcpd.h dhcp-3.1/includes/dhcpd.h
--- dhcp-3.1.orig/includes/dhcpd.h	2011-09-13 14:32:01.000000000 +0400
+++ dhcp-3.1/includes/dhcpd.h	2011-09-13 14:48:17.000000000 +0400
@@ -2096,7 +2096,7 @@
 #if defined (FAILOVER_PROTOCOL)
 int write_failover_state (dhcp_failover_state_t *);
 #endif
-int db_printable PROTO ((const unsigned char *));
+int db_printable PROTO ((const char *));
 int db_printable_len PROTO ((const unsigned char *, unsigned));
 isc_result_t write_named_billing_class(const void *, unsigned, void *);
 void write_billing_classes (void);
diff -uNr dhcp-3.1.orig/minires/ns_date.c dhcp-3.1/minires/ns_date.c
--- dhcp-3.1.orig/minires/ns_date.c	2009-07-24 01:43:34.000000000 +0400
+++ dhcp-3.1/minires/ns_date.c	2011-09-13 14:42:07.000000000 +0400
@@ -48,7 +48,7 @@
 
 /* Forward. */
 
-static int	datepart(const unsigned char *, int, int, int, int *);
+static int	datepart(const char *, int, int, int, int *);
 
 /* Public. */
 
@@ -118,7 +118,7 @@
  * Don't reset the flag if there is no error.
  */
 static int
-datepart(const unsigned char *buf, int size, int min, int max, int *errp) {
+datepart(const char *buf, int size, int min, int max, int *errp) {
 	int result = 0;
 	int i;
 
diff -uNr dhcp-3.1.orig/minires/res_init.c dhcp-3.1/minires/res_init.c
--- dhcp-3.1.orig/minires/res_init.c	2009-07-24 01:43:34.000000000 +0400
+++ dhcp-3.1/minires/res_init.c	2011-09-13 14:41:13.000000000 +0400
@@ -154,7 +154,7 @@
 int
 minires_vinit(res_state statp, int preinit) {
 	register FILE *fp;
-	register unsigned char *cp;
+	register char *cp;
 	register char **pp;
 	register int n;
 	char buf[BUFSIZ];
diff -uNr dhcp-3.1.orig/minires/res_query.c dhcp-3.1/minires/res_query.c
--- dhcp-3.1.orig/minires/res_query.c	2011-09-13 14:32:01.000000000 +0400
+++ dhcp-3.1/minires/res_query.c	2011-09-13 14:41:32.000000000 +0400
@@ -384,7 +384,7 @@
 const char *
 res_hostalias(const res_state statp, const char *name, char *dst, size_t siz) {
 	char *file;
-        unsigned char *cp1, *cp2;
+        char *cp1, *cp2;
 	char buf[BUFSIZ];
 	FILE *fp;
 
diff -uNr dhcp-3.1.orig/omapip/hash.c dhcp-3.1/omapip/hash.c
--- dhcp-3.1.orig/omapip/hash.c	2009-07-24 01:43:35.000000000 +0400
+++ dhcp-3.1/omapip/hash.c	2011-09-13 14:44:26.000000000 +0400
@@ -352,7 +352,7 @@
 		return (unsigned char *) "No table.";
 
 	if (table->hash_count == 0)
-		return (char *) "Invalid hash table.";
+		return (unsigned char *) "Invalid hash table.";
 
 	for (i = 0 ; i < table->hash_count ; i++) {
 		curlen = 0;
@@ -381,9 +381,9 @@
 	    pct > 2147483647 ||
 	    minlen > 2147483647 ||
 	    maxlen > 2147483647)
-		return (char *) "Report out of range for display.";
+		return (unsigned char *) "Report out of range for display.";
 
-	sprintf(retbuf, "Contents/Size (%%): %u/%u (%u%%). Min/max: %u/%u",
+	sprintf((char *) retbuf, "Contents/Size (%%): %u/%u (%u%%). Min/max: %u/%u",
 		contents, table->hash_count, pct, minlen, maxlen);
 
 	return retbuf;
diff -uNr dhcp-3.1.orig/server/db.c dhcp-3.1/server/db.c
--- dhcp-3.1.orig/server/db.c	2009-07-24 01:43:35.000000000 +0400
+++ dhcp-3.1/server/db.c	2011-09-13 14:49:27.000000000 +0400
@@ -539,7 +539,7 @@
 #endif
 
 int db_printable (s)
-	const unsigned char *s;
+	const char *s;
 {
 	int i;
 	for (i = 0; s [i]; i++)
diff -uNr dhcp-3.1.orig/server/dhcp.c dhcp-3.1/server/dhcp.c
--- dhcp-3.1.orig/server/dhcp.c	2011-09-13 14:32:01.000000000 +0400
+++ dhcp-3.1/server/dhcp.c	2011-09-13 14:48:56.000000000 +0400
@@ -4002,7 +4002,7 @@
 	if (option_cache_allocate(&oc, MDL)) {
 		a = &packet->interface->primary_address;
 		if (make_const_data(&oc->expression,
-				    (char *)a, sizeof(*a),
+				    (unsigned char *)a, sizeof(*a),
 				    0, 0, MDL)) {
 			option_code_hash_lookup(&oc->option, 
 						dhcp_universe.code_hash,
diff -uNr dhcp-3.1.orig/server/dhcpd.c dhcp-3.1/server/dhcpd.c
--- dhcp-3.1.orig/server/dhcpd.c	2011-09-13 14:32:01.000000000 +0400
+++ dhcp-3.1/server/dhcpd.c	2011-09-13 14:45:23.000000000 +0400
@@ -201,7 +201,7 @@
 	int fd;
 	int i, status;
 	struct servent *ent;
-	unsigned char *s;
+	char *s;
 	int cftest = 0;
 	int lftest = 0;
 #ifndef DEBUG
diff -uNr dhcp-3.1.orig/server/failover.c dhcp-3.1/server/failover.c
--- dhcp-3.1.orig/server/failover.c	2011-09-13 14:32:01.000000000 +0400
+++ dhcp-3.1/server/failover.c	2011-09-13 14:52:15.000000000 +0400
@@ -527,7 +527,7 @@
 				slen = strlen(sname);
 			    } else if (link->imsg->options_present &
 				       FTB_RELATIONSHIP_NAME) {
-				sname = link->imsg->relationship_name.data;
+				sname = (char *)link->imsg->relationship_name.data;
 				slen = link->imsg->relationship_name.count;
 			    } else {
 				sname = "unknown";