Add an extra argument to rc_register.

9 files changed, 34 insertions, 30 deletions

diff --git a/common/alloc.c b/common/alloc.c
index 0e64a7f4..67988146 100644
--- a/common/alloc.c
+++ b/common/alloc.c
@@ -3,7 +3,7 @@
    Memory allocation... */
 
 /*
- * Copyright (c) 1996-2000 Internet Software Consortium.
+ * Copyright (c) 1996-2001 Internet Software Consortium.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: alloc.c,v 1.53.2.6 2001/06/21 23:31:13 mellon Exp $ Copyright (c) 1996-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: alloc.c,v 1.53.2.7 2001/10/18 20:09:34 mellon Exp $ Copyright (c) 1996-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -109,7 +109,7 @@ int option_chain_head_reference (ptr, bp, file, line)
 	}
 	*ptr = bp;
 	bp -> refcnt++;
-	rc_register (file, line, ptr, bp, bp -> refcnt, 0);
+	rc_register (file, line, ptr, bp, bp -> refcnt, 0, RC_MISC);
 	return 1;
 }
 
@@ -134,8 +134,8 @@ int option_chain_head_dereference (ptr, file, line)
 	option_chain_head = *ptr;
 	*ptr = (struct option_chain_head *)0;
 	--option_chain_head -> refcnt;
-	rc_register (file, line, ptr,
-		     option_chain_head, option_chain_head -> refcnt, 1);
+	rc_register (file, line, ptr, option_chain_head,
+		     option_chain_head -> refcnt, 1, RC_MISC);
 	if (option_chain_head -> refcnt > 0)
 		return 1;
 
@@ -222,7 +222,7 @@ int group_reference (ptr, bp, file, line)
 	}
 	*ptr = bp;
 	bp -> refcnt++;
-	rc_register (file, line, ptr, bp, bp -> refcnt, 0);
+	rc_register (file, line, ptr, bp, bp -> refcnt, 0, RC_MISC);
 	return 1;
 }
 
@@ -246,7 +246,7 @@ int group_dereference (ptr, file, line)
 	group = *ptr;
 	*ptr = (struct group *)0;
 	--group -> refcnt;
-	rc_register (file, line, ptr, group, group -> refcnt, 1);
+	rc_register (file, line, ptr, group, group -> refcnt, 1, RC_MISC);
 	if (group -> refcnt > 0)
 		return 1;
 
@@ -496,7 +496,7 @@ int expression_reference (ptr, src, file, line)
 	}
 	*ptr = src;
 	src -> refcnt++;
-	rc_register (file, line, ptr, src, src -> refcnt, 0);
+	rc_register (file, line, ptr, src, src -> refcnt, 0, RC_MISC);
 	return 1;
 }
 
diff --git a/common/comapi.c b/common/comapi.c
index 568a5d70..a038903f 100644
--- a/common/comapi.c
+++ b/common/comapi.c
@@ -50,7 +50,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: comapi.c,v 1.9.2.4 2001/06/20 03:14:18 mellon Exp $ Copyright (c) 1999-2001 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: comapi.c,v 1.9.2.5 2001/10/18 20:09:59 mellon Exp $ Copyright (c) 1999-2001 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -84,7 +84,7 @@ void dhcp_common_objects_setup ()
 					     dhcp_control_create,
 					     dhcp_control_remove, 0, 0, 0,
 					     sizeof (dhcp_control_object_t),
-					     0);
+					     0, RC_MISC);
 	if (status != ISC_R_SUCCESS)
 		log_fatal ("Can't register control object type: %s",
 			   isc_result_totext (status));
@@ -104,7 +104,8 @@ void dhcp_common_objects_setup ()
 					     dhcp_group_lookup, 
 					     dhcp_group_create,
 					     dhcp_group_remove, 0, 0, 0,
-					     sizeof (struct group_object), 0);
+					     sizeof (struct group_object), 0,
+					     RC_MISC);
 	if (status != ISC_R_SUCCESS)
 		log_fatal ("Can't register group object type: %s",
 			   isc_result_totext (status));
@@ -119,7 +120,8 @@ void dhcp_common_objects_setup ()
 					     dhcp_subnet_lookup, 
 					     dhcp_subnet_create,
 					     dhcp_subnet_remove, 0, 0, 0,
-					     sizeof (struct subnet), 0);
+					     sizeof (struct subnet), 0,
+					     RC_MISC);
 	if (status != ISC_R_SUCCESS)
 		log_fatal ("Can't register subnet object type: %s",
 			   isc_result_totext (status));
@@ -135,7 +137,7 @@ void dhcp_common_objects_setup ()
 		 dhcp_shared_network_lookup, 
 		 dhcp_shared_network_create,
 		 dhcp_shared_network_remove, 0, 0, 0,
-		 sizeof (struct shared_network), 0);
+		 sizeof (struct shared_network), 0, RC_MISC);
 	if (status != ISC_R_SUCCESS)
 		log_fatal ("Can't register shared network object type: %s",
 			   isc_result_totext (status));
diff --git a/common/discover.c b/common/discover.c
index 4c0daee9..953bab0a 100644
--- a/common/discover.c
+++ b/common/discover.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: discover.c,v 1.42.2.7 2001/06/21 16:46:09 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: discover.c,v 1.42.2.8 2001/10/18 20:10:26 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -94,7 +94,7 @@ isc_result_t interface_setup ()
 					     dhcp_interface_remove,
 					     0, 0, 0,
 					     sizeof (struct interface_info),
-					     interface_initialize);
+					     interface_initialize, RC_MISC);
 	if (status != ISC_R_SUCCESS)
 		log_fatal ("Can't register interface object type: %s",
 			   isc_result_totext (status));
diff --git a/common/dns.c b/common/dns.c
index 5d65be84..e940183a 100644
--- a/common/dns.c
+++ b/common/dns.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dns.c,v 1.35.2.8 2001/10/17 03:24:49 mellon Exp $ Copyright (c) 2001 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dns.c,v 1.35.2.9 2001/10/18 20:10:40 mellon Exp $ Copyright (c) 2001 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -258,7 +258,7 @@ int dns_zone_dereference (ptr, file, line)
 	dns_zone = *ptr;
 	*ptr = (struct dns_zone *)0;
 	--dns_zone -> refcnt;
-	rc_register (file, line, ptr, dns_zone, dns_zone -> refcnt, 1);
+	rc_register (file, line, ptr, dns_zone, dns_zone -> refcnt, 1, RC_MISC);
 	if (dns_zone -> refcnt > 0)
 		return 1;
 
diff --git a/common/execute.c b/common/execute.c
index 775e4290..ec4b22ee 100644
--- a/common/execute.c
+++ b/common/execute.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: execute.c,v 1.44.2.7 2001/08/08 14:48:19 mellon Exp $ Copyright (c) 1998-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: execute.c,v 1.44.2.8 2001/10/18 20:10:58 mellon Exp $ Copyright (c) 1998-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -545,7 +545,7 @@ int executable_statement_dereference (ptr, file, line)
 	}
 
 	(*ptr) -> refcnt--;
-	rc_register (file, line, ptr, *ptr, (*ptr) -> refcnt, 1);
+	rc_register (file, line, ptr, *ptr, (*ptr) -> refcnt, 1, RC_MISC);
 	if ((*ptr) -> refcnt > 0) {
 		*ptr = (struct executable_statement *)0;
 		return 1;
diff --git a/common/icmp.c b/common/icmp.c
index e870bb60..299e0307 100644
--- a/common/icmp.c
+++ b/common/icmp.c
@@ -44,7 +44,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: icmp.c,v 1.30.2.2 2001/06/22 02:35:47 mellon Exp $ Copyright (c) 1996-2001 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: icmp.c,v 1.30.2.3 2001/10/18 20:11:24 mellon Exp $ Copyright (c) 1996-2001 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -83,7 +83,8 @@ void icmp_startup (routep, handler)
 
 	result = omapi_object_type_register (&dhcp_type_icmp, "icmp",
 					     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-					     sizeof (struct icmp_state), 0);
+					     sizeof (struct icmp_state),
+					     0, RC_MISC);
 
 	if (result != ISC_R_SUCCESS)
 		log_fatal ("Can't register icmp object type: %s",
diff --git a/common/options.c b/common/options.c
index 6734f58a..b7a5a048 100644
--- a/common/options.c
+++ b/common/options.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: options.c,v 1.85.2.5 2001/08/23 16:11:34 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: options.c,v 1.85.2.6 2001/10/18 20:11:38 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #define DHCP_OPTION_DATA
@@ -1524,7 +1524,7 @@ int option_cache_dereference (ptr, file, line)
 	}
 
 	(*ptr) -> refcnt--;
-	rc_register (file, line, ptr, *ptr, (*ptr) -> refcnt, 1);
+	rc_register (file, line, ptr, *ptr, (*ptr) -> refcnt, 1, RC_MISC);
 	if (!(*ptr) -> refcnt) {
 		if ((*ptr) -> data.buffer)
 			data_string_forget (&(*ptr) -> data, file, line);
diff --git a/common/tree.c b/common/tree.c
index 3d678755..a9254cc9 100644
--- a/common/tree.c
+++ b/common/tree.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: tree.c,v 1.101.2.5 2001/10/04 20:38:22 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: tree.c,v 1.101.2.6 2001/10/18 20:12:16 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -596,7 +596,7 @@ int binding_value_dereference (struct binding_value **v,
 	/* Decrement the reference count.   If it's nonzero, we're
 	   done. */
 	--(bv -> refcnt);
-	rc_register (file, line, v, bv, bv -> refcnt, 1);
+	rc_register (file, line, v, bv, bv -> refcnt, 1, RC_MISC);
 	if (bv -> refcnt > 0)
 		return 1;
 	if (bv -> refcnt < 0) {
@@ -2741,7 +2741,7 @@ void expression_dereference (eptr, file, line)
 	/* Decrement the reference count.   If it's nonzero, we're
 	   done. */
 	--(expr -> refcnt);
-	rc_register (file, line, eptr, expr, expr -> refcnt, 1);
+	rc_register (file, line, eptr, expr, expr -> refcnt, 1, RC_MISC);
 	if (expr -> refcnt > 0)
 		return;
 	if (expr -> refcnt < 0) {
@@ -3757,7 +3757,7 @@ int binding_scope_dereference (ptr, file, line)
 	*ptr = (struct binding_scope *)0;
 	--binding_scope -> refcnt;
 	rc_register (file, line, ptr,
-		     binding_scope, binding_scope -> refcnt, 1);
+		     binding_scope, binding_scope -> refcnt, 1, RC_MISC);
 	if (binding_scope -> refcnt > 0)
 		return 1;
 
@@ -3807,7 +3807,7 @@ int fundef_dereference (ptr, file, line)
 	}
 
 	bp -> refcnt--;
-	rc_register (file, line, ptr, bp, bp -> refcnt, 1);
+	rc_register (file, line, ptr, bp, bp -> refcnt, 1, RC_MISC);
 	if (bp -> refcnt < 0) {
 		log_error ("%s(%d): negative refcnt!", file, line);
 #if defined (DEBUG_RC_HISTORY)
diff --git a/dhcpctl/dhcpctl.c b/dhcpctl/dhcpctl.c
index 4560b84d..d08a0b50 100644
--- a/dhcpctl/dhcpctl.c
+++ b/dhcpctl/dhcpctl.c
@@ -68,7 +68,8 @@ dhcpctl_status dhcpctl_initialize ()
 					     dhcpctl_callback_stuff_values,
 					     0, 0, 0, 0, 0, 0,
 					     sizeof
-					     (dhcpctl_callback_object_t), 0);
+					     (dhcpctl_callback_object_t), 0,
+					     RC_REGISTER);
 	if (status != ISC_R_SUCCESS)
 		return status;
 
@@ -81,7 +82,7 @@ dhcpctl_status dhcpctl_initialize ()
 					     dhcpctl_remote_stuff_values,
 					     0, 0, 0, 0, 0, 0,
 					     sizeof (dhcpctl_remote_object_t),
-					     0);
+					     0, RC_MISC);
 	if (status != ISC_R_SUCCESS)
 		return status;