X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fscript.c;h=f350ea79e2850d50d51e25e261ca7a5f2b78459e;hb=5710bd46493eaa75a3c6b532d21b8237a691c5a8;hp=644f61f8a697921a2a21da98c1b67ccc045ab4a1;hpb=6373af63310f32e1408a81f4e4e069a5f0d3e59e;p=odhcp6c.git

diff --git a/src/script.c b/src/script.c
index 644f61f..f350ea7 100644
--- a/src/script.c
+++ b/src/script.c
@@ -228,6 +228,9 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len
 	const char *name = (state == STATE_S46_MAPE) ? "MAPE" :
 			(state == STATE_S46_MAPT) ? "MAPT" : "LW4O6";
 
+	if (len == 0)
+		return;
+
 	char *str;
 	size_t strsize;
 
@@ -378,8 +381,12 @@ void script_call(const char *status)
 		s46_to_env(STATE_S46_MAPT, s46_mapt, s46_mapt_len);
 		s46_to_env(STATE_S46_LW, s46_lw, s46_lw_len);
 		bin_to_env(custom, custom_len);
-		entry_to_env("PREFIXES", prefix, prefix_len, ENTRY_PREFIX);
-		entry_to_env("ADDRESSES", address, address_len, ENTRY_ADDRESS);
+
+		if (odhcp6c_is_bound()) {
+			entry_to_env("PREFIXES", prefix, prefix_len, ENTRY_PREFIX);
+			entry_to_env("ADDRESSES", address, address_len, ENTRY_ADDRESS);
+		}
+
 		entry_to_env("RA_ADDRESSES", ra_pref, ra_pref_len, ENTRY_ADDRESS);
 		entry_to_env("RA_ROUTES", ra_route, ra_route_len, ENTRY_ROUTE);
 		entry_to_env("RA_DNS", ra_dns, ra_dns_len, ENTRY_HOST);