diff options
Diffstat (limited to 'contrib/bind/bin/named/ns_ixfr.c')
-rw-r--r-- | contrib/bind/bin/named/ns_ixfr.c | 62 |
1 files changed, 26 insertions, 36 deletions
diff --git a/contrib/bind/bin/named/ns_ixfr.c b/contrib/bind/bin/named/ns_ixfr.c index c013717..f14019e 100644 --- a/contrib/bind/bin/named/ns_ixfr.c +++ b/contrib/bind/bin/named/ns_ixfr.c @@ -1,5 +1,5 @@ #if !defined(lint) && !defined(SABER) -static const char rcsid[] = "$Id: ns_ixfr.c,v 8.26.2.2 2001/08/10 03:00:08 marka Exp $"; +static const char rcsid[] = "$Id: ns_ixfr.c,v 8.31 2002/01/02 05:15:20 marka Exp $"; #endif /* not lint */ /* @@ -232,8 +232,7 @@ sx_send_ixfr(struct qstream *qsp) { if (sx_addrr(qsp, rp->r_dname, rp->r_dp) < 0) goto cleanup; - db_freedata(rp->r_dp); - rp->r_dp = NULL; + db_detach(&rp->r_dp); foundsoa = 1; break; } @@ -268,8 +267,7 @@ sx_send_ixfr(struct qstream *qsp) { sx_addrr(qsp, rp->r_dname, rp->r_dp) < 0) goto cleanup; - db_freedata(rp->r_dp); - rp->r_dp = NULL; + db_detach(&rp->r_dp); } rp = NEXT(rp, r_link); } @@ -292,8 +290,7 @@ sx_send_ixfr(struct qstream *qsp) { if (sx_addrr(qsp, rp->r_dname, rp->r_dp) < 0) goto cleanup; - db_freedata(rp->r_dp); - rp->r_dp = NULL; + db_detach(&rp->r_dp); foundsoa = 1; break; } @@ -332,8 +329,7 @@ sx_send_ixfr(struct qstream *qsp) { if (sx_addrr(qsp, rp->r_dname, rp->r_dp) < 0) goto cleanup; - db_freedata(rp->r_dp); - rp->r_dp = NULL; + db_detach(&rp->r_dp); } rp = NEXT(rp, r_link); } @@ -344,10 +340,8 @@ sx_send_ixfr(struct qstream *qsp) { /* clean up old update */ while ((rp = HEAD(dp->d_changes)) != NULL) { UNLINK(dp->d_changes, rp, r_link); - if (rp->r_dp != NULL) { - db_freedata(rp->r_dp); - rp->r_dp = NULL; - } + if (rp->r_dp != NULL) + db_detach(&rp->r_dp); res_freeupdrec(rp); } memput(dp, sizeof (*dp)); @@ -379,8 +373,7 @@ sx_send_ixfr(struct qstream *qsp) { while ((rp = HEAD(dp->d_changes)) != NULL) { UNLINK(dp->d_changes, rp, r_link); if (rp->r_dp != NULL) - db_freedata(rp->r_dp); - rp->r_dp = NULL; + db_detach(&rp->r_dp); res_freeupdrec(rp); } memput(dp, sizeof *dp); @@ -432,9 +425,8 @@ ixfr_log_maint(struct zoneinfo *zp) { return (-1); } (void) my_fclose(db_fp); - ns_debug(ns_log_default, 3, "%s, size %d blk %d", - zp->z_source, db_sb.st_size, - db_sb.st_size); + ns_debug(ns_log_default, 3, "%s, size %ld", + zp->z_source, (long)db_sb.st_size); /* open up the zone ixfr log */ if ((from_fp = fopen(zp->z_ixfr_base, "r")) == NULL) { @@ -449,10 +441,8 @@ ixfr_log_maint(struct zoneinfo *zp) { (void) my_fclose(from_fp); return (-1); } - ns_debug(ns_log_default, 3, "%s, size %d max %d\n", - zp->z_ixfr_base, - sb.st_size, - zp->z_max_log_size_ixfr); + ns_debug(ns_log_default, 3, "%s, size %ld max %ld\n", zp->z_ixfr_base, + (long)sb.st_size, (long)zp->z_max_log_size_ixfr); if (zp->z_max_log_size_ixfr) { if (sb.st_size > zp->z_max_log_size_ixfr) seek = sb.st_size - @@ -467,7 +457,7 @@ ixfr_log_maint(struct zoneinfo *zp) { else seek = 0; } - ns_debug(ns_log_default, 3, "seek: %d", seek); + ns_debug(ns_log_default, 3, "seek: %ld", (long)seek); if (seek < 1) { ns_debug(ns_log_default, 3, "%s does not need to be reduced", zp->z_ixfr_base); @@ -489,7 +479,7 @@ ixfr_log_maint(struct zoneinfo *zp) { (void) strcat(tmpname, ".XXXXXX"); if ((fd = mkstemp(tmpname)) == -1) { - ns_warning(ns_log_db, "can't make tmpfile (%s): %s", + ns_warning(ns_log_db, "can't make tmpfile (%s): %s", tmpname, strerror(errno)); memput(tmpname, len); (void) my_fclose(from_fp); @@ -536,7 +526,8 @@ ixfr_log_maint(struct zoneinfo *zp) { break; } if (found) { - ns_debug(ns_log_default, 1, "ixfr_log_maint(): found [END_DELTA]"); + ns_debug(ns_log_default, 1, + "ixfr_log_maint(): found [END_DELTA]"); fprintf(to_fp, "%s", LogSignature); @@ -557,7 +548,8 @@ ixfr_log_maint(struct zoneinfo *zp) { (void) my_fclose(from_fp); if (error == 0) { if (isc_movefile(tmpname, zp->z_ixfr_base) == -1) { - ns_warning(ns_log_default, "can not rename %s to %s :%s", + ns_warning(ns_log_default, + "can not rename %s to %s :%s", tmpname, zp->z_ixfr_base, strerror(errno)); } if ((from_fp = fopen(zp->z_ixfr_base, "r")) == NULL) { @@ -576,25 +568,23 @@ ixfr_log_maint(struct zoneinfo *zp) { if (sb.st_size <= 0) (void) unlink(zp->z_ixfr_base); else if (chmod(zp->z_ixfr_base, 0644) < 0) - ns_error(ns_log_update, - "chmod(%s,%o) failed, pressing on: %s", - zp->z_source, sb.st_mode, - strerror(errno)); + ns_error(ns_log_update, + "chmod(%s,%o) failed, pressing on: %s", + zp->z_source, sb.st_mode, strerror(errno)); (void) my_fclose(from_fp); } (void) unlink(tmpname); memput(tmpname, len); - zp->z_serial_ixfr_start = 0; /* signal to read for lowest serial number */ + /* signal to read for lowest serial number */ + zp->z_serial_ixfr_start = 0; - ns_debug(ns_log_default, 3, "%s, size %d max %d\n", - zp->z_ixfr_base, - sb.st_size, - zp->z_max_log_size_ixfr); + ns_debug(ns_log_default, 3, "%s, size %ld max %ld\n", zp->z_ixfr_base, + (long)sb.st_size, (long)zp->z_max_log_size_ixfr); if (error) return(-1); else - return (0); + return (0); } |