@@ -1,3 +1,9 @@

+Wed Dec 22 16:08:49 GMT 2004 (trog)

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

+  * sigtool/vba.c: Add some more Word6 tokens.

+

+  * libclamav/htmlnorm.c: Don't set execute bit on temp files.

+

 Tue Dec 21 18:42:44 GMT 2004 (njh)

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

   * clamav-milter:	Fix fault tolerance problem which could cause

@@ -439,7 +439,7 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag

 		}

 		snprintf(filename, 1024, "%s/comment.html", dirname);

-		file_buff_o1->fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU);

+		file_buff_o1->fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IWUSR|S_IRUSR);

 		if (!file_buff_o1->fd) {

 			cli_dbgmsg("open failed: %s\n", filename);

 			free(file_buff_o1);

@@ -450,7 +450,7 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag

 		}

 		snprintf(filename, 1024, "%s/nocomment.html", dirname);

-		file_buff_o2->fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU);

+		file_buff_o2->fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IWUSR|S_IRUSR);

 		if (!file_buff_o2->fd) {

 			cli_dbgmsg("open failed: %s\n", filename);

 			close(file_buff_o1->fd);

@@ -462,7 +462,7 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag

 		}

 		snprintf(filename, 1024, "%s/script.html", dirname);

-		file_buff_script->fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU);

+		file_buff_script->fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IWUSR|S_IRUSR);

 		if (!file_buff_script->fd) {

 			cli_dbgmsg("open failed: %s\n", filename);

 			close(file_buff_o1->fd);

@@ -1014,7 +1014,7 @@ int html_screnc_decode(int fd, const char *dirname)

 	}

 	snprintf(filename, 1024, "%s/screnc.html", dirname);

-	file_buff.fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU);

+	file_buff.fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IWUSR|S_IRUSR);

 	file_buff.length = 0;

 	if (!file_buff.fd) {

@@ -175,6 +175,7 @@ void output_token67 (uint16_t token)

     mac_token2_t mac_token[] = {

 	{0x0004, "HelpActivateWindow"},

 	{0x0009, "HelpAbout"},

+	{0x000c, "ShrinkFont"},

 	{0x0016, "NextWindow"},

 	{0x001c, "DeleteWord"},

 	{0x0045, "GoBack"},

@@ -218,6 +219,7 @@ void output_token67 (uint16_t token)

 	{0x00d7, "ToolsMacro"},

 	{0x00de, "Organizer"},

 	{0x00e1, "ToolsOptionsFileLocations"},

+	{0x00e4, "ToolsWordCount"},

 	{0x00e9, "DocRestore"},

 	{0x00ed, "EditSelectAll"},

 	{0x00f3, "ClosePane"},

@@ -226,9 +228,12 @@ void output_token67 (uint16_t token)

 	{0x012d, "FileNewDefault"},

 	{0x012e, "FilePrintDefault"},

 	{0x0143, "ViewToolbars"},

+	{0x015d, "TextFormField"},

+	{0x0161, "FormFieldOptions"},

 	{0x0172, "InsertFootnote"},

 	{0x0179, "DrawRectangle"},

 	{0x017a, "ToolsAutoCorrect"},

+	{0x01a4, "Connect"},

 	{0x01b0, "ToolsCustomizeKeyboard"},

 	{0x01b1, "ToolsCustomizeMenus"},

 	{0x01d2, "DrawBringToFront"},

@@ -543,8 +548,13 @@ void output_token73 (uint16_t token)

 	{0x0066, ".Comments"},

 	{0x0067, ".FileName"},

 	{0x0068, ".Directory"},

+	{0x0069, ".CreateDate"},

 	{0x006a, ".LastSavedDate"},

+	{0x006b, ".LastSavedBy"},

+	{0x006c, ".RevisionNumber"},

 	{0x006f, ".NumPages"},

+	{0x0070, ".NumWords"},

+	{0x0071, ".NumChars"},

 	{0x0074, ".Rename"},

 	{0x0075, ".NewName"},

 	{0x0078, ".SmartQuotes"},

@@ -603,12 +613,14 @@ void output_token73 (uint16_t token)

 	{0x01eb, ".Address"},

 	{0x01f5, ".Run"},

 	{0x01f6, ".Edit"},

+	{0x0218, ".LastSaved"},

 	{0x0219, ".Revision"},

 	{0x021c, ".Pages"},

 	{0x021d, ".Words"},

 	{0x0232, ".WPHelp"},

 	{0x0233, ".WPDocNavKeys"},

 	{0x0234, ".SetDesc"},

+	{0x023d, ".CountFootNodes"},

 	{0x0255, ".AddToMru"},

 	{0x0272, ".With"},

 	{0x027e, ".ErrorBeeps"},

@@ -621,11 +633,13 @@ void output_token73 (uint16_t token)

 	{0x02ad, ".DraftFont"},

 	{0x02af, ".WrapToWindow"},

 	{0x02b0, ".Drawings"},

+	{0x02c0, ".NumLines"},

 	{0x02c6, ".SuperScript"},

 	{0x02c7, ".Subscript"},

 	{0x02c8, ".WritePassword"},

 	{0x02c9, ".RecommendReadOnly"},

 	{0x02ca, ".DocumentPassword"},

+	{0x02d5, ".HelpText"},

 	{0x02d6, ".InsertAs"},

 	{0x02dc, ".Formatting"},

 	{0x02de, ".InitialCaps"},

@@ -643,6 +657,9 @@ void output_token73 (uint16_t token)

 	{0x0318, ".Kerning"},

 	{0x0319, ".Exit"},

 	{0x031a, ".Enable"},

+	{0x031b, ".OwnHelp"},

+	{0x031c, ".OwnStat"},

+	{0x031d, ".StatText"},

 	{0x031e, ".FormsData"},

 	{0x0320, ".BookMarks"},

 	{0x0327, ".LinkStyles"},

@@ -652,6 +669,10 @@ void output_token73 (uint16_t token)

 	{0x0330, ".FillColor"},

 	{0x0332, ".FillPatternColor"},

 	{0x033a, ".RoundCorners"},

+	{0x0349, ".TextType"},

+	{0x0353, ".TextWidth"},

+	{0x0354, ".TextDefault"},

+	{0x0355, ".TextFormat"},

 	{0x0366, ".SearchName"},

 	{0x0370, ".BlueScreen"},

 	{0x0378, ".SubDir"},