diff --git a/lib/isccc/ccmsg.c b/lib/isccc/ccmsg.c
index b6eb621764..1e8f023bf2 100644
--- a/lib/isccc/ccmsg.c
+++ b/lib/isccc/ccmsg.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ccmsg.c,v 1.1 2001/03/27 00:44:48 bwelling Exp $ */
+/* $Id: ccmsg.c,v 1.2 2001/03/27 18:34:55 gson Exp $ */
 
 #include <config.h>
 
@@ -190,16 +190,6 @@ isccc_ccmsg_cancelread(isccc_ccmsg_t *ccmsg) {
 	isc_socket_cancel(ccmsg->sock, NULL, ISC_SOCKCANCEL_RECV);
 }
 
-void
-isccc_ccmsg_keepbuffer(isccc_ccmsg_t *ccmsg, isc_buffer_t *buffer) {
-	REQUIRE(VALID_CCMSG(ccmsg));
-	REQUIRE(buffer != NULL);
-
-	*buffer = ccmsg->buffer;
-	ccmsg->buffer.base = NULL;
-	ccmsg->buffer.length = 0;
-}
-
 #if 0
 void
 isccc_ccmsg_freebuffer(isccc_ccmsg_t *ccmsg) {
diff --git a/lib/isccc/include/isccc/ccmsg.h b/lib/isccc/include/isccc/ccmsg.h
index a2a2981fcb..6cad45203c 100644
--- a/lib/isccc/include/isccc/ccmsg.h
+++ b/lib/isccc/include/isccc/ccmsg.h
@@ -15,10 +15,10 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ccmsg.h,v 1.1 2001/03/27 00:44:51 bwelling Exp $ */
+/* $Id: ccmsg.h,v 1.2 2001/03/27 18:34:56 gson Exp $ */
 
-#ifndef DNS_CCMSG_H
-#define DNS_CCMSG_H 1
+#ifndef ISCCC_CCMSG_H
+#define ISCCC_CCMSG_H 1
 
 #include <isc/buffer.h>
 #include <isc/lang.h>
@@ -78,8 +78,8 @@ isc_result_t
 isccc_ccmsg_readmessage(isccc_ccmsg_t *ccmsg,
 		       isc_task_t *task, isc_taskaction_t action, void *arg);
 /*
- * Schedule an event to be delivered when a DNS message is readable, or
- * when an error occurs on the socket.
+ * Schedule an event to be delivered when a command channel message is
+ * readable, or when an error occurs on the socket.
  *
  * Requires:
  *
@@ -111,20 +111,6 @@ isccc_ccmsg_cancelread(isccc_ccmsg_t *ccmsg);
  *	"ccmsg" be valid.
  */
 
-void
-isccc_ccmsg_keepbuffer(isccc_ccmsg_t *ccmsg, isc_buffer_t *buffer);
-/*
- * If a isccc buffer is to be kept between calls, this function marks the
- * internal state-machine buffer as invalid, and copies all the contents
- * of the state into "buffer".
- *
- * Requires:
- *
- *	"ccmsg" be valid.
- *
- *	"buffer" be non-NULL.
- */
-
 void
 isccc_ccmsg_invalidate(isccc_ccmsg_t *ccmsg);
 /*
@@ -142,4 +128,4 @@ isccc_ccmsg_invalidate(isccc_ccmsg_t *ccmsg);
 
 ISC_LANG_ENDDECLS
 
-#endif /* DNS_CCMSG_H */
+#endif /* ISCCC_CCMSG_H */