X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdhcpd-pools.c;h=abcb8ca1f7d6067d295f6214cb5145dbf8f16915;hb=8e09c76eae80ef56fa38a67463aee4da4278125c;hp=02669d2a3c624f13c573bab3b1b7f337bdcdca8a;hpb=93bcd305c40583bf7b7c611896f85b89899d47b5;p=debian%2Fdhcpd-pools.git

diff --git a/src/dhcpd-pools.c b/src/dhcpd-pools.c
index 02669d2..abcb8ca 100644
--- a/src/dhcpd-pools.c
+++ b/src/dhcpd-pools.c
@@ -189,9 +189,7 @@ int main(int argc, char **argv)
 
 	/* Do the job */
 	prepare_memory();
-	parse_config(true, config.dhcpdconf_file, shared_net_names,
-		     shared_net_names + strlen(shared_net_names) + 1,
-		     shared_networks);
+	parse_config(true, config.dhcpdconf_file, shared_networks);
 
 	parse_leases();
 	prepare_data();
@@ -205,13 +203,6 @@ int main(int argc, char **argv)
 	}
 	free(tmp_ranges);
 	output_analysis();
-	/* After fopen in output ioctl does like /dev/null which
-	 * cause ENOTTY, and clean_up will see that without this
-	 * reset. At least linux does this, and possibly some
-	 * other systems. There's a report from FreeBSD 8.0 which
-	 * matches quite well with this symptom. */
-	if (errno == 25)
-		errno = 0;
 
 	clean_up();
 	return (EXIT_SUCCESS);
@@ -220,16 +211,16 @@ int main(int argc, char **argv)
 /* Global allocations, counter resets etc */
 int prepare_memory()
 {
+	RANGES = 64;
 	num_ranges = num_shared_networks = 0;
 	shared_networks =
 	    safe_malloc(sizeof(struct shared_network_t) * SHARED_NETWORKS);
-	shared_net_names =
-	    safe_malloc(sizeof(char) * SHARED_NETWORKS_NAMES);
 
 	ranges = safe_malloc(sizeof(struct range_t) * RANGES);
 	macaddr = NULL;
 
 	/* First shared network entry is all networks */
-	strcpy(shared_net_names, "All networks");
+	shared_networks->name = safe_strdup("All networks");
+
 	return 0;
 }