@@ -44,18 +44,6 @@ clamd_SOURCES = \

     scanner.h \

     others.c \

     others.h \

-    clamuko.c \

-    clamuko.h \

-    clamukofs.c \

-    clamukofs.h \

-    dazukoio_compat12.c \

-    dazukoio_compat12.h \

-    dazukoio.c \

-    dazukoio.h \

-    dazuko_xp.h \

-    dazukoio_xp.h \

-    dazukofs.c \

-    dazukofs.h \

     shared.h

 AM_CFLAGS=@WERR_CFLAGS@

@@ -83,19 +83,14 @@ am__clamd_SOURCES_DIST = $(top_srcdir)/shared/output.c \

 	$(top_srcdir)/shared/misc.h clamd.c tcpserver.c tcpserver.h \

 	localserver.c localserver.h session.c session.h thrmgr.c \

 	thrmgr.h server-th.c server.h scanner.c scanner.h others.c \

-	others.h clamuko.c clamuko.h clamukofs.c clamukofs.h \

-	dazukoio_compat12.c dazukoio_compat12.h dazukoio.c dazukoio.h \

-	dazuko_xp.h dazukoio_xp.h dazukofs.c dazukofs.h shared.h

+	others.h shared.h

 @BUILD_CLAMD_TRUE@am_clamd_OBJECTS = output.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	optparser.$(OBJEXT) getopt.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	misc.$(OBJEXT) clamd.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	tcpserver.$(OBJEXT) localserver.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	session.$(OBJEXT) thrmgr.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	server-th.$(OBJEXT) scanner.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	others.$(OBJEXT) clamuko.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	clamukofs.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	dazukoio_compat12.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	dazukoio.$(OBJEXT) dazukofs.$(OBJEXT)

+@BUILD_CLAMD_TRUE@	others.$(OBJEXT)

 clamd_OBJECTS = $(am_clamd_OBJECTS)

 clamd_LDADD = $(LDADD)

 AM_V_lt = $(am__v_lt_$(V))

@@ -321,18 +316,6 @@ top_srcdir = @top_srcdir@

 @BUILD_CLAMD_TRUE@    scanner.h \

 @BUILD_CLAMD_TRUE@    others.c \

 @BUILD_CLAMD_TRUE@    others.h \

-@BUILD_CLAMD_TRUE@    clamuko.c \

-@BUILD_CLAMD_TRUE@    clamuko.h \

-@BUILD_CLAMD_TRUE@    clamukofs.c \

-@BUILD_CLAMD_TRUE@    clamukofs.h \

-@BUILD_CLAMD_TRUE@    dazukoio_compat12.c \

-@BUILD_CLAMD_TRUE@    dazukoio_compat12.h \

-@BUILD_CLAMD_TRUE@    dazukoio.c \

-@BUILD_CLAMD_TRUE@    dazukoio.h \

-@BUILD_CLAMD_TRUE@    dazuko_xp.h \

-@BUILD_CLAMD_TRUE@    dazukoio_xp.h \

-@BUILD_CLAMD_TRUE@    dazukofs.c \

-@BUILD_CLAMD_TRUE@    dazukofs.h \

 @BUILD_CLAMD_TRUE@    shared.h

 @BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@

@@ -446,11 +429,6 @@ distclean-compile:

 	-rm -f *.tab.c

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamd.Po@am__quote@

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamuko.Po@am__quote@

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamukofs.Po@am__quote@

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dazukofs.Po@am__quote@

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dazukoio.Po@am__quote@

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dazukoio_compat12.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localserver.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@

deleted file mode 100644

@@ -1,234 +0,0 @@

-/*

- *  Copyright (C) 2007-2009 Sourcefire, Inc.

- *

- *  Authors: Tomasz Kojm

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License version 2 as

- *  published by the Free Software Foundation.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

- *  MA 02110-1301, USA.

- */

-

-#if HAVE_CONFIG_H

-#include "clamav-config.h"

-#endif

-

-#ifdef CLAMUKO

-

-#include <stdio.h>

-#include <unistd.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <signal.h>

-#include <pthread.h>

-#include <string.h>

-

-#include "libclamav/clamav.h"

-#include "libclamav/scanners.h"

-

-#include "shared/optparser.h"

-#include "shared/output.h"

-

-#include "server.h"

-#include "others.h"

-#include "dazukoio.h"

-#include "clamukofs.h"

-#include "clamuko.h"

-#include "scanner.h"

-

-struct dazuko_access *acc;

-short int clamuko_scanning;

-static void clamuko_exit(int sig)

-{

-

-    logg("*Clamuko: clamuko_exit(), signal %d\n", sig);

-

-    if(clamuko_scanning) {

-	logg("*Clamuko: stopped while scanning %s\n", acc->filename);

-	acc->deny = 0;

-	dazukoReturnAccess(&acc); /* is it needed ? */

-    }

-

-    if(dazukoUnregister())

-	logg("!Can't unregister with Dazuko\n");

-

-    logg("Clamuko stopped.\n");

-

-    pthread_exit(NULL);

-}

-

-static void *clamukolegacyth(void *arg)

-{

-	struct thrarg *tharg = (struct thrarg *) arg;

-	sigset_t sigset;

-	const char *virname;

-        struct sigaction act;

-	unsigned long mask = 0;

-	const struct optstruct *pt;

-	short int scan;

-	int sizelimit = 0, extinfo;

-	struct stat sb;

-	struct cb_context context;

-

-

-    clamuko_scanning = 0;

-

-    /* ignore all signals except SIGUSR1 */

-    sigfillset(&sigset);

-    sigdelset(&sigset, SIGUSR1);

-    /* The behavior of a process is undefined after it ignores a 

-     * SIGFPE, SIGILL, SIGSEGV, or SIGBUS signal */

-    sigdelset(&sigset, SIGFPE);

-    sigdelset(&sigset, SIGILL);

-    sigdelset(&sigset, SIGSEGV);

-#ifdef SIGBUS    

-    sigdelset(&sigset, SIGBUS);

-#endif

-    pthread_sigmask(SIG_SETMASK, &sigset, NULL);

-    memset(&act, 0, sizeof(struct sigaction));

-    act.sa_handler = clamuko_exit;

-    sigfillset(&(act.sa_mask));

-    sigaction(SIGUSR1, &act, NULL);

-    sigaction(SIGSEGV, &act, NULL);

-

-    /* register */

-    if(dazukoRegister("ClamAV", "r+")) {

-	logg("!Clamuko: Can't register with Dazuko\n");

-	return NULL;

-    } else

-	logg("Clamuko: Correctly registered with Dazuko.\n");

-

-    /* access mask */

-    if(optget(tharg->opts, "ClamukoScanOnOpen")->enabled) {

-	logg("Clamuko: Scan-on-open mode activated.\n");

-	mask |= DAZUKO_ON_OPEN;

-    }

-    if(optget(tharg->opts, "ClamukoScanOnClose")->enabled) {

-	logg("Clamuko: Scan-on-close mode activated.\n");

-	mask |= DAZUKO_ON_CLOSE;

-    }

-    if(optget(tharg->opts, "ClamukoScanOnExec")->enabled) {

-	logg("Clamuko: Scan-on-exec mode activated.\n");

-	mask |= DAZUKO_ON_EXEC;

-    }

-

-    if(!mask) {

-	logg("!Access mask is not configured properly.\n");

-	dazukoUnregister();

-	return NULL;

-    }

-

-    if(dazukoSetAccessMask(mask)) {

-	logg("!Clamuko: Can't set access mask in Dazuko.\n");

-	dazukoUnregister();

-	return NULL;

-    }

-

-    if((pt = optget(tharg->opts, "ClamukoIncludePath"))->enabled) {

-	while(pt) {

-	    if((dazukoAddIncludePath(pt->strarg))) {

-		logg("!Clamuko: Dazuko -> Can't include path %s\n", pt->strarg);

-		dazukoUnregister();

-		return NULL;

-	    } else

-		logg("Clamuko: Included path %s\n", pt->strarg);

-

-	    pt = (struct optstruct *) pt->nextarg;

-	}

-    } else {

-	logg("!Clamuko: please include at least one path.\n");

-	dazukoUnregister();

-	return NULL;

-    }

-

-    if((pt = optget(tharg->opts, "ClamukoExcludePath"))->enabled) {

-	while(pt) {

-	    if((dazukoAddExcludePath(pt->strarg))) {

-		logg("!Clamuko: Dazuko -> Can't exclude path %s\n", pt->strarg);

-		dazukoUnregister();

-		return NULL;

-	    } else

-		logg("Clamuko: Excluded path %s\n", pt->strarg);

-

-	    pt = (struct optstruct *) pt->nextarg;

-	}

-    }

-

-    sizelimit = optget(tharg->opts, "ClamukoMaxFileSize")->numarg;

-    if(sizelimit)

-	logg("Clamuko: Max file size limited to %d bytes.\n", sizelimit);

-    else

-	logg("Clamuko: File size limit disabled.\n");

-

-    extinfo = optget(tharg->opts, "ExtendedDetectionInfo")->enabled;

-

-    while(1) {

-

-	if(dazukoGetAccess(&acc) == 0) {

-	    clamuko_scanning = 1;

-	    scan = 1;

-

-	    if(sizelimit) {

-		stat(acc->filename, &sb);

-		if(sb.st_size > sizelimit) {

-		    scan = 0;

-		    logg("*Clamuko: %s skipped (too big)\n", acc->filename);

-		}

-	    }

-

-	    if(clamuko_checkowner(acc->pid, tharg->opts)) {

-		scan = 0;

-		logg("*Clamuko: %s skipped (excluded UID)\n", acc->filename);

-	    }

-

-	    context.filename = acc->filename;

-	    context.virsize = 0;

-	    if(scan && cl_scanfile_callback(acc->filename, &virname, NULL, tharg->engine, tharg->options, &context) == CL_VIRUS) {

-		if(context.virsize)

-		    detstats_add(virname, acc->filename, context.virsize, context.virhash);

-		if(extinfo && context.virsize)

-		    logg("Clamuko: %s: %s(%s:%llu) FOUND\n", acc->filename, virname, context.virhash, context.virsize);

-		else

-		    logg("Clamuko: %s: %s FOUND\n", acc->filename, virname);

-		virusaction(acc->filename, virname, tharg->opts);

-		acc->deny = 1;

-	    } else

-		acc->deny = 0;

-

-	    if(dazukoReturnAccess(&acc)) {

-		logg("!Can't return access to Dazuko.\n");

-		logg("Clamuko stopped.\n");

-		dazukoUnregister();

-		clamuko_scanning = 0;

-		return NULL;

-	    }

-

-	    clamuko_scanning = 0;

-	}

-    }

-

-    /* can't be ;) */

-    return NULL;

-}

-

-void *clamukoth(void *arg)

-{

-	struct stat s;

-

-    /* we use DazukoFS if /dev/dazukofs.ctrl exists and it is a

-     * character device, otherwise we use Dazuko */

-    if(stat("/dev/dazukofs.ctrl", &s) != 0) return clamukolegacyth(arg);

-    if(!S_ISCHR(s.st_mode)) return clamukolegacyth(arg);

-    return clamukofsth(arg);

-}

-

-#endif

deleted file mode 100644

@@ -1,30 +0,0 @@

-/*

- *  Copyright (C) 2007-2009 Sourcefire, Inc.

- *

- *  Authors: Tomasz Kojm

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License version 2 as

- *  published by the Free Software Foundation.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

- *  MA 02110-1301, USA.

- */

-

-#ifdef CLAMUKO

-

-#ifndef __CLAMUKO_H

-#define __CLAMUKO_H

-

-extern short int clamuko_scanning;

-void *clamukoth(void *arg);

-

-#endif

-#endif

deleted file mode 100644

@@ -1,266 +0,0 @@

-/*

- *  Copyright (C) 2007-2009 Sourcefire, Inc.

- *    Author: Tomasz Kojm

- *    Author: John Ogness <dazukocode@ogness.net>

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License version 2 as

- *  published by the Free Software Foundation.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

- *  MA 02110-1301, USA.

- */

-

-#if HAVE_CONFIG_H

-#include "clamav-config.h"

-#endif

-

-#ifdef CLAMUKO

-

-#include <stdio.h>

-#include <unistd.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <signal.h>

-#include <pthread.h>

-

-#include "libclamav/clamav.h"

-#include "libclamav/scanners.h"

-

-#include "shared/optparser.h"

-#include "shared/output.h"

-

-#include "server.h"

-#include "others.h"

-#include "dazukofs.h"

-#include "clamuko.h"

-#include "scanner.h"

-

-static pthread_mutex_t running_mutex = PTHREAD_MUTEX_INITIALIZER;

-static dazukofs_handle_t shutdown_hndl;

-static pthread_cond_t shutdown_cond;

-

-static void clamuko_exit(int sig)

-{

-    pthread_cond_signal(&shutdown_cond);

-}

-

-static int setup_shutdown_handle(const char *groupname)

-{

-    /* is another server thread is already running? */

-    if(shutdown_hndl) return -1;

-

-    if(pthread_cond_init(&shutdown_cond, NULL)) return -1;

-

-    /* handle used for shutdown by signal */

-    shutdown_hndl = dazukofs_open(groupname, DAZUKOFS_TRACK_GROUP);

-    if(!shutdown_hndl) {

-	logg("!Clamuko: Can't register with DazukoFS\n");

-	return -1;

-    }

-    return 0;

-}

-

-static void shutdown_clamuko(void)

-{

-	dazukofs_handle_t hndl = shutdown_hndl;

-

-    /* Set shutdown_hndl before closing because the close will

-     * immediately cause the scan threads to be interrupted.

-     * But they will only abort if shutdown_hndl is NULL. */

-    shutdown_hndl = NULL;

-

-    if(hndl) dazukofs_close(hndl, DAZUKOFS_REMOVE_GROUP);

-}

-

-static void *clamuko_scanth(void *arg)

-{

-	struct thrarg *tharg = (struct thrarg *) arg;

-	sigset_t sigset;

-	unsigned int sizelimit = 0;

-	struct stat sb;

-	dazukofs_handle_t scan_hndl;

-	struct dazukofs_access acc;

-	const char *groupname = "ClamAV";

-	int skip_scan = 0, extinfo;

-	const char *virname;

-	char filename[4096];

-	struct cb_context context;

-

-    /* ignore all signals */

-    sigfillset(&sigset);

-    /* The behavior of a process is undefined after it ignores a

-     * SIGFPE, SIGILL, SIGSEGV, or SIGBUS signal */

-    sigdelset(&sigset, SIGFPE);

-    sigdelset(&sigset, SIGILL);

-    sigdelset(&sigset, SIGSEGV);

-#ifdef SIGBUS

-    sigdelset(&sigset, SIGBUS);

-#endif

-    pthread_sigmask(SIG_SETMASK, &sigset, NULL);

-

-    /* register */

-    scan_hndl = dazukofs_open(groupname, DAZUKOFS_TRACK_GROUP);

-    if(!scan_hndl) {

-	logg("!Clamuko: Can't register with DazukoFS\n");

-	return NULL;

-    } else {

-	logg("Clamuko: Correctly registered with DazukoFS.\n");

-    }

-

-    /* access mask (not used by DazukoFS) */

-    if(optget(tharg->opts, "ClamukoScanOnOpen")->enabled)

-	logg("!Clamuko: ClamukoScanOnOpen ignored when using DazukoFS.\n");

-    if(optget(tharg->opts, "ClamukoScanOnClose")->enabled)

-	logg("!Clamuko: ClamukoScanOnClose ignored when using DazukoFS.\n");

-    if(optget(tharg->opts, "ClamukoScanOnExec")->enabled)

-	logg("!Clamuko: ClamukoScanOnExec ignored when using DazukoFS.\n");

-    if(optget(tharg->opts, "ClamukoIncludePath")->enabled)

-	logg("!Clamuko: ClamukoIncludePath ignored when using DazukoFS.\n");

-    if(optget(tharg->opts, "ClamukoExcludePath")->enabled)

-	logg("!Clamuko: ClamukoExcludePath ignored when using DazukoFS.\n");

-

-    sizelimit = optget(tharg->opts, "ClamukoMaxFileSize")->numarg;

-    if(sizelimit)

-	logg("Clamuko: Max file size limited to %u bytes.\n", sizelimit);

-    else

-	logg("Clamuko: File size limit disabled.\n");

-

-    extinfo = optget(tharg->opts, "ExtendedDetectionInfo")->enabled;

-

-    while(1) {

-	if(dazukofs_get_access(scan_hndl, &acc)) {

-	    if(!shutdown_hndl)

-		break;

-	    continue;

-	}

-

-	if(!fstat(acc.fd, &sb)) {

-	    if(S_ISDIR(sb.st_mode)) {

-		/* don't try to scan directories */

-		skip_scan = 1;

-	    } else if(sb.st_size > sizelimit) {

-		dazukofs_get_filename(&acc, filename, sizeof(filename));

-		logg("*Clamuko: %s skipped (too big)\n", filename);

-		skip_scan = 1;

-	    }

-	}

-

-	if(clamuko_checkowner(acc.pid, tharg->opts)) {

-	    dazukofs_get_filename(&acc, filename, sizeof(filename));

-	    logg("*Clamuko: %s skipped (excluded UID)\n", filename);

-	    skip_scan = 1;

-	}

-

-	context.filename = NULL;

-	context.virsize = 0;

-	if(skip_scan) {

-	    acc.deny = 0;

-	    /* reset skip flag */

-	    skip_scan = 0;

-	} else if(cl_scandesc_callback(acc.fd, &virname, NULL, tharg->engine,

-			      tharg->options, &context) == CL_VIRUS) {

-	    dazukofs_get_filename(&acc, filename, sizeof(filename));

-	    if(context.virsize)

-		detstats_add(virname, filename, context.virsize, context.virhash);

-	    if(extinfo && context.virsize)

-		logg("Clamuko: %s: %s(%s:%llu) FOUND\n", filename, virname, context.virhash, context.virsize);

-	    else

-		logg("Clamuko: %s: %s FOUND\n", filename, virname);

-	    /* we can not perform any special action because it will

-	     * trigger DazukoFS recursively */

-	    acc.deny = 1;

-	} else {

-	    acc.deny = 0;

-	}

-

-	if(dazukofs_return_access(scan_hndl, &acc)) {

-	    if(shutdown_hndl)

-	        logg("!Clamuko: Can't return access to DazukoFS.\n");

-	    break;

-	}

-    }

-

-    dazukofs_close(scan_hndl, 0);

-

-    if(shutdown_hndl)

-        logg("!Clamuko: A scanner thread has unexpectedly shutdown.\n");

-

-    return NULL;

-}

-

-void *clamukofsth(void *arg)

-{

-	struct thrarg *tharg = (struct thrarg *) arg;

-	sigset_t sigset;

-        struct sigaction act;

-	pthread_t *clamuko_pids = NULL;

-	const char *groupname = "ClamAV";

-	int count;

-	int started;

-

-    /* is another server thread already working? */

-    if(pthread_mutex_trylock(&running_mutex))

-	return NULL;

-

-    /* ignore all signals except SIGUSR1 */

-    sigfillset(&sigset);

-    sigdelset(&sigset, SIGUSR1);

-    /* The behavior of a process is undefined after it ignores a

-     * SIGFPE, SIGILL, SIGSEGV, or SIGBUS signal */

-    sigdelset(&sigset, SIGFPE);

-    sigdelset(&sigset, SIGILL);

-    sigdelset(&sigset, SIGSEGV);

-#ifdef SIGBUS

-    sigdelset(&sigset, SIGBUS);

-#endif

-    pthread_sigmask(SIG_SETMASK, &sigset, NULL);

-

-    count = optget(tharg->opts, "ClamukoScannerCount")->numarg;

-    if(count < 1) goto out;

-

-    clamuko_pids = calloc(count, sizeof(pthread_t));

-    if(!clamuko_pids) goto out;

-

-    if(setup_shutdown_handle(groupname)) goto out;

-

-    act.sa_handler = clamuko_exit;

-    sigfillset(&(act.sa_mask));

-    sigaction(SIGUSR1, &act, NULL);

-    sigaction(SIGSEGV, &act, NULL);

-

-    for(started = 0; started < count; started++) {

-	pthread_attr_t clamuko_attr;

-

-	if(pthread_attr_init(&clamuko_attr)) break;

-	pthread_attr_setdetachstate(&clamuko_attr, PTHREAD_CREATE_JOINABLE);

-	if(pthread_create(&clamuko_pids[started], &clamuko_attr,

-			  clamuko_scanth, tharg)) break;

-	logg("Clamuko: Started scanner thread %d.\n", started);

-    }

-

-    pthread_cond_wait(&shutdown_cond, &running_mutex);

-    logg("Clamuko: Stop signal received.\n");

-

-    shutdown_clamuko();

-

-    for(started-- ; started >= 0; started--) {

-	logg("Clamuko: Waiting for scanner thread %d to finish.\n", started);

-	pthread_join(clamuko_pids[started], NULL);

-    }

-

-    logg("Clamuko: Stopped.\n");

-out:

-    if(clamuko_pids) free(clamuko_pids);

-    pthread_mutex_unlock(&running_mutex);

-    return NULL;

-}

-

-#endif

deleted file mode 100644

@@ -1,28 +0,0 @@

-/*

- *  Copyright (C) 2009 Sourcefire, Inc.

- *    Author: John Ogness <dazukocode@ogness.net>

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License version 2 as

- *  published by the Free Software Foundation.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

- *  MA 02110-1301, USA.

- */

-

-#ifdef CLAMUKO

-

-#ifndef __CLAMUKOFS_H

-#define __CLAMUKOFS_H

-

-extern void *clamukofsth(void *arg);

-

-#endif

-#endif

deleted file mode 100644

@@ -1,232 +0,0 @@

-#if HAVE_CONFIG_H

-#include "clamav-config.h"

-#endif

-

-#ifdef CLAMUKO

-/* DazukoXP. Allow cross platform file access control for 3rd-party applications.

-   Written by John Ogness <jogness@antivir.de>

-

-   Copyright (c) 2002, 2003, 2004 H+BEDV Datentechnik GmbH

-   All rights reserved.

-

-   Redistribution and use in source and binary forms, with or without

-   modification, are permitted provided that the following conditions

-   are met:

-

-   1. Redistributions of source code must retain the above copyright notice,

-   this list of conditions and the following disclaimer.

-

-   2. Redistributions in binary form must reproduce the above copyright notice,

-   this list of conditions and the following disclaimer in the documentation

-   and/or other materials provided with the distribution.

-

-   3. Neither the name of Dazuko nor the names of its contributors may be used

-   to endorse or promote products derived from this software without specific

-   prior written permission.

-

-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

-   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

-   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

-   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

-   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

-   POSSIBILITY OF SUCH DAMAGE.

-*/

-

-#ifndef DAZUKO_XP_H

-#define DAZUKO_XP_H

-

-#define VERSION	"2.0.4-pre3"

-

-#include "dazukoio_xp.h"

-

-/* various requests */

-#define SET_ACCESS_MASK		0

-#define ADD_INCLUDE_PATH	1

-#define ADD_EXCLUDE_PATH	2

-#define REGISTER		3

-#define REMOVE_ALL_PATHS	4

-#define UNREGISTER		5

-#define GET_AN_ACCESS		6

-#define RETURN_AN_ACCESS	7

-

-/* slot states */

-#define	DAZUKO_FREE	0	/* the daemon is not ready */

-#define	DAZUKO_READY	1	/* a daemon waits for something to do */

-#define	DAZUKO_WAITING	2	/* a request is waiting to be served */

-#define	DAZUKO_WORKING	3	/* daemon is currently in action */

-#define	DAZUKO_DONE	4	/* daemon response is available */

-#define	DAZUKO_BROKEN	5	/* invalid state (interrupt from ready,waiting) */

-

-/* file types */

-#define DAZUKO_NONE		0

-#define DAZUKO_REGULAR		1

-#define DAZUKO_DIRECTORY	2

-#define DAZUKO_LINK		3

-

-

-/*********************************************************

- * structures that MUST be implemented by platform-layer *

- *********************************************************/

-

-/*

-struct xp_file;

-struct xp_mutex;

-struct xp_atomic;

-struct xp_file_struct;

-struct xp_queue;

-struct xp_rwlock;

-struct xp_daemon_id;

-*/

-

-

-/******************************************

- * structures available to platform-layer *

- ******************************************/

-

-struct event_properties

-{

-	int	thrown;

-

-	int	flags;

-	char	set_flags;

-	int	mode;

-	char	set_mode;

-	int	uid;

-	char	set_uid;

-	int	pid;

-	char	set_pid;

-};

-

-struct file_properties

-{

-	unsigned long	size;

-	char		set_size;

-	int		uid;

-	char		set_uid;

-	int		gid;

-	char		set_gid;

-	int		mode;

-	char		set_mode;

-	int		device_type;

-	char		set_device_type;

-	int		type;

-	char		set_type;

-};

-

-struct dazuko_file_listnode

-{

-	char				*filename;

-	int				filename_length;

-	struct dazuko_file_listnode	*next;

-};

-

-struct dazuko_file_struct

-{

-	/* A structure designed for simple and

-	 * intelligent memory management when

-	 * doing filename lookups in the kernel. */

-

-	int				should_scan;		/* already know we need to scan? */

-	char				*filename;		/* filename to report (pointer in alias list) */

-	int				filename_length;	/* length of filename reported */

-	struct dazuko_file_listnode	*aliases;		/* list of file names (alias names) */

-	struct file_properties		file_p;			/* properties of file */

-	struct xp_file_struct		*extra_data;		/* extra platform-dependant data */

-};

-

-

-/********************************************************

- * functions that MUST be implemented by platform-layer *

- ********************************************************/

-

-/* mutex */

-int xp_init_mutex(struct xp_mutex *mutex);

-int xp_down(struct xp_mutex *mutex);

-int xp_up(struct xp_mutex *mutex);

-int xp_destroy_mutex(struct xp_mutex *mutex);

-

-/* read-write lock */

-int xp_init_rwlock(struct xp_rwlock *rwlock);

-int xp_write_lock(struct xp_rwlock *rwlock);

-int xp_write_unlock(struct xp_rwlock *rwlock);

-int xp_read_lock(struct xp_rwlock *rlock);

-int xp_read_unlock(struct xp_rwlock *rlock);

-int xp_destroy_rwlock(struct xp_rwlock *rwlock);

-

-/* wait-notify queue */

-int xp_init_queue(struct xp_queue *queue);

-int xp_wait_until_condition(struct xp_queue *queue, int (*cfunction)(void *), void *cparam, int allow_interrupt);

-int xp_notify(struct xp_queue *queue);

-int xp_destroy_queue(struct xp_queue *queue);

-

-/* memory */

-void* xp_malloc(size_t size);

-int xp_free(void *ptr);

-int xp_copyin(const void *user_src, void *kernel_dest, size_t size);

-int xp_copyout(const void *kernel_src, void *user_dest, size_t size);

-int xp_verify_user_writable(const void *user_ptr, size_t size);

-int xp_verify_user_readable(const void *user_ptr, size_t size);

-

-/* path attribute */

-int xp_is_absolute_path(const char *path);

-

-/* atomic */

-int xp_atomic_set(struct xp_atomic *atomic, int value);

-int xp_atomic_inc(struct xp_atomic *atomic);

-int xp_atomic_dec(struct xp_atomic *atomic);

-int xp_atomic_read(struct xp_atomic *atomic);

-

-/* file descriptor */

-int xp_copy_file(struct xp_file *dest, struct xp_file *src);

-int xp_compare_file(struct xp_file *file1, struct xp_file *file2);

-

-/* system hook */

-int xp_sys_hook(void);

-int xp_sys_unhook(void);

-

-/* file structure */

-int xp_file_struct_check(struct dazuko_file_struct *dfs);

-int xp_file_struct_check_cleanup(struct dazuko_file_struct *dfs);

-

-/* daemon id */

-int xp_id_compare(struct xp_daemon_id *id1, struct xp_daemon_id *id2);

-int xp_id_free(struct xp_daemon_id *id);

-struct xp_daemon_id* xp_id_copy(struct xp_daemon_id *id);

-

-/* output */

-int xp_print(const char *fmt, ...);

-

-/* debug */

-#ifdef DEBUG

-#define DPRINT(fmt) xp_print fmt

-#else

-#define DPRINT(fmt)

-#endif

-

-

-/*****************************************

- * functions available to platform-layer *

- *****************************************/

-

-int dazuko_vsnprintf(char *str, size_t size, const char *format, va_list ap);

-int dazuko_snprintf(char *str, size_t size, const char *format, ...);

-int dazuko_is_our_daemon(struct xp_daemon_id *xp_id);

-int dazuko_get_value(const char *key, const char *string, char **value);

-int dazuko_unregister_daemon(struct xp_daemon_id *xp_id);

-int dazuko_handle_user_request(struct dazuko_request *user_request, struct xp_daemon_id *xp_id);

-int dazuko_handle_user_request_compat12(void *ptr, int cmd, struct xp_daemon_id *xp_id);

-int dazuko_get_filename_length(char *filename);

-void dazuko_bzero(void *p, int len);

-int dazuko_sys_check(unsigned long event, int daemon_is_allowed, struct xp_daemon_id *xp_id);

-int dazuko_sys_pre(unsigned long event, struct dazuko_file_struct *kfs, struct xp_file *file, struct event_properties *event_p);

-int dazuko_sys_post(unsigned long event, struct dazuko_file_struct *kfs, struct xp_file *file, struct event_properties *event_p);

-int dazuko_init(void);

-int dazuko_exit(void);

-