From: Shawn Routhier Date: Wed, 30 Oct 2013 20:34:22 +0000 (-0700) Subject: [master] X-Git-Tag: v4_3_0a1~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58cb5d861d6f412475722381723dc788c314c39f;p=thirdparty%2Fdhcp.git [master] Squashed commit of the following: commit 9b0ea01f2afd1fb7ec1409166183a92731314ca7 Author: Shawn Routhier Date: Tue Oct 22 12:02:41 2013 -0700 -n [rt34924] Modify the on_commit code to use a reasonable scope as the reply->lease value may not be set, we should use the tmp->scope as we go through the iasubopts. --- diff --git a/server/dhcpv6.c b/server/dhcpv6.c index 7008817a6..4f150511e 100644 --- a/server/dhcpv6.c +++ b/server/dhcpv6.c @@ -1927,7 +1927,7 @@ reply_process_ia_na(struct reply_state *reply, struct option_cache *ia) { NULL, NULL, reply->packet->options, reply->opt_state, - &reply->lease->scope, + &tmp->scope, tmp->on_star.on_commit, &tmp->on_star); executable_statement_dereference @@ -2628,7 +2628,7 @@ reply_process_ia_ta(struct reply_state *reply, struct option_cache *ia) { NULL, NULL, reply->packet->options, reply->opt_state, - &reply->lease->scope, + &tmp->scope, tmp->on_star.on_commit, &tmp->on_star); executable_statement_dereference @@ -3647,7 +3647,7 @@ reply_process_ia_pd(struct reply_state *reply, struct option_cache *ia) { NULL, NULL, reply->packet->options, reply->opt_state, - &reply->lease->scope, + &tmp->scope, tmp->on_star.on_commit, &tmp->on_star); executable_statement_dereference