Simplify the conditionals in the previous code.

diff --git a/server/omapi.c b/server/omapi.c
index 7e632573a5b4a51d290b0612ed37839e151633cd..980804101114c10d43d2e7be4b993a3cff38e23b 100644 (file)
--- a/server/omapi.c
+++ b/server/omapi.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: omapi.c,v 1.12 1999/10/06 19:07:58 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: omapi.c,v 1.13 1999/10/06 19:17:44 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1062,17 +1062,15 @@ isc_result_t dhcp_host_set_value  (omapi_object_t *h,
        }
 
        if (!omapi_ds_strcmp (name, "statements")) {
-               if (host -> group && host -> group -> statements &&
-                   (!host -> named_group ||
-                    host -> group != host -> named_group -> group) &&
-                   host -> group != &root_group)
-                       return ISC_R_EXISTS;
                if (!host -> group)
                        host -> group = clone_group (&root_group,
                                                     "dhcp_host_set_value");
-               if (host -> group == &root_group ||
-                   (host -> named_group &&
-                    host -> named_group -> group == host -> group)) {
+               else {
+                       if (host -> group -> statements &&
+                           (!host -> named_group ||
+                            host -> group != host -> named_group -> group) &&
+                           host -> group != &root_group)
+                               return ISC_R_EXISTS;
                        host -> group = clone_group (host -> group,
                                                     "dhcp_host_set_value");
                }