[src/netbsd-1-5]: src/usr.sbin/dhcp/omapip Pull up revision 1.3 (requested by...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b0f29a7366db
branches:  netbsd-1-5
changeset: 491111:b0f29a7366db
user:      he <he%NetBSD.org@localhost>
date:      Wed Apr 04 20:56:37 2001 +0000

description:
Pull up revision 1.3 (requested by mellon):
  Update DHCP software to ISC version 3, Beta 2, Patchlevel 23.

diffstat:

 usr.sbin/dhcp/omapip/Makefile   |   2 +-
 usr.sbin/dhcp/omapip/protocol.c |  14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (56 lines):

diff -r 183d58fbb891 -r b0f29a7366db usr.sbin/dhcp/omapip/Makefile
--- a/usr.sbin/dhcp/omapip/Makefile     Wed Apr 04 20:56:35 2001 +0000
+++ b/usr.sbin/dhcp/omapip/Makefile     Wed Apr 04 20:56:37 2001 +0000
@@ -32,7 +32,7 @@
 LIB    = omapi
 SRCS   = protocol.c buffer.c alloc.c result.c connection.c errwarn.c \
          listener.c dispatch.c generic.c support.c handle.c message.c \
-        auth.c convert.c hash.c
+        auth.c convert.c hash.c array.c inet_addr.c mrtrace.c trace.c
 
 MKLINT=        no
 MKPIC= no
diff -r 183d58fbb891 -r b0f29a7366db usr.sbin/dhcp/omapip/protocol.c
--- a/usr.sbin/dhcp/omapip/protocol.c   Wed Apr 04 20:56:35 2001 +0000
+++ b/usr.sbin/dhcp/omapip/protocol.c   Wed Apr 04 20:56:37 2001 +0000
@@ -53,7 +53,7 @@
                                     unsigned port,
                                     omapi_object_t *a)
 {
-       isc_result_t status;
+       isc_result_t rstatus, status;
        omapi_protocol_object_t *obj;
 
 #ifdef DEBUG_PROTOCOL
@@ -65,10 +65,10 @@
        if (status != ISC_R_SUCCESS)
                return status;
 
-       status = omapi_connect ((omapi_object_t *)obj, server_name, port);
-       if (status != ISC_R_SUCCESS && status != ISC_R_INCOMPLETE) {
+       rstatus = omapi_connect ((omapi_object_t *)obj, server_name, port);
+       if (rstatus != ISC_R_SUCCESS && rstatus != ISC_R_INCOMPLETE) {
                omapi_protocol_dereference (&obj, MDL);
-               return status;
+               return rstatus;
        }
        status = omapi_object_reference (&h -> outer,
                                         (omapi_object_t *)obj, MDL);
@@ -102,14 +102,14 @@
                }
 
                obj -> insecure = 0;
-               status = ISC_R_INCOMPLETE;
+               rstatus = ISC_R_INCOMPLETE;
        } else {
                obj -> insecure = 1;
-               status = ISC_R_SUCCESS;
+               rstatus = ISC_R_SUCCESS;
        }
 
        omapi_protocol_dereference (&obj, MDL);
-       return status;
+       return rstatus;
 }
 
 /* Send the protocol introduction message. */