--- ./c_icap-030606rc1.orig/services/clamav/srv_clamav.c	Tue Jun  6 23:08:13 2006
+++ ./c_icap-030606rc1/services/clamav/srv_clamav.c	Thu Mar  1 13:04:21 2007
@@ -33,7 +33,7 @@
 int must_scanned(int type,av_req_data_t * data);
 
 
-struct cl_node *root;
+struct cl_engine *root = NULL;
 struct cl_limits limits;
 
 
@@ -137,7 +137,8 @@
 
 
 int srvclamav_init_service(service_module_t *this,struct icap_server_conf *server_conf){
-     int ret,no=0,i;
+     unsigned int no=0;
+     int ret,i;
      magic_db=server_conf->MAGIC_DB;
      scantypes=(int *)malloc(ci_magic_types_num(magic_db)*sizeof(int));
      scangroups=(int *)malloc(ci_magic_groups_num(magic_db)*sizeof(int));
@@ -147,8 +148,8 @@
 
 
      ci_debug_printf(10,"Going to initialize srvclamav\n");;
-     if((ret = cl_loaddbdir(cl_retdbdir(), &root, &no))) {
-	  ci_debug_printf(1,"cl_loaddbdir: %s\n", cl_perror(ret));
+     if((ret = cl_load(cl_retdbdir(), &root, &no, CL_DB_STDOPT))) {
+	  ci_debug_printf(1,"cl_load: %s\n", cl_strerror(ret));
 	  return 0;
      }
      if((ret = cl_build(root))) {