checkpoint

diff --git a/lib/bind/configure b/lib/bind/configure
index 6090c6955e5558831562023e69a50e5d9866385a..012e45d46e4471ec6e18b7dbb67bf9836282f656 100644 (file)
--- a/lib/bind/configure
+++ b/lib/bind/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 
-# From configure.in Revision: 1.8 
+# From configure.in Revision: 1.9 
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
@@ -5812,7 +5812,35 @@ fi
 
 if eval "test \"`echo '$ac_cv_func_'getservent_r`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  :
+  cat > conftest.$ac_ext <<EOF
+#line 5817 "configure"
+#include "confdefs.h"
+
+#include <netdb.h>
+struct servent *
+getservent_r(struct servent *result, char *buffer, int buflen) {}
+
+int main() {
+return (0);
+; return 0; }
+EOF
+if { (eval echo configure:5828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+SERV_R_ARGS="#define SERV_R_ARGS char *buf, int buflen"
+SERV_R_BAD="#define SERV_R_BAD NULL"
+SERV_R_COPY="#define SERV_R_COPY buf, buflen"
+SERV_R_COPY_ARGS="#define SERV_R_COPY_ARGS SERV_R_ARGS"
+SERV_R_OK="#define SERV_R_OK sptr"
+SERV_R_RETURN="#define SERV_R_RETURN struct servent *"
+
+
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+
 else
   echo "$ac_t""no" 1>&6
 SERV_R_ARGS="#define SERV_R_ARGS char *buf, int buflen"
@@ -5832,12 +5860,12 @@ fi
 
 
 echo $ac_n "checking for endservent_r""... $ac_c" 1>&6
-echo "configure:5836: checking for endservent_r" >&5
+echo "configure:5864: checking for endservent_r" >&5
 if eval "test \"`echo '$''{'ac_cv_func_endservent_r'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5841 "configure"
+#line 5869 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char endservent_r(); below.  */
@@ -5860,7 +5888,7 @@ endservent_r();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_endservent_r=yes"
 else
@@ -5888,12 +5916,12 @@ fi
 
 
 echo $ac_n "checking for setservent_r""... $ac_c" 1>&6
-echo "configure:5892: checking for setservent_r" >&5
+echo "configure:5920: checking for setservent_r" >&5
 if eval "test \"`echo '$''{'ac_cv_func_setservent_r'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5897 "configure"
+#line 5925 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char setservent_r(); below.  */
@@ -5916,7 +5944,7 @@ setservent_r();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_setservent_r=yes"
 else
@@ -6019,7 +6047,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6023: checking for $ac_word" >&5
+echo "configure:6051: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_JADE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6066,7 +6094,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6070: checking for $ac_word" >&5
+echo "configure:6098: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6108,7 +6136,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6112: checking for $ac_word" >&5
+echo "configure:6140: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PDFTEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6153,7 +6181,7 @@ done
 SGMLDIR=""
 
 echo $ac_n "checking for SGML files""... $ac_c" 1>&6
-echo "configure:6157: checking for SGML files" >&5
+echo "configure:6185: checking for SGML files" >&5
 for d in /usr/pkg/share/sgml /usr/local/share/sgml 
 do
        if test -f $d/docbook/dsssl/modular/html/docbook.dsl
@@ -6178,7 +6206,7 @@ fi
 XGMLDIR=""
 
 echo $ac_n "checking for XML files""... $ac_c" 1>&6
-echo "configure:6182: checking for XML files" >&5
+echo "configure:6210: checking for XML files" >&5
 for d in /usr/pkg/share/xml /usr/local/share/xml
 do
        if test -f $d/dtd/docbook/docbookx.dtd

diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index 0b37f0341b6d79c5a0f61c2ec3186fd71b60b10b..6fa7fcfb173ad68c84de6e2647985fed0f578c0b 100644 (file)
--- a/lib/bind/configure.in
+++ b/lib/bind/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.9 $)
+AC_REVISION($Revision: 1.10 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -1519,6 +1519,21 @@ AC_SUBST(PASS_R_SET_RESULT)
 AC_SUBST(PASS_R_SET_RETURN)
 
 AC_CHECK_FUNC(getservent_r,
+AC_TRY_COMPILE([
+#include <netdb.h>
+struct servent *
+getservent_r(struct servent *result, char *buffer, int buflen) {}
+],[return (0);],
+[
+SERV_R_ARGS="#define SERV_R_ARGS char *buf, int buflen"
+SERV_R_BAD="#define SERV_R_BAD NULL"
+SERV_R_COPY="#define SERV_R_COPY buf, buflen"
+SERV_R_COPY_ARGS="#define SERV_R_COPY_ARGS SERV_R_ARGS"
+SERV_R_OK="#define SERV_R_OK sptr"
+SERV_R_RETURN="#define SERV_R_RETURN struct servent *"
+]
+,
+)
 ,
 SERV_R_ARGS="#define SERV_R_ARGS char *buf, int buflen"
 SERV_R_BAD="#define SERV_R_BAD NULL"

diff --git a/lib/bind/dst/dst_api.c b/lib/bind/dst/dst_api.c
index 6d5e17f2b079fa1e5b667314ceedab18403ddb3c..ca21f7563faba05e162b584a57b3aebdc916d31e 100644 (file)
--- a/lib/bind/dst/dst_api.c
+++ b/lib/bind/dst/dst_api.c
@@ -1,5 +1,5 @@
 #ifndef LINT
-static const char rcsid[] = "$Header: /u0/home/explorer/proj/ISC/git-conversion/cvsroot/bind9/lib/bind/dst/Attic/dst_api.c,v 1.3 2001/04/03 00:28:10 bwelling Exp $";
+static const char rcsid[] = "$Header: /u0/home/explorer/proj/ISC/git-conversion/cvsroot/bind9/lib/bind/dst/Attic/dst_api.c,v 1.4 2001/04/03 06:42:17 marka Exp $";
 #endif
 
 /*
@@ -553,7 +553,7 @@ dst_s_read_public_key(const char *in_name, const u_int16_t in_id, int in_alg)
        enckey[--len] = '\0';
 
        /* remove leading spaces */
-       for (notspace = (char *) enckey; isspace((*notspace)&0xff); len--)
+       for (notspace = (char *) enckey; isspace((unsigned char)*notspace); len--)
                notspace++;
 
        dlen = b64_pton(notspace, deckey, sizeof(deckey));

diff --git a/lib/bind/inet/inet_net_pton.c b/lib/bind/inet/inet_net_pton.c
index 023335e35bae7a6ddff37ae056105d3b100d4af9..02c6bb410ee1de27fa1795a58c6b3e410435126f 100644 (file)
--- a/lib/bind/inet/inet_net_pton.c
+++ b/lib/bind/inet/inet_net_pton.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_pton.c,v 1.2 2001/04/03 05:52:50 marka Exp $";
+static const char rcsid[] = "$Id: inet_net_pton.c,v 1.3 2001/04/03 06:42:19 marka Exp $";
 #endif
 
 #include "port_before.h"
@@ -103,7 +103,8 @@ inet_net_pton_ipv4(src, dst, size)
 
        ch = *src++;
        if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
-           && isascii(src[1]&0xff) && isxdigit(src[1]&0xff)) {
+           && isascii((unsigned char)(src[1]))
+           && isxdigit((unsigned char)(src[1]))) {
                /* Hexadecimal: Eat nybble string. */
                if (size <= 0)
                        goto emsgsize;

diff --git a/lib/bind/inet/inet_network.c b/lib/bind/inet/inet_network.c
index 74f3a48b03dc02ae77ceffa7804473131a763b13..9090d135f51c23f7bdeef744b2d746c15009fa60 100644 (file)
--- a/lib/bind/inet/inet_network.c
+++ b/lib/bind/inet/inet_network.c
@@ -65,7 +65,7 @@ again:
        if (*cp == 'x' || *cp == 'X')
                base = 16, cp++;
        while ((c = *cp) != 0) {
-               if (isdigit(c&0xff)) {
+               if (isdigit((unsigned char)c)) {
                        if (base == 8 && (c == '8' || c == '9'))
                                return (INADDR_NONE);
                        val = (val * base) + (c - '0');
@@ -73,9 +73,9 @@ again:
                        digit = 1;
                        continue;
                }
-               if (base == 16 && isxdigit(c&0xff)) {
+               if (base == 16 && isxdigit((unsigned char)c)) {
                        val = (val << 4) +
-                             (c + 10 - (islower(c&0xff) ? 'a' : 'A'));
+                             (c + 10 - (islower((unsigned char)c) ? 'a' : 'A'));
                        cp++;
                        digit = 1;
                        continue;

diff --git a/lib/bind/irs/dns_nw.c b/lib/bind/irs/dns_nw.c
index 8f113d2c659cc45434acb0e240a7432260071912..ab93ff5be6886a84471e8fdaa305dc2414464796 100644 (file)
--- a/lib/bind/irs/dns_nw.c
+++ b/lib/bind/irs/dns_nw.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns_nw.c,v 1.2 2001/04/03 05:52:54 marka Exp $";
+static const char rcsid[] = "$Id: dns_nw.c,v 1.3 2001/04/03 06:42:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -545,7 +545,7 @@ normalize_name(char *name) {
 
        /* Make lower case. */
        for (t = name; *t; t++)
-               if (isascii(*t&0xff) && isupper(*t&0xff))
+               if (isascii((unsigned char)*t) && isupper((unsigned char)*t))
                        *t = tolower(*t);
 
        /* Remove trailing dots. */

diff --git a/lib/bind/irs/dns_pr.c b/lib/bind/irs/dns_pr.c
index d277bd16a3ac80062e11a06e472fbc62ae150034..6096f2aa33f8ab0b1b69e2a551826d738658e4b5 100644 (file)
--- a/lib/bind/irs/dns_pr.c
+++ b/lib/bind/irs/dns_pr.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns_pr.c,v 1.2 2001/04/03 05:52:55 marka Exp $";
+static const char rcsid[] = "$Id: dns_pr.c,v 1.3 2001/04/03 06:42:22 marka Exp $";
 #endif
 
 /* Imports */
@@ -204,7 +204,7 @@ parse_hes_list(struct irs_pr *this, char **hes_list) {
 
                /* Skip blank lines. */
                p = cp;
-               while (*p && !isspace(*p&0xff))
+               while (*p && !isspace((unsigned char)*p))
                        p++;
                if (!*p)
                        continue;
@@ -216,14 +216,14 @@ parse_hes_list(struct irs_pr *this, char **hes_list) {
 
                p = pvt->prbuf;
                pvt->proto.p_name = p;
-               while (*p && !isspace(*p&0xff))
+               while (*p && !isspace((unsigned char)*p))
                        p++;
                if (!*p)
                        continue;
                *p++ = '\0';
 
                pvt->proto.p_proto = atoi(p);
-               while (*p && !isspace(*p&0xff))
+               while (*p && !isspace((unsigned char)*p))
                        p++;
                if (*p)
                        *p++ = '\0';
@@ -240,7 +240,7 @@ parse_hes_list(struct irs_pr *this, char **hes_list) {
                                pvt->proto.p_aliases = new;
                        }
                        pvt->proto.p_aliases[num++] = p;
-                       while (*p && !isspace(*p&0xff))
+                       while (*p && !isspace((unsigned char)*p))
                                p++;
                        if (*p)
                                *p++ = '\0';

diff --git a/lib/bind/irs/dns_sv.c b/lib/bind/irs/dns_sv.c
index f1dde079c61758db5c84d68cba8449b6031e6300..e215adb41bb5d757d8e823d109c39c8781b89e29 100644 (file)
--- a/lib/bind/irs/dns_sv.c
+++ b/lib/bind/irs/dns_sv.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns_sv.c,v 1.2 2001/04/03 05:52:56 marka Exp $";
+static const char rcsid[] = "$Id: dns_sv.c,v 1.3 2001/04/03 06:42:23 marka Exp $";
 #endif
 
 /* Imports */
@@ -198,7 +198,7 @@ parse_hes_list(struct irs_sv *this, char **hes_list, const char *proto) {
 
                /* Check to make sure the protocol matches. */
                p = cp;
-               while (*p && !isspace(*p&0xff))
+               while (*p && !isspace((unsigned char)*p))
                        p++;
                if (!*p)
                        continue;

diff --git a/lib/bind/irs/gen.c b/lib/bind/irs/gen.c
index 5f9d7b92199bf2d0aa4f4704c0a7761bcf5ed3cb..1863040b06f5a6764bb2c8e32b6324b9e819b0a8 100644 (file)
--- a/lib/bind/irs/gen.c
+++ b/lib/bind/irs/gen.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: gen.c,v 1.2 2001/04/03 05:52:57 marka Exp $";
+static const char rcsid[] = "$Id: gen.c,v 1.3 2001/04/03 06:42:25 marka Exp $";
 #endif
 
 /*
@@ -400,7 +400,8 @@ init_map_rules(struct gen_p *irs, const char *conf_file) {
                int n;
 
                for (tmp = line;
-                    isascii(*tmp&0xff) && isspace(*tmp&0xff);
+                    isascii((unsigned char)*tmp) &&
+                    isspace((unsigned char)*tmp);
                     tmp++)
                        (void)NULL;
                if (*tmp == '#' || *tmp == '\n' || *tmp == '\0')

diff --git a/lib/bind/irs/getnetent.c b/lib/bind/irs/getnetent.c
index c87ec13bbba1317d1a38303bc17c3a5fbbba9534..8d578698888dbc52bd0bac718051fa1c64622021 100644 (file)
--- a/lib/bind/irs/getnetent.c
+++ b/lib/bind/irs/getnetent.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: getnetent.c,v 1.2 2001/04/03 05:52:58 marka Exp $";
+static const char rcsid[] = "$Id: getnetent.c,v 1.3 2001/04/03 06:42:26 marka Exp $";
 #endif
 
 /* Imports */
@@ -259,7 +259,8 @@ fakeaddr(const char *name, int af, struct net_data *net_data) {
                RES_SET_H_ERRNO(net_data->res, NETDB_INTERNAL);
                return (NULL);
        }
-       if (!isascii(name[0]&0xff) || !isdigit(name[0]&0xff))
+       if (!isascii((unsigned char)(name[0])) ||
+           !isdigit((unsigned char)(name[0])))
                return (NULL);
        for (cp = name; *cp; ++cp)
                if (!isascii(*cp) || (!isdigit(*cp) && *cp != '.'))

diff --git a/lib/bind/irs/irp.c b/lib/bind/irs/irp.c
index 9d851fce29813239f5a0e980576cbc9acd71bddd..2769c6d0f5e4df1a70b1be739491b37a598de380 100644 (file)
--- a/lib/bind/irs/irp.c
+++ b/lib/bind/irs/irp.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: irp.c,v 1.2 2001/04/03 05:52:59 marka Exp $";
+static const char rcsid[] = "$Id: irp.c,v 1.3 2001/04/03 06:42:27 marka Exp $";
 #endif
 
 /* Imports */
@@ -389,9 +389,9 @@ irs_irp_read_response(struct irp_p *pvt, char *text, size_t textlen) {
                code = 0;
        } else if (text != NULL && textlen > 0) {
                p = line;
-               while (isspace(*p&0xff)) p++;
-               while (isdigit(*p&0xff)) p++;
-               while (isspace(*p&0xff)) p++;
+               while (isspace((unsigned char)*p)) p++;
+               while (isdigit((unsigned char)*p)) p++;
+               while (isspace((unsigned char)*p)) p++;
                strncpy(text, p, textlen - 1);
                p[textlen - 1] = '\0';
        }

diff --git a/lib/bind/irs/irpmarshall.c b/lib/bind/irs/irpmarshall.c
index fa958ac74d367214ddf7bce6d3b97f08d1bbf7b9..c98e9e5726e84ba0ff93faffe18897d28bb9bcc6 100644 (file)
--- a/lib/bind/irs/irpmarshall.c
+++ b/lib/bind/irs/irpmarshall.c
@@ -49,7 +49,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: irpmarshall.c,v 1.2 2001/04/03 05:53:00 marka Exp $";
+static const char rcsid[] = "$Id: irpmarshall.c,v 1.3 2001/04/03 06:42:28 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #if 0
@@ -1260,7 +1260,7 @@ irp_unmarshall_ng(const char **hostp, const char **userp, const char **domainp,
        host = user = domain = NULL;
 
        p = buffer;
-       while (isspace(*p&0xff)) {
+       while (isspace((unsigned char)*p)) {
                p++;
        }
        if (*p != '(') {

diff --git a/lib/bind/isc/ctl_clnt.c b/lib/bind/isc/ctl_clnt.c
index 054df531d0cb1cd51e797cffa1883e99b1f81cbd..cbf6ac02032c5d9540fce3db9108f69bc1245971 100644 (file)
--- a/lib/bind/isc/ctl_clnt.c
+++ b/lib/bind/isc/ctl_clnt.c
@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: ctl_clnt.c,v 1.2 2001/04/03 05:53:02 marka Exp $";
+static const char rcsid[] = "$Id: ctl_clnt.c,v 1.3 2001/04/03 06:42:29 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -55,8 +55,9 @@ static const char rcsid[] = "$Id: ctl_clnt.c,v 1.2 2001/04/03 05:53:02 marka Exp
 /* Macros. */
 
 #define donefunc_p(ctx) ((ctx).donefunc != NULL)
-#define arpacode_p(line) (isdigit(line[0]&0xff) && isdigit(line[1]&0xff) && \
-                         isdigit(line[2]&0xff))
+#define arpacode_p(line) (isdigit((unsigned char)(line[0])) && \
+                         isdigit((unsigned char)(line[1])) && \
+                         isdigit((unsigned char)(line[2])))
 #define arpacont_p(line) (line[3] == '-')
 #define arpadone_p(line) (line[3] == ' ' || line[3] == '\t' || \
                          line[3] == '\r' || line[3] == '\0')
@@ -243,7 +244,8 @@ ctl_command(struct ctl_cctx *ctx, const char *cmd, size_t len,
        memcpy(tran->outbuf.text, cmd, len);
        tran->outbuf.used = len;
        for (pc = tran->outbuf.text, n = 0; n < tran->outbuf.used; pc++, n++)
-               if (!isascii(*pc&0xff) || !isprint(*pc&0xff))
+               if (!isascii((unsigned char)*pc) ||
+                   !isprint((unsigned char)*pc))
                        *pc = '\040';
        start_write(ctx);
        return (0);

diff --git a/lib/bind/isc/ctl_srvr.c b/lib/bind/isc/ctl_srvr.c
index afdd83bcbe2f192b994ab2b0913ad17e7d16b7ca..1d2f449e47639ae121cc8929b43a347d7ea855e9 100644 (file)
--- a/lib/bind/isc/ctl_srvr.c
+++ b/lib/bind/isc/ctl_srvr.c
@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: ctl_srvr.c,v 1.2 2001/04/03 02:30:56 marka Exp $";
+static const char rcsid[] = "$Id: ctl_srvr.c,v 1.3 2001/04/03 06:42:30 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -329,8 +329,10 @@ ctl_response(struct ctl_sess *sess, u_int code, const char *text,
        sess->outbuf.used = SPRINTF((sess->outbuf.text, "%03d%c%s\r\n",
                                     code, (flags & CTL_MORE) != 0 ? '-' : ' ',
                                     text));
-       for (pc = sess->outbuf.text, n = 0; n < (int)sess->outbuf.used-2; pc++, n++)
-               if (!isascii(*pc&0xff) || !isprint(*pc&0xff))
+       for (pc = sess->outbuf.text, n = 0;
+            n < (int)sess->outbuf.used-2; pc++, n++)
+               if (!isascii((unsigned char)*pc) ||
+                   !isprint((unsigned char)*pc))
                        *pc = '\040';
        *iovp++ = evConsIovec(sess->outbuf.text, sess->outbuf.used);
        if (body != NULL) {

diff --git a/lib/bind/nameser/ns_date.c b/lib/bind/nameser/ns_date.c
index 69b1717380cb628bf67f02e2c87df58e744271b1..9998072bb873ee8a2a5458219e6f0beda5d42f74 100644 (file)
--- a/lib/bind/nameser/ns_date.c
+++ b/lib/bind/nameser/ns_date.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_date.c,v 1.2 2001/04/02 09:41:33 marka Exp $";
+static const char rcsid[] = "$Id: ns_date.c,v 1.3 2001/04/03 06:42:32 marka Exp $";
 #endif
 
 /* Import. */
@@ -116,7 +116,7 @@ datepart(const char *buf, int size, int min, int max, int *errp) {
        int i;
 
        for (i = 0; i < size; i++) {
-               if (!isdigit(buf[i]&0xff))
+               if (!isdigit((unsigned char)(buf[i])))
                        *errp = 1;
                result = (result * 10) + buf[i] - '0';
        }

diff --git a/lib/bind/port_after.h.in b/lib/bind/port_after.h.in
index a7ad5dc52323c4871a4bc5d6cf4bd0732692fec7..067742a188cc3e176c48cdcf3a0c59c72dfbe497 100644 (file)
--- a/lib/bind/port_after.h.in
+++ b/lib/bind/port_after.h.in
@@ -89,6 +89,11 @@ extern const struct in6_addr in6addr_any;
 #define MAXHOSTNAMELEN 256
 #endif
 
+#ifndef INET6_ADDRSTRLEN
+/* sizeof("aaaa:bbbb:cccc:dddd:eeee:ffff:123.123.123.123") */
+#define INET6_ADDRSTRLEN 46
+#endif
+
 #ifndef MIN
 #define MIN(x,y) (((x) <= (y)) ? (x) : (y))
 #endif

diff --git a/lib/bind/resolv/res_query.c b/lib/bind/resolv/res_query.c
index 3fb5c6e2d2b3fa36e6b72ee7c517698de33d90d8..e77de9dd0299e7de6137b6ef93427bcecbdfa3ce 100644 (file)
--- a/lib/bind/resolv/res_query.c
+++ b/lib/bind/resolv/res_query.c
@@ -70,7 +70,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_query.c  8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_query.c,v 1.1 2001/03/29 06:31:59 marka Exp $";
+static const char rcsid[] = "$Id: res_query.c,v 1.2 2001/04/03 06:42:33 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "port_before.h"
@@ -402,17 +402,18 @@ res_hostalias(const res_state statp, const char *name, char *dst, size_t siz) {
        setbuf(fp, NULL);
        buf[sizeof(buf) - 1] = '\0';
        while (fgets(buf, sizeof(buf), fp)) {
-               for (cp1 = buf; *cp1 && !isspace(*cp1); ++cp1)
+               for (cp1 = buf; *cp1 && !isspace((unsigned char)*cp1); ++cp1)
                        ;
                if (!*cp1)
                        break;
                *cp1 = '\0';
                if (ns_samename(buf, name) == 1) {
-                       while (isspace(*++cp1))
+                       while (isspace((unsigned char)*++cp1))
                                ;
                        if (!*cp1)
                                break;
-                       for (cp2 = cp1 + 1; *cp2 && !isspace(*cp2); ++cp2)
+                       for (cp2 = cp1 + 1; *cp2 &&
+                            !isspace((unsigned char)*cp2); ++cp2)
                                ;
                        *cp2 = '\0';
                        strncpy(dst, cp1, siz - 1);