Commit 54477d36 authored by Brian Wellington's avatar Brian Wellington
Browse files

The changes in #515 leaked memory and left dead code.

parent e2babfac
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: update.c,v 1.65 2000/09/29 03:25:23 marka Exp $ */
/* $Id: update.c,v 1.66 2000/10/13 23:21:17 bwelling Exp $ */
#include <config.h>
......@@ -2374,6 +2374,9 @@ update_action(isc_task_t *task, isc_event_t *event) {
if (db != NULL)
dns_db_detach(&db);
if (ssutable != NULL)
dns_ssutable_detach(&ssutable);
if (zone != NULL)
dns_zone_detach(&zone);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zoneconf.c,v 1.61 2000/08/29 03:48:00 marka Exp $ */
/* $Id: zoneconf.c,v 1.62 2000/10/13 23:21:16 bwelling Exp $ */
#include <config.h>
......@@ -342,15 +342,9 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview,
dns_zone_setupdateacl,
dns_zone_clearupdateacl));
dns_zone_getssutable(zone, &ssutable);
if (ssutable != NULL)
dns_ssutable_detach(&ssutable);
result = dns_c_zone_getssuauth(czone, &ssutable);
if (result == ISC_R_SUCCESS) {
dns_ssutable_t *newssutable = NULL;
dns_ssutable_attach(ssutable, &newssutable);
dns_zone_setssutable(zone, newssutable);
}
if (result == ISC_R_SUCCESS)
dns_zone_setssutable(zone, ssutable);
result = dns_c_zone_getsigvalidityinterval(czone, &uintval);
if (result != ISC_R_SUCCESS && cview != NULL)
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zoneconf.c,v 1.61 2000/08/29 03:48:00 marka Exp $ */
/* $Id: zoneconf.c,v 1.62 2000/10/13 23:21:16 bwelling Exp $ */
#include <config.h>
......@@ -342,15 +342,9 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview,
dns_zone_setupdateacl,
dns_zone_clearupdateacl));
dns_zone_getssutable(zone, &ssutable);
if (ssutable != NULL)
dns_ssutable_detach(&ssutable);
result = dns_c_zone_getssuauth(czone, &ssutable);
if (result == ISC_R_SUCCESS) {
dns_ssutable_t *newssutable = NULL;
dns_ssutable_attach(ssutable, &newssutable);
dns_zone_setssutable(zone, newssutable);
}
if (result == ISC_R_SUCCESS)
dns_zone_setssutable(zone, ssutable);
result = dns_c_zone_getsigvalidityinterval(czone, &uintval);
if (result != ISC_R_SUCCESS && cview != NULL)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment