- Command line parsing in omshell was repaired - it no longer closes

  STDIN after reading one line. [ISC-Bugs #15545]
- The resolver library no longer closes the /etc/resolv.conf file
  descriptor it opened twice. [ISC-Bugs #15545]

diff --git a/RELNOTES b/RELNOTES
index b9e2544ccbf8462fe39812b9a7ad61bcfd8a9d74..85e6794d7622432cafd76e66b59eca64c495a386 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -44,6 +44,14 @@ thanks to all of these good people here, both for working on the code
 and for prodding me into improving it.
 
 
+                       Changes since 3.0.4b1
+
+- Command line parsing in omshell was repaired - it no longer closes
+  STDIN after reading one line.
+
+- The resolver library no longer closes the /etc/resolv.conf file
+  descriptor it opened twice.
+
                        Changes since 3.0.3
 
 - A DDNS update handling function was misusing the DNS error codes, rather

diff --git a/common/resolv.c b/common/resolv.c
index b84de027012c3254c6c2265f3a6b3a573b74d2bd..f4333b16dc6960de8bc5bf20dc1468004b264fbf 100644 (file)
--- a/common/resolv.c
+++ b/common/resolv.c
@@ -3,7 +3,7 @@
    Parser for /etc/resolv.conf file. */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: resolv.c,v 1.16.2.2 2004/06/10 17:59:20 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: resolv.c,v 1.16.2.3 2005/10/27 15:56:26 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -172,7 +172,6 @@ void read_resolv_conf (parse_time)
                } else
                        dl = dp;
        }
-       close (file);
        end_parse (&cfile);
 }
 

diff --git a/dhcpctl/omshell.c b/dhcpctl/omshell.c
index aabbe0419f51cafa19b99c10c7e069da041368b8..a762eb4e759f944fffdb4913ee5adf7fa67eaf7d 100644 (file)
--- a/dhcpctl/omshell.c
+++ b/dhcpctl/omshell.c
@@ -3,7 +3,7 @@
    Examine and modify omapi objects. */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2005 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2001-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: omshell.c,v 1.7.2.17 2004/09/30 23:11:50 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: omshell.c,v 1.7.2.18 2005/10/27 15:56:26 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include <time.h>
@@ -180,7 +180,7 @@ int main (int argc, char **argv, char **envp)
            if (fgets (buf, sizeof(buf), stdin) == NULL)
                break;
 
-           status = new_parse (&cfile, 0, buf, strlen(buf), "<STDIN>", 1);
+           status = new_parse (&cfile, -1, buf, strlen(buf), "<STDIN>", 1);
            check(status, "new_parse()");
            
            token = next_token (&val, (unsigned *)0, cfile);