X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=8fe3c516c14d08646ffad222a4bce8edb116c5e0;hb=46a5aa0d674914f4220d8583b1b2f87c7f05a804;hp=1e6b4c65318752696584d03c92d0173a27f56e54;hpb=e76df30cb2af7a22e9c1dc91bb47a76c2fcbc43d;p=tinc

diff --git a/src/net.c b/src/net.c
index 1e6b4c65..8fe3c516 100644
--- a/src/net.c
+++ b/src/net.c
@@ -347,11 +347,14 @@ int reload_configuration(void) {
 
 	if(strictsubnets) {
 		for splay_each(subnet_t, subnet, subnet_tree)
-			subnet->expires = 1;
+			if (subnet->owner)
+				subnet->expires = 1;
 
 		load_all_subnets();
 
 		for splay_each(subnet_t, subnet, subnet_tree) {
+			if (!subnet->owner)
+				continue;
 			if(subnet->expires == 1) {
 				send_del_subnet(everyone, subnet);
 				if(subnet->owner->status.reachable)
@@ -465,7 +468,7 @@ int main_loop(void) {
 #endif
 
 	if(!event_loop()) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error while waiting for input: %s", strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error while waiting for input: %s", sockstrerror(sockerrno));
 		return 1;
 	}