@@ -1,3 +1,8 @@

+Thu, Jul 31 11:50:23 EDT 2014 (swebb)

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

+* bb#10731 - Allow to specificy a group for the socket of which the user is

+not a member

+

 Tue, 08 Jul 11:30:00 EDT 2014 (morgan)

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

 * 0.98.5 beta release

@@ -114,6 +114,104 @@ int main(int argc, char **argv) {

 	}

     }

+    if(!(my_socket = optget(opts, "MilterSocket")->strarg)) {

+	logg("!Please configure the MilterSocket directive\n");

+	logg_close();

+	optfree(opts);

+	return 1;

+    }

+

+    if(smfi_setconn(my_socket) == MI_FAILURE) {

+	logg("!smfi_setconn failed\n");

+	logg_close();

+	optfree(opts);

+	return 1;

+    }

+    if(smfi_register(descr) == MI_FAILURE) {

+	logg("!smfi_register failed\n");

+	logg_close();

+	optfree(opts);

+	return 1;

+    }

+    opt = optget(opts, "FixStaleSocket");

+    umsk = umask(0777); /* socket is created with 000 to avoid races */

+    if(smfi_opensocket(opt->enabled) == MI_FAILURE) {

+	logg("!Failed to create socket %s\n", my_socket);

+	logg_close();

+	optfree(opts);

+	return 1;

+    }

+    umask(umsk); /* restore umask */

+    if(strncmp(my_socket, "inet:", 5) && strncmp(my_socket, "inet6:", 6)) {

+	/* set group ownership and perms on the local socket */

+	char *sock_name = my_socket;

+	mode_t sock_mode;

+	if(!strncmp(my_socket, "unix:", 5))

+	    sock_name += 5;

+	if(!strncmp(my_socket, "local:", 6))

+	    sock_name += 6;

+	if(*my_socket == ':')

+	    sock_name ++;

+

+	if(optget(opts, "MilterSocketGroup")->enabled) {

+	    char *gname = optget(opts, "MilterSocketGroup")->strarg, *end;

+	    gid_t sock_gid = strtol(gname, &end, 10);

+	    if(*end) {

+		struct group *pgrp = getgrnam(gname);

+		if(!pgrp) {

+		    logg("!Unknown group %s\n", gname);

+		    logg_close();

+		    optfree(opts);

+		    return 1;

+		}

+		sock_gid = pgrp->gr_gid;

+	    }

+	    if(chown(sock_name, -1, sock_gid)) {

+		logg("!Failed to change socket ownership to group %s\n", gname);

+		logg_close();

+		optfree(opts);

+		return 1;

+	    }

+	}

+

+	if ((opt = optget(opts, "User"))->enabled) {

+	    struct passwd *user;

+	    if ((user = getpwnam(opt->strarg)) == NULL) {

+		logg("ERROR: Can't get information about user %s.\n",

+			opt->strarg);

+		logg_close();

+		optfree(opts);

+		return 1;

+	    }

+

+	    if(chown(sock_name, user->pw_uid, -1)) {

+		logg("!Failed to change socket ownership to user %s\n", user->pw_name);

+		optfree(opts);

+		logg_close();

+		return 1;

+	    }

+	}

+

+	if(optget(opts, "MilterSocketMode")->enabled) {

+	    char *end;

+	    sock_mode = strtol(optget(opts, "MilterSocketMode")->strarg, &end, 8);

+	    if(*end) {

+		logg("!Invalid MilterSocketMode %s\n", optget(opts, "MilterSocketMode")->strarg);

+		logg_close();

+		optfree(opts);

+		return 1;

+	    }

+	} else

+	    sock_mode = 0777 & ~umsk;

+

+	if(chmod(sock_name, sock_mode & 0666)) {

+	    logg("!Cannot set milter socket permission to %s\n", optget(opts, "MilterSocketMode")->strarg);

+	    logg_close();

+	    optfree(opts);

+	    return 1;

+	}

+    }

+

     if(geteuid() == 0 && (opt = optget(opts, "User"))->enabled) {

         struct passwd *user = NULL;

 	if((user = getpwnam(opt->strarg)) == NULL) {

@@ -246,15 +344,6 @@ int main(int argc, char **argv) {

     multircpt = optget(opts, "SupportMultipleRecipients")->enabled;

-    if(!(my_socket = optget(opts, "MilterSocket")->strarg)) {

-	logg("!Please configure the MilterSocket directive\n");

-	localnets_free();

-	whitelist_free();

-	logg_close();

-	optfree(opts);

-	return 1;

-    }

-

     if(!optget(opts, "Foreground")->enabled) {

 	if(daemonize() == -1) {

 	    logg("!daemonize() failed\n");

@@ -269,92 +358,6 @@ int main(int argc, char **argv) {

 	    logg("^Can't change current working directory to root\n");

     }

-    if(smfi_setconn(my_socket) == MI_FAILURE) {

-	logg("!smfi_setconn failed\n");

-	localnets_free();

-	whitelist_free();

-	logg_close();

-	optfree(opts);

-	return 1;

-    }

-    if(smfi_register(descr) == MI_FAILURE) {

-	logg("!smfi_register failed\n");

-	localnets_free();

-	whitelist_free();

-	logg_close();

-	optfree(opts);

-	return 1;

-    }

-    opt = optget(opts, "FixStaleSocket");

-    umsk = umask(0777); /* socket is created with 000 to avoid races */ 

-    if(smfi_opensocket(opt->enabled) == MI_FAILURE) {

-	logg("!Failed to create socket %s\n", my_socket);

-	localnets_free();

-	whitelist_free();

-	logg_close();

-	optfree(opts);

-	return 1;

-    }

-    umask(umsk); /* restore umask */

-    if(strncmp(my_socket, "inet:", 5) && strncmp(my_socket, "inet6:", 6)) {

-	/* set group ownership and perms on the local socket */

-	char *sock_name = my_socket;

-	mode_t sock_mode;

-	if(!strncmp(my_socket, "unix:", 5))

-	    sock_name += 5;

-	if(!strncmp(my_socket, "local:", 6))

-	    sock_name += 6;

-	if(*my_socket == ':')

-	    sock_name ++;

-

-	if(optget(opts, "MilterSocketGroup")->enabled) {

-	    char *gname = optget(opts, "MilterSocketGroup")->strarg, *end;

-	    gid_t sock_gid = strtol(gname, &end, 10);

-	    if(*end) {

-		struct group *pgrp = getgrnam(gname);

-		if(!pgrp) {

-		    logg("!Unknown group %s\n", gname);

-		    localnets_free();

-		    whitelist_free();

-		    logg_close();

-		    optfree(opts);

-		    return 1;

-		}

-		sock_gid = pgrp->gr_gid;

-	    }

-	    if(chown(sock_name, -1, sock_gid)) {

-		logg("!Failed to change socket ownership to group %s\n", gname);

-		localnets_free();

-		whitelist_free();

-		logg_close();

-		optfree(opts);

-		return 1;

-	    }

-	}

-	if(optget(opts, "MilterSocketMode")->enabled) {

-	    char *end;

-	    sock_mode = strtol(optget(opts, "MilterSocketMode")->strarg, &end, 8);

-	    if(*end) {

-		logg("!Invalid MilterSocketMode %s\n", optget(opts, "MilterSocketMode")->strarg);

-		localnets_free();

-		whitelist_free();

-		logg_close();

-		optfree(opts);

-		return 1;

-	    }

-	} else

-	    sock_mode = 0777 & ~umsk;

-

-	if(chmod(sock_name, sock_mode & 0666)) {

-	    logg("!Cannot set milter socket permission to %s\n", optget(opts, "MilterSocketMode")->strarg);

-	    localnets_free();

-	    whitelist_free();

-	    logg_close();

-	    optfree(opts);

-	    return 1;

-	}

-    }

-

     maxfilesize = optget(opts, "MaxFileSize")->numarg;

     if(!maxfilesize) {

 	logg("^Invalid MaxFileSize, using default (%d)\n", CLI_DEFAULT_MAXFILESIZE);

@@ -56,6 +56,7 @@ static void help(void)

     printf("    --version              -V         Show version\n");

     printf("    --info                 -i         Print information about bytecode\n");

     printf("    --printsrc             -p         Print bytecode source\n");

+    printf("    --printbcir            -c         Print bytecode IR\n");

     printf("    --trace <level>                   Set bytecode trace level 0..7 (default 7)\n");

     printf("    --no-trace-showsource             Don't show source line during tracing\n");

     printf("    file                              file to test\n");

@@ -112,16 +113,19 @@ static void tracehook(struct cli_bc_ctx *ctx, unsigned event)

 static void tracehook_op(struct cli_bc_ctx *ctx, const char *op)

 {

+    UNUSEDPARAM(ctx);

     fprintf(stderr, "[trace] %s\n", op);

 }

 static void tracehook_val(struct cli_bc_ctx *ctx, const char *name, uint32_t value)

 {

+    UNUSEDPARAM(ctx);

     fprintf(stderr, "[trace] %s = %u\n", name, value);

 }

 static void tracehook_ptr(struct cli_bc_ctx *ctx, const void *ptr)

 {

+    UNUSEDPARAM(ctx);

     fprintf(stderr, "[trace] %p\n", ptr);

 }

@@ -325,6 +329,10 @@ int main(int argc, char *argv[])

 	cli_bytecode_describe(bc);

     } else if (optget(opts, "printsrc")->enabled) {

         print_src(opts->filename[0]);

+    } else if (optget(opts, "printbcir")->enabled) {

+        cli_bytetype_describe(bc);

+        cli_bytevalue_describe(bc, 0);

+        cli_bytefunc_describe(bc, 0);

     } else {

 	cli_ctx cctx;

 	struct cl_engine *engine = cl_engine_new();

@@ -76,6 +76,7 @@ short foreground = 0;

 char hostid[37];

 char *get_hostid(void *cbdata);

+int is_valid_hostid(void);

 static void help(void)

 {

@@ -118,11 +119,12 @@ int main(int argc, char **argv)

     time_t currtime;

     const char *dbdir, *cfgfile;

     char *pua_cats = NULL, *pt;

-    int ret, tcpsock = 0, localsock = 0, i, min_port, max_port;

+    int ret, tcpsock = 0, localsock = 0, min_port, max_port;

     unsigned int sigs = 0;

     int *lsockets=NULL;

     unsigned int nlsockets = 0;

     unsigned int dboptions = 0;

+    unsigned int i;

 #ifdef C_LINUX

     STATBUF sb;

 #endif

@@ -576,8 +578,6 @@ int main(int argc, char **argv)

         }

         if(tcpsock) {

-            int *t;

-

             opt = optget(opts, "TCPAddr");

             if (opt->enabled) {

                 int breakout = 0;

@@ -670,7 +670,7 @@ int main(int argc, char **argv)

         if(!optget(opts, "Foreground")->enabled) {

 #ifdef C_BSD	    

             /* workaround for OpenBSD bug, see https://wwws.clamav.net/bugzilla/show_bug.cgi?id=885 */

-            for(ret=0;ret<nlsockets;ret++) {

+            for(ret=0;(unsigned int)ret<nlsockets;ret++) {

                 if (fcntl(lsockets[ret], F_SETFL, fcntl(lsockets[ret], F_GETFL) | O_NONBLOCK) == -1) {

                     logg("!fcntl for lsockets[] failed\n");

                     close(lsockets[ret]);

@@ -688,7 +688,7 @@ int main(int argc, char **argv)

             }

             gengine = NULL;

 #ifdef C_BSD

-            for(ret=0;ret<nlsockets;ret++) {

+            for(ret=0;(unsigned int)ret<nlsockets;ret++) {

                 if (fcntl(lsockets[ret], F_SETFL, fcntl(lsockets[ret], F_GETFL) & ~O_NONBLOCK) == -1) {

                     logg("!fcntl for lsockets[] failed\n");

                     close(lsockets[ret]);

@@ -766,6 +766,8 @@ int is_valid_hostid(void)

 char *get_hostid(void *cbdata)

 {

+    UNUSEDPARAM(cbdata);

+

     if (!strcmp(hostid, "none"))

         return NULL;

@@ -517,6 +517,8 @@ fds_poll_recv (struct fd_data *data, int timeout, int check_signals,

     int retval;

     time_t now, closest_timeout;

+    UNUSEDPARAM(event);

+

     /* we must have at least one fd, the control fd! */

     fds_cleanup (data);

 #ifndef _WIN32

@@ -76,6 +76,8 @@ void msg_callback(enum cl_msg severity, const char *fullmsg, const char *msg, vo

     struct cb_context *c = ctx;

     const char *filename = (c && c->filename) ? c->filename : "";

+    UNUSEDPARAM(fullmsg);

+

     switch (severity) {

 	case CL_MSG_ERROR:

 	    logg("^[LibClamAV] %s: %s", filename, msg);

@@ -95,10 +97,13 @@ void msg_callback(enum cl_msg severity, const char *fullmsg, const char *msg, vo

 void hash_callback(int fd, unsigned long long size, const unsigned char *md5, const char *virname, void *ctx)

 {

     struct cb_context *c = ctx;

+    UNUSEDPARAM(fd);

+    UNUSEDPARAM(virname);

+

     if (!c)

 	return;

     c->virsize = size;

-    strncpy(c->virhash, md5, 32);

+    strncpy(c->virhash, (const char *)md5, 32);

     c->virhash[32] = '\0';

 }

@@ -346,6 +351,8 @@ int scanfd(const client_conn_t *conn, unsigned long int *scanned,

 	char fdstr[32];

 	const char*reply_fdstr;

+    UNUSEDPARAM(odesc);

+

 	if (stream) {

 	    struct sockaddr_in sa;

 	    socklen_t salen = sizeof(sa);

@@ -76,11 +76,12 @@ extern struct optstruct *clamdopts;

 static int isremote(const struct optstruct *opts) {

     int s, ret;

     const struct optstruct *opt;

-    static struct sockaddr_in testsock;

     char *ipaddr, port[10];

     struct addrinfo hints, *info, *p;

     int res;

+    UNUSEDPARAM(opts);

+

 #ifndef _WIN32

     if((opt = optget(clamdopts, "LocalSocket"))->enabled) {

         memset((void *)&nixsock, 0, sizeof(nixsock));

@@ -236,6 +236,7 @@ static int chkpath(const char *path)

 static int ftw_chkpath(const char *path, struct cli_ftw_cbdata *data)

 {

+    UNUSEDPARAM(data);

     return chkpath(path);

 }

@@ -378,6 +379,8 @@ static int serial_callback(STATBUF *sb, char *filename, const char *path, enum c

     int sockd, ret;

     const char *f = filename;

+    UNUSEDPARAM(sb);

+

     if(chkpath(path))

 	return CL_SUCCESS;

     c->files++;

@@ -532,6 +535,8 @@ static int parallel_callback(STATBUF *sb, char *filename, const char *path, enum

     struct SCANID *cid;

     int res = CL_CLEAN;

+    UNUSEDPARAM(sb);

+

     if(chkpath(path))

 	return CL_SUCCESS;

     c->files++;

@@ -57,6 +57,7 @@

 #include <assert.h>

 #include <errno.h>

+#include "libclamav/clamav.h"

 #include "shared/optparser.h"

 #include "shared/misc.h"

@@ -101,6 +102,9 @@ static void cleanup(void);

 static int send_string_noreconn(conn_t *conn, const char *cmd);

 static void send_string(conn_t *conn, const char *cmd);

 static int read_version(conn_t *conn);

+char *get_ip(const char *ip);

+char *get_port(const char *ip);

+char *make_ip(const char *host, const char *port);

 enum exit_reason {

         FAIL_CMDLINE=1,

@@ -509,7 +513,7 @@ static void print_con_info(conn_t *conn, const char *fmt, ...)

 char *get_ip(const char *ip)

 {

-    char *dupip, *p1, *p2;

+    char *dupip, *p1;

     unsigned int i;

     /*

@@ -608,7 +612,7 @@ static int make_connection_real(const char *soname, conn_t *conn)

     int s;

     struct timeval tv;

     char *port=NULL;

-    char *name, *pt = strdup(soname);

+    char *pt = strdup(soname);

     const char *host = pt;

     struct addrinfo hints, *res=NULL, *p;

     int err;

@@ -1217,6 +1221,7 @@ static int read_version(conn_t *conn)

 static void sigint(int a)

 {

+    UNUSEDPARAM(a);

 	EXIT_PROGRAM(SIGINT_REASON);

 }

@@ -69,6 +69,7 @@ dev_t procdev;

 char hostid[37];

+int is_valid_hostid(void);

 char *get_hostid(void *cbdata);

 #ifdef _WIN32

@@ -135,6 +136,9 @@ struct metachain {

 static cl_error_t pre(int fd, const char *type, void *context)

 {

     struct metachain *c = context;

+    UNUSEDPARAM(fd);

+    UNUSEDPARAM(type);

+

     if (c) {

 	c->level++;

     }

@@ -162,9 +166,11 @@ static int print_chain(struct metachain *c, char *str, unsigned len)

 static cl_error_t post(int fd, int result, const char *virname, void *context)

 {

     struct metachain *c = context;

+    UNUSEDPARAM(fd);

+    UNUSEDPARAM(result);

     if (c && c->n) {

 	char str[128];

-	int toolong = print_chain(c, str, sizeof(str));

+	print_chain(c, str, sizeof(str));

 	if (c->level == c->lastadd && !virname)

 	    free(c->chains[--c->n]);

 	if (virname && !c->lastvir)

@@ -178,7 +184,6 @@ static cl_error_t post(int fd, int result, const char *virname, void *context)

 static cl_error_t meta(const char* container_type, unsigned long fsize_container, const char *filename,

 		       unsigned long fsize_real,  int is_encrypted, unsigned int filepos_container, void *context)

 {

-    int na = 0;

     char prev[128];

     struct metachain *c = context;

     const char *type = !strncmp(container_type,"CL_TYPE_",8) ? container_type + 8 : container_type;

@@ -187,6 +192,11 @@ static cl_error_t meta(const char* container_type, unsigned long fsize_container

     char **chains;

     int toolong;

+    UNUSEDPARAM(fsize_container);

+    UNUSEDPARAM(fsize_real);

+    UNUSEDPARAM(is_encrypted);

+    UNUSEDPARAM(filepos_container);

+

     if (!c)

 	return CL_CLEAN;

     chain = malloc(n);

@@ -1063,6 +1073,8 @@ int is_valid_hostid(void)

 char *get_hostid(void *cbdata)

 {

+    UNUSEDPARAM(cbdata);

+

     if (!strcmp(hostid, "none"))

         return NULL;

@@ -13,6 +13,8 @@

 #define OPTS "e:p:n:N:H:h?v"

 char *read_stream(void);

+void usage(char *name);

+void version(void);

 void usage(char *name)

 {

@@ -41,9 +43,7 @@ int main(int argc, char *argv[])

     int ch;

     struct curl_httppost *post=NULL, *last=NULL;

     struct curl_slist *slist = NULL;

-    char *type;

     char *name=NULL, *email=NULL, *filename=NULL;

-    struct cl_engine *engine;

     int setURL=0, fromStream=0;

     curl_global_init(CURL_GLOBAL_ALL);

@@ -17,4 +17,8 @@

 #  MA 02110-1301, USA.

 EXTRA_DIST = html $(top_srcdir)/docs/man/*.in clamdoc.pdf clamdoc.tex clamav-mirror-howto.pdf clamav-mirror-howto.tex phishsigs_howto.tex phishsigs_howto.pdf signatures.pdf signatures.tex clam.eps

-man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 man/clamav-milter.conf.5 man/freshclam.conf.5 man/clamconf.1 man/clamdtop.1 man/clambc.1 man/clamsubmit.1

+man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 man/clamav-milter.conf.5 man/freshclam.conf.5 man/clamconf.1 man/clamdtop.1 man/clambc.1

+

+if ENABLE_CLAMSUBMIT

+man_MANS += man/clamsubmit.1

+endif

@@ -96,6 +96,7 @@ POST_UNINSTALL = :

 build_triplet = @build@

 host_triplet = @host@

 target_triplet = @target@

+@ENABLE_CLAMSUBMIT_TRUE@am__append_1 = man/clamsubmit.1

 subdir = docs

 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

@@ -419,7 +420,10 @@ top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

 EXTRA_DIST = html $(top_srcdir)/docs/man/*.in clamdoc.pdf clamdoc.tex clamav-mirror-howto.pdf clamav-mirror-howto.tex phishsigs_howto.tex phishsigs_howto.pdf signatures.pdf signatures.tex clam.eps

-man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 man/clamav-milter.conf.5 man/freshclam.conf.5 man/clamconf.1 man/clamdtop.1 man/clambc.1 man/clamsubmit.1

+man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 \

+	man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 \

+	man/clamav-milter.conf.5 man/freshclam.conf.5 man/clamconf.1 \

+	man/clamdtop.1 man/clambc.1 $(am__append_1)

 all: all-am

 .SUFFIXES:

@@ -72,6 +72,7 @@ char hostid[37];

 void submit_host_info(struct optstruct *opts);

 char *get_hostid(void *cbdata);

+int is_valid_hostid(void);

 static void

 sighandler (int sig)

@@ -262,6 +263,9 @@ static void

 msg_callback (enum cl_msg severity, const char *fullmsg, const char *msg,

               void *ctx)

 {

+    UNUSEDPARAM(fullmsg);

+    UNUSEDPARAM(ctx);

+

     switch (severity)

     {

     case CL_MSG_ERROR:

@@ -742,7 +746,6 @@ main (int argc, char **argv)

 void submit_host_info(struct optstruct *opts)

 {

-    struct optstruct *opt;

     struct cl_engine *engine;

     cli_intel_t *intel;

@@ -812,6 +815,8 @@ int is_valid_hostid(void)

 char *get_hostid(void *cbdata)

 {

+    UNUSEDPARAM(cbdata);

+

     if (!strcmp(hostid, "none"))

         return NULL;

@@ -881,6 +881,10 @@ getfile_mirman (const char *srcfile, const char *destfile,

     char *remotename = NULL, *authorization = NULL, *headerline;

     const char *rotation = "|/-\\", *fname;

+    UNUSEDPARAM(localip);

+    UNUSEDPARAM(port);

+    UNUSEDPARAM(ctimeout);

+    UNUSEDPARAM(can_whitelist);

     if (proxy)

     {

@@ -1114,6 +1118,8 @@ getfile (const char *srcfile, const char *destfile, const char *hostname,

     int ret, sd;

     char ipaddr[46];

+    UNUSEDPARAM(opts);

+

     memset (ipaddr, 0, sizeof (ipaddr));

     if (ip && ip[0])            /* use ip to connect */

         sd = wwwconnect (ip, proxy, port, ipaddr, localip, ctimeout, mdat,

@@ -22,10 +22,11 @@ int g_allocCount = 0;

 int g_allocCountTemp = 0;

 #endif

+#include "clamav.h"

 void *SzAlloc(void *p, size_t size)

 {

-  p = p;

+    UNUSEDPARAM(p);

   if (size == 0)

     return 0;

   #ifdef _SZ_ALLOC_DEBUG

@@ -37,7 +38,7 @@ void *SzAlloc(void *p, size_t size)

 void SzFree(void *p, void *address)

 {

-  p = p;

+    UNUSEDPARAM(p);

   #ifdef _SZ_ALLOC_DEBUG

   if (address != 0)

   {

@@ -50,7 +51,7 @@ void SzFree(void *p, void *address)

 void *SzAllocTemp(void *p, size_t size)

 {

-  p = p;

+    UNUSEDPARAM(p);

   if (size == 0)

     return 0;

   #ifdef _SZ_ALLOC_DEBUG

@@ -65,7 +66,7 @@ void *SzAllocTemp(void *p, size_t size)

 void SzFreeTemp(void *p, void *address)

 {

-  p = p;

+    UNUSEDPARAM(p);

   #ifdef _SZ_ALLOC_DEBUG

   if (address != 0)

   {

@@ -19,6 +19,9 @@ Byte k7zSignature[k7zSignatureSize] = {'7', 'z', 0xBC, 0xAF, 0x27, 0x1C};

 #define NUM_FOLDER_CODERS_MAX 32

 #define NUM_CODER_STREAMS_MAX 32

+void SzFolder_Free(CSzFolder *p, ISzAlloc *alloc);

+int SzFolder_FindBindPairForOutStream(CSzFolder *p, UInt32 outStreamIndex);

+

 void SzCoderInfo_Init(CSzCoderInfo *p)

 {

   Buf_Init(&p->Props);

@@ -115,6 +115,8 @@ StopCompilingDueBUG

 #define LZMA_DIC_MIN (1 << 12)

+void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState);

+

 /* First LZMA-symbol is always decoded.

 And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization

 Out:

@@ -68,7 +68,7 @@ void XzCheck_Update(CXzCheck *p, const void *data, size_t size)

     case XZ_CHECK_CRC64: p->crc64 = Crc64Update(p->crc64, data, size); break;

     case XZ_CHECK_SHA256:

         if ((p->sha))

-            cl_update_hash(p->sha, (const Byte *)data, size);

+            cl_update_hash(p->sha, (void *)data, size);

         break;

   }

 }

@@ -33,6 +33,11 @@

 #define CODER_BUF_SIZE (1 << 17)

+void BraState_Free(void *pp, ISzAlloc *alloc);

+SRes BraState_SetProps(void *pp, const Byte *props, size_t propSize, ISzAlloc *alloc);

+void BraState_Init(void *pp);

+SRes BraState_SetFromMethod(IStateCoder *p, UInt64 id, ISzAlloc *alloc);

+

 unsigned Xz_ReadVarInt(const Byte *p, size_t maxSize, UInt64 *value)

 {

   int i, limit;

@@ -77,7 +82,7 @@ void BraState_Free(void *pp, ISzAlloc *alloc)

 SRes BraState_SetProps(void *pp, const Byte *props, size_t propSize, ISzAlloc *alloc)

 {

   CBraState *p = ((CBraState *)pp);

-  alloc = alloc;

+  UNUSEDPARAM(alloc);

   p->encodeMode = 0;

   p->ip = 0;

   if (p->methodId == XZ_ID_Delta)

@@ -133,9 +138,9 @@ static SRes BraState_Code(void *pp, Byte *dest, SizeT *destLen, const Byte *src,

   CBraState *p = ((CBraState *)pp);

   SizeT destLenOrig = *destLen;

   SizeT srcLenOrig = *srcLen;

+  UNUSEDPARAM(finishMode);

   *destLen = 0;

   *srcLen = 0;

-  finishMode = finishMode;

   *wasFinished = 0;

   while (destLenOrig > 0)

   {

@@ -302,7 +307,7 @@ static SRes Lzma2State_Code(void *pp, Byte *dest, SizeT *destLen, const Byte *sr

   ELzmaStatus status;

   /* ELzmaFinishMode fm = (finishMode == LZMA_FINISH_ANY) ? LZMA_FINISH_ANY : LZMA_FINISH_END; */

   SRes res = Lzma2Dec_DecodeToBuf((CLzma2Dec *)pp, dest, destLen, src, srcLen, finishMode, &status);

-  srcWasFinished = srcWasFinished;

+  UNUSEDPARAM(srcWasFinished);

   *wasFinished = (status == LZMA_STATUS_FINISHED_WITH_MARK);

   return res;

 }

@@ -785,7 +790,7 @@ SRes XzUnpacker_Code(CXzUnpacker *p, Byte *dest, SizeT *destLen,

               srcRem = (SizeT)cur;

             p->crc = CrcUpdate(p->crc, src, srcRem);

             if ((p->sha))

-                cl_update_hash(p->sha, src, srcRem);

+                cl_update_hash(p->sha, (void *)src, srcRem);

             (*srcLen) += srcRem;

             src += srcRem;

             p->indexPos += srcRem;

@@ -146,7 +146,7 @@ int cli_7unz (cli_ctx *ctx, size_t offset) {

 	    }

 	    name = (char *)utf16name;

-	    for(j=0; j<newnamelen; j++) /* FIXME */

+	    for(j=0; j<(size_t)newnamelen; j++) /* FIXME */

 		name[j] = utf16name[j];

 	    name[j] = 0;

 	    cli_dbgmsg("cli_7unz: extracting %s\n", name);

@@ -177,7 +177,7 @@ int cli_7unz (cli_ctx *ctx, size_t offset) {

 		    break;

 		cli_dbgmsg("cli_7unz: Saving to %s\n", name);

-		if(cli_writen(fd, outBuffer + offset, outSizeProcessed) != outSizeProcessed)

+		if((size_t)cli_writen(fd, outBuffer + offset, outSizeProcessed) != outSizeProcessed)

 		    found = CL_EWRITE;

 		else

 		    if ((found = cli_magic_scandesc(fd, ctx)) == CL_VIRUS)

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

 	dmg.h \

 	xar.c \

 	xar.h \

+	xdp.c \

+	xdp.h \

 	mbr.c \

 	mbr.h \

 	gpt.c \

@@ -271,11 +271,11 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \

 	libclamav_la-bytecode_api_decl.lo libclamav_la-cache.lo \

 	libclamav_la-bytecode_detect.lo libclamav_la-events.lo \

 	libclamav_la-adc.lo libclamav_la-dmg.lo libclamav_la-xar.lo \

-	libclamav_la-mbr.lo libclamav_la-gpt.lo libclamav_la-apm.lo \

-	libclamav_la-prtn_intxn.lo libclamav_la-json_api.lo \

-	libclamav_la-xz_iface.lo libclamav_la-sf_base64decode.lo \

-	libclamav_la-hfsplus.lo libclamav_la-swf.lo \

-	libclamav_la-jpeg.lo libclamav_la-png.lo \

+	libclamav_la-xdp.lo libclamav_la-mbr.lo libclamav_la-gpt.lo \

+	libclamav_la-apm.lo libclamav_la-prtn_intxn.lo \

+	libclamav_la-json_api.lo libclamav_la-xz_iface.lo \

+	libclamav_la-sf_base64decode.lo libclamav_la-hfsplus.lo \

+	libclamav_la-swf.lo libclamav_la-jpeg.lo libclamav_la-png.lo \

 	libclamav_la-iso9660.lo libclamav_la-arc4.lo \

 	libclamav_la-rijndael.lo libclamav_la-crtmgr.lo \

 	libclamav_la-asn1.lo libclamav_la-fpu.lo libclamav_la-stats.lo \

@@ -874,14 +874,14 @@ libclamav_la_SOURCES = matcher-ac.c matcher-ac.h matcher-bm.c \

 	bytecode_api.h bytecode_api_impl.h bytecode_hooks.h cache.c \

 	cache.h bytecode_detect.c bytecode_detect.h \

 	builtin_bytecodes.h events.c events.h adc.c adc.h dmg.c dmg.h \

-	xar.c xar.h mbr.c mbr.h gpt.c gpt.h apm.c apm.h prtn_intxn.c \

-	prtn_intxn.h json_api.c json_api.h xz_iface.c xz_iface.h \

-	sf_base64decode.c sf_base64decode.h hfsplus.c hfsplus.h swf.c \

-	swf.h jpeg.c jpeg.h png.c png.h iso9660.c iso9660.h arc4.c \

-	arc4.h rijndael.c rijndael.h crtmgr.c crtmgr.h asn1.c asn1.h \

-	fpu.c fpu.h stats.c stats.h www.c www.h stats_json.c \

-	stats_json.h hostid.c hostid.h openioc.c openioc.h bignum.h \

-	bignum_fast.h tomsfastmath/addsub/fp_add.c \

+	xar.c xar.h xdp.c xdp.h mbr.c mbr.h gpt.c gpt.h apm.c apm.h \

+	prtn_intxn.c prtn_intxn.h json_api.c json_api.h xz_iface.c \

+	xz_iface.h sf_base64decode.c sf_base64decode.h hfsplus.c \

+	hfsplus.h swf.c swf.h jpeg.c jpeg.h png.c png.h iso9660.c \

+	iso9660.h arc4.c arc4.h rijndael.c rijndael.h crtmgr.c \

+	crtmgr.h asn1.c asn1.h fpu.c fpu.h stats.c stats.h www.c www.h \

+	stats_json.c stats_json.h hostid.c hostid.h openioc.c \

+	openioc.h bignum.h bignum_fast.h tomsfastmath/addsub/fp_add.c \

 	tomsfastmath/addsub/fp_add_d.c tomsfastmath/addsub/fp_addmod.c \

 	tomsfastmath/addsub/fp_cmp.c tomsfastmath/addsub/fp_cmp_d.c \

 	tomsfastmath/addsub/fp_cmp_mag.c tomsfastmath/addsub/fp_sub.c \

@@ -1293,6 +1293,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-wwunpack.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-www.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-xar.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-xdp.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-xz_iface.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-yc.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_nocxx_la-bytecode_nojit.Plo@am__quote@

@@ -2125,6 +2126,13 @@ libclamav_la-xar.lo: xar.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-xar.lo `test -f 'xar.c' || echo '$(srcdir)/'`xar.c

+libclamav_la-xdp.lo: xdp.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-xdp.lo -MD -MP -MF $(DEPDIR)/libclamav_la-xdp.Tpo -c -o libclamav_la-xdp.lo `test -f 'xdp.c' || echo '$(srcdir)/'`xdp.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-xdp.Tpo $(DEPDIR)/libclamav_la-xdp.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xdp.c' object='libclamav_la-xdp.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-xdp.lo `test -f 'xdp.c' || echo '$(srcdir)/'`xdp.c

+

 libclamav_la-mbr.lo: mbr.c