* Update to version 2.19.1

 *  Upgrade UW-IMAP to Panda IMAP from https://github.com/jonabbey/panda-imap.
 *  Replace tabs by spaces in From and Subject fields to control for size in
    screen of these fields. Change only in index screen display.

1 files changed, 19 insertions, 19 deletions

diff --git a/imap/src/tmail/tmail.c b/imap/src/tmail/tmail.c
index ed5fc589..923a98a9 100644
--- a/imap/src/tmail/tmail.c
+++ b/imap/src/tmail/tmail.c
@@ -1,13 +1,5 @@
 /* ========================================================================
- * Copyright 1988-2007 University of Washington
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 
+ * Copyright 2008 Mark Crispin
  * ========================================================================
  */
 
@@ -15,15 +7,20 @@
  * Program:	Mail Delivery Module
  *
  * Author:	Mark Crispin
- *		Networks and Distributed Computing
- *		Computing & Communications
- *		University of Washington
- *		Administration Building, AG-44
- *		Seattle, WA  98195
- *		Internet: MRC@CAC.Washington.EDU
  *
  * Date:	5 April 1993
- * Last Edited:	30 October 2008
+ * Last Edited:	27 November 2008
+ *
+ * Previous versions of this file were
+ *
+ * Copyright 1988-2007 University of Washington
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  */
 
 #include <stdio.h>
@@ -39,7 +36,7 @@ extern int errno;		/* just in case */
 
 /* Globals */
 
-char *version = "22";		/* tmail edit version */
+char *version = "25";		/* tmail edit version */
 int debug = NIL;		/* debugging (don't fork) */
 int trycreate = NIL;		/* flag saying gotta create before appending */
 int critical = NIL;		/* flag saying in critical code */
@@ -283,7 +280,7 @@ int deliver (FILE *f,unsigned long msglen,char *user)
   uid_t duid;
   uid_t euid = geteuid ();
 				/* get user record */
-  if (!(pwd = getpwnam (getusername (user,&mailbox)))) {
+  if (!((s = getusername (user,&mailbox)) && (pwd = getpwnam (s)))) {
     sprintf (tmp,"no such user as %.80s",user);
     return fail (tmp,EX_NOUSER);
   }
@@ -597,13 +594,16 @@ int fail (char *string,int code)
 /* Get user name from username+mailbox specifier
  * Accepts: username/mailbox specifier
  *	    pointer to return location for mailbox specifier
- * Returns: user name, mailbox specifier value NIL if INBOX, patches out +
+ * Returns: user name, mailbox specifier value NIL if INBOX, patches out +,
+ *	    or NIL if error
  */
 
 char *getusername (char *s,char **t)
 {
   if (*t = strchr (s,'+')) {	/* have a mailbox specifier? */
     *(*t)++ = '\0';		/* yes, tie off user name */
+				/* forbid overlong name */
+    if (strlen (*t) > NETMAXMBX) return NIL;
 				/* user+ and user+INBOX same as user */
     if (!**t || !compare_cstring ((unsigned char *) *t,"INBOX")) *t = NIL;
   }