iana portlist updated

git-svn-id: file:///svn/unbound/trunk@2370 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 6b78c59ce43f8f745e9b0a1d2f1cea493f226c2e..b69b30c499e532afcc8090c4b85bb45d2859a5a2 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+12 January 2011: Wouter
+       - iana portlist updated.
+
 11 January 2011: Wouter
        - Fix insecure CNAME sequence marked as secure, reported by Bert
          Hubert.

diff --git a/util/configlexer.c b/util/configlexer.c
index 9877393a84d0eda0254f25cada6de60ad05cf987..4b057d12cbb3bd98a8e24928be981151d3b75421 100644 (file)
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -1610,7 +1610,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1621,7 +1621,7 @@ static int input (void );
        if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
                { \
                int c = '*'; \
-               unsigned n; \
+               int n; \
                for ( n = 0; n < max_size && \
                             (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
                        buf[n] = (char) c; \

diff --git a/util/iana_ports.inc b/util/iana_ports.inc
index b9b90062fffd649210a1e5afce03382b75130099..766e96f4c7d0b4a37ed9ff7ed9ae3c9022ca4cb2 100644 (file)
--- a/util/iana_ports.inc
+++ b/util/iana_ports.inc
@@ -4855,6 +4855,7 @@
 9283,
 9284,
 9285,
+9286,
 9287,
 9292,
 9293,
@@ -5286,6 +5287,7 @@
 43441,
 44321,
 44322,
+44323,
 44553,
 44818,
 45054,