- Fix up expression evaluation calls.

diff --git a/common/memory.c b/common/memory.c
index cd506c6b5b386e2bf2164b597be9b5ea42dd3a10..830b912bc5345204a15ab5950790de3d61b7264b 100644 (file)
--- a/common/memory.c
+++ b/common/memory.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: memory.c,v 1.52 1999/07/02 20:57:24 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: memory.c,v 1.53 1999/07/31 17:57:27 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -86,8 +86,9 @@ void enter_host (hd)
                        evaluate_option_cache
                                (&hd -> client_identifier,
                                 (struct packet *)0,
-                                (struct option_state *)0,
                                 (struct lease *)0,
+                                (struct option_state *)0,
+                                (struct option_state *)0,
                                 esp -> data.option);
                        break;
                }
@@ -176,8 +177,9 @@ struct subnet *find_host_for_network (host, addr, share)
                if (!hp -> fixed_addr)
                        continue;
                if (!evaluate_data_expression (&fixed_addr, (struct packet *)0,
-                                              (struct option_state *)0,
                                               (struct lease *)0,
+                                              (struct option_state *)0,
+                                              (struct option_state *)0,
                                               hp -> fixed_addr -> expression))
                        continue;
                for (i = 0; i < fixed_addr.len; i += 4) {

diff --git a/common/nsupdate.c b/common/nsupdate.c
index b6463d97c0e8ede0436aec241db2fc1aa8fc8dbc..6d7d39d0a99633f5744797ae02d89495c19899db 100644 (file)
--- a/common/nsupdate.c
+++ b/common/nsupdate.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: nsupdate.c,v 1.6 1999/07/19 01:15:11 mellon Exp $ Copyright (c) 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: nsupdate.c,v 1.7 1999/07/31 17:57:36 mellon Exp $ Copyright (c) 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -60,8 +60,9 @@ char *ddns_rev_name(lease, state, packet)
        oc = lookup_option (&server_universe, state -> options,
                            SV_DDNS_REV_DOMAIN_NAME);
        memset (&d, 0, sizeof d);
-       if (oc && evaluate_option_cache (&d, packet,
-                                        packet -> options, lease, oc)) {
+       if (oc && evaluate_option_cache (&d, packet, lease,
+                                        packet -> options, state -> options,
+                                        oc)) {
                memcpy(revdomain, d.data, d.len);
                revdomain[d.len]='\0';
                data_string_forget (&d, "nsupdate");
@@ -105,8 +106,9 @@ char *ddns_fwd_name(lease, state, packet)
        oc = lookup_option (&server_universe, state -> options,
                            SV_DDNS_DOMAIN_NAME);
        memset (&d, 0, sizeof d);
-       if (oc && evaluate_option_cache (&d, packet,
-                                        packet -> options, lease, oc)) {
+       if (oc && evaluate_option_cache (&d, packet, lease,
+                                        packet -> options, state -> options,
+                                        oc)) {
                memcpy(domain, d.data, d.len);
                domain[d.len]='\0';
                data_string_forget (&d, "nsupdate");
@@ -114,8 +116,10 @@ char *ddns_fwd_name(lease, state, packet)
                oc = lookup_option (&dhcp_universe, state -> options,
                                    DHO_DOMAIN_NAME);
                memset (&d, 0, sizeof d);
-               if (oc && evaluate_option_cache (&d, packet, packet -> options,
-                                                lease, oc)) {
+               if (oc && evaluate_option_cache (&d, packet, lease,
+                                                packet -> options,
+                                                state -> options,
+                                                oc)) {
                        memcpy(domain, d.data, d.len);
                        domain[d.len]='\0';
                        data_string_forget (&d, "nsupdate");
@@ -134,8 +138,9 @@ char *ddns_fwd_name(lease, state, packet)
        oc = lookup_option (&server_universe, state -> options,
                            SV_DDNS_HOST_NAME);
        memset (&d, 0, sizeof d);
-       if (oc && evaluate_option_cache (&d, packet,
-                                        state -> options, lease, oc)) {
+       if (oc && evaluate_option_cache (&d, packet, lease,
+                                        packet -> options, state -> options,
+                                        oc)) {
                memcpy(hostname, d.data, d.len);
                hostname[d.len]='\0';
                data_string_forget (&d, "nsupdate");
@@ -143,8 +148,9 @@ char *ddns_fwd_name(lease, state, packet)
                oc = lookup_option (&dhcp_universe,
                                    packet -> options, DHO_HOST_NAME);
                memset (&d, 0, sizeof d);
-               if (oc && evaluate_option_cache (&d, packet, packet -> options,
-                                                lease, oc)) {
+               if (oc && evaluate_option_cache (&d, packet, lease,
+                                                packet -> options,
+                                                state -> options, oc)) {
                        memcpy(hostname, d.data, d.len);
                        hostname[d.len]='\0';
                        data_string_forget (&d, "nsupdate");