@@ -1,3 +1,7 @@

+Mon Apr 24 18:22:22 CEST 2006 (tk)

+----------------------------------

+  * libclamav: add skeleton support for PST files (patch from NJH)

+

 Sun Apr 23 13:58:31 BST 2006 (njh)

 ----------------------------------

   * clamav-milter:	Ensure that the quarantine location reported in

@@ -150,6 +150,8 @@ libclamav_la_SOURCES = \

 	sis.c \

 	sis.h \

 	uuencode.c \

-	uuencode.h

+	uuencode.h \

+	pst.c \

+	pst.h

 lib_LTLIBRARIES = libclamav.la

@@ -87,7 +87,7 @@ am_libclamav_la_OBJECTS = matcher-ac.lo matcher-bm.lo matcher.lo \

 	chmunpack.lo rebuildpe.lo petite.lo fsg.lo line.lo untar.lo \

 	special.lo binhex.lo is_tar.lo tnef.lo unrar15.lo unrarvm.lo \

 	unrar.lo unrarfilter.lo unrarppm.lo unrar20.lo unrarcmd.lo \

-	pdf.lo spin.lo yc.lo elf.lo sis.lo uuencode.lo

+	pdf.lo spin.lo yc.lo elf.lo sis.lo uuencode.lo pst.lo

 libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)

 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

 depcomp = $(SHELL) $(top_srcdir)/depcomp

@@ -344,7 +344,9 @@ libclamav_la_SOURCES = \

 	sis.c \

 	sis.h \

 	uuencode.c \

-	uuencode.h

+	uuencode.h \

+	pst.c \

+	pst.h

 lib_LTLIBRARIES = libclamav.la

 all: all-am

@@ -442,6 +444,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdf.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/petite.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pst.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qtmd.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readdb.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rebuildpe.Plo@am__quote@

@@ -100,6 +100,7 @@ static const struct cli_magic_s cli_magic[] = {

     {0,  "\170\237\076\042",		 4, "TNEF",               CL_TYPE_TNEF},

     {0,  "begin ",			6,  "UUencoded",	  CL_TYPE_UUENCODED},

+    {0, "\116\104\102\031",		4, "PST",		  CL_TYPE_PST},

     /* Graphics (may contain exploits against MS systems) */

@@ -52,6 +52,7 @@ typedef enum {

     CL_TYPE_CRYPTFF,

     CL_TYPE_PDF,

     CL_TYPE_UUENCODED,

+    CL_TYPE_PST,	/* Microsoft Outlook binary email folder (.pst file) */

     /* bigger numbers have higher priority (in o-t-f detection) */

     CL_TYPE_HTML, /* on the fly */

@@ -16,9 +16,10 @@

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

  *  MA 02110-1301, USA.

  */

-static	char	const	rcsid[] = "$Id: pst.c,v 1.1 2006/04/24 15:03:51 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: pst.c,v 1.2 2006/04/24 16:28:05 kojm Exp $";

 #include "clamav.h"

+#include "others.h"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -1470,6 +1470,30 @@ static int cli_scanuuencoded(int desc, cli_ctx *ctx)

     return ret;

 }

+/* Outlook PST file */

+static int cli_scanpst(int desc, cli_ctx *ctx)

+{

+	int ret;

+	char *dir = cli_gentemp(NULL);

+

+    if(mkdir(dir, 0700)) {

+	cli_dbgmsg("Can't create temporary directory for PST file %s\n", dir);

+	free(dir);

+	return CL_ETMPDIR;

+    }

+

+    ret = cli_pst(dir, desc);

+

+    if(ret == CL_SUCCESS)

+	ret = cli_scandir(dir, ctx);

+

+    if(!cli_leavetemps_flag)

+	cli_rmdirs(dir);

+

+    free(dir);

+    return ret;

+}

+

 static int cli_scanmail(int desc, cli_ctx *ctx)

 {

 	char *dir;

@@ -1697,6 +1721,11 @@ int cli_magic_scandesc(int desc, cli_ctx *ctx)

 		ret = cli_scanuuencoded(desc, ctx);

 	    break;

+	case CL_TYPE_PST:

+	    if(SCAN_MAIL)

+		ret = cli_scanpst(desc, ctx);

+	    break;

+

 	case CL_TYPE_MSCHM:

 	    if(SCAN_ARCHIVE)

 		ret = cli_scanmschm(desc, ctx);