pullup:

681.   [bug]           $GENERATE specifying output format was broken. [RT#653]

diff --git a/CHANGES b/CHANGES
index f5ee41a9dfafd40fcb11b608a4653495e72a103d..cc682808e73827e5388c1b0c6f73594b1d0f550c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 
+ 681.  [bug]           $GENERATE specifying output format was broken. [RT#653]
+
        --- 9.1.0rc1 released ---
 
  679.  [bug]           $INCLUDE could leak memory and file descriptors on

diff --git a/lib/dns/master.c b/lib/dns/master.c
index 2fd0c27deaf331e442f15b467b1cd73da3d5cecd..173dc3ae66163c9ffca559dfeaae504800ceba72 100644 (file)
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master.c,v 1.88.2.3 2001/01/12 20:19:00 gson Exp $ */
+/* $Id: master.c,v 1.88.2.4 2001/01/16 17:43:55 gson Exp $ */
 
 #include <config.h>
 
@@ -447,7 +447,7 @@ genname(char *name, int it, char *buffer, size_t length) {
        char fmt[sizeof("%04000000000d")];
        char numbuf[128];
        char *cp;
-       char mode;
+       char mode[2];
        int delta = 0;
        isc_textregion_t r;
        unsigned int n;
@@ -470,7 +470,7 @@ genname(char *name, int it, char *buffer, size_t length) {
                        /* Get format specifier. */
                        if (*name == '{' ) {
                                n = sscanf(name, "{%d,%u,%1[doxX]}",
-                                          &delta, &width, &mode);
+                                          &delta, &width, mode);
                                switch (n) {
                                case 1:
                                        break;
@@ -480,7 +480,7 @@ genname(char *name, int it, char *buffer, size_t length) {
                                        break;
                                case 3:
                                        n = snprintf(fmt, sizeof(fmt),
-                                                    "%%0%u%c", width, mode);
+                                                    "%%0%u%c", width, mode[0]);
                                        break;
                                default:
                                        return (DNS_R_SYNTAX);