mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 23:15:18 +00:00
Code Issues Releases Wiki Activity

Fix overzealous printing of newlines in message_[pseudo]sectiontotext().

Browse Source
This commit is contained in:
Michael Sawyer
2000-10-20 20:40:46 +00:00
parent 8ab588369b
commit c9c5b25473
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/dns/message.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: message.c,v 1.153 2000/10/20 02:21:47 marka Exp $ */ /* $Id: message.c,v 1.154 2000/10/20 20:40:46 mws Exp $ */
/*** /***
*** Imports *** Imports
@@ -2773,7 +2773,8 @@ dns_message_sectiontotext(dns_message_t *msg, dns_section_t section,
} }
result = dns_message_nextname(msg, section); result = dns_message_nextname(msg, section);
} while (result == ISC_R_SUCCESS); } while (result == ISC_R_SUCCESS);
if ((flags & DNS_MESSAGETEXTFLAG_NOHEADERS) == 0) if ((flags & DNS_MESSAGETEXTFLAG_NOHEADERS) == 0 &&
(flags & DNS_MESSAGETEXTFLAG_NOCOMMENTS) == 0)
ADD_STRING(target, "\n"); ADD_STRING(target, "\n");
if (result == ISC_R_NOMORE) if (result == ISC_R_NOMORE)
result = ISC_R_SUCCESS; result = ISC_R_SUCCESS;
@@ -2811,6 +2812,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg,
ADD_STRING(target, ";; TSIG PSEUDOSECTION:\n"); ADD_STRING(target, ";; TSIG PSEUDOSECTION:\n");
result = dns_rdataset_totext(ps, name, omit_final_dot, result = dns_rdataset_totext(ps, name, omit_final_dot,
ISC_FALSE, target); ISC_FALSE, target);
if ((flags & DNS_MESSAGETEXTFLAG_NOHEADERS) == 0 &&
(flags & DNS_MESSAGETEXTFLAG_NOCOMMENTS) == 0)
ADD_STRING(target, "\n"); ADD_STRING(target, "\n");
return (result); return (result);
case DNS_PSEUDOSECTION_SIG0: case DNS_PSEUDOSECTION_SIG0:
@@ -2821,7 +2824,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg,
ADD_STRING(target, ";; SIG0 PSEUDOSECTION:\n"); ADD_STRING(target, ";; SIG0 PSEUDOSECTION:\n");
result = dns_rdataset_totext(ps, name, omit_final_dot, result = dns_rdataset_totext(ps, name, omit_final_dot,
ISC_FALSE, target); ISC_FALSE, target);
if ((flags & DNS_MESSAGETEXTFLAG_NOHEADERS) == 0) if ((flags & DNS_MESSAGETEXTFLAG_NOHEADERS) == 0 &&
(flags & DNS_MESSAGETEXTFLAG_NOCOMMENTS) == 0)
ADD_STRING(target, "\n"); ADD_STRING(target, "\n");
return (result); return (result);
} }