X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Fmts.c;h=d298c88bf250817f903b4471ed910d9a083de1f7;hb=8a87f7b5fd5622dcde0fc4b48d93157616b496f0;hp=451a9b2f58c370ccf286226aa179983da268b871;hpb=f931795fd8973c1edb40a26ecf87dbe27f7a6148;p=mmh

diff --git a/sbr/mts.c b/sbr/mts.c
index 451a9b2..d298c88 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -54,9 +54,10 @@ char *uucplfil = "";
 char *mmdlm1 = "\001\001\001\001\n";
 char *mmdlm2 = "\001\001\001\001\n";
 
-/* Cache the username and fullname of the user */
+/* Cache the username, fullname, and mailbox of the user */
 static char username[BUFSIZ];
 static char fullname[BUFSIZ];
+static char localmbox[BUFSIZ];
 
 /* Variables for username masquerading: */
        boolean  draft_from_masquerading = FALSE;  /* also used from post.c */
@@ -267,7 +268,7 @@ LocalName (int flag)
     if (*localname && flag == 0) {
 	strncpy (buf, localname, sizeof(buffer0));
     } else {
-	memset(buffer, 0, sizeof(buffer0));
+	memset(buf, 0, sizeof(buffer0));
 	/* first get our local name */
 	gethostname (buf, sizeof(buffer0) - 1);
 	/* now fully qualify our name */
@@ -352,6 +353,34 @@ getfullname (void)
 
 
 /*
+ * Get the full local mailbox name.  This is in the form:
+ *
+ * User Name <user@name.com>
+ */
+
+char *
+getlocalmbox (void)
+{
+    if (username[0] == '\0')
+    	getuserinfo();
+
+    if (localmbox[0] == '\0') {
+    	char *cp;
+
+    	if ((cp = context_find("Local-Mailbox")) != NULL) {
+	    strncpy(localmbox, cp, sizeof(localmbox));
+	} else {
+	    snprintf(localmbox, sizeof(localmbox), "%s <%s@%s>", fullname,
+		     username, LocalName(0));
+	}
+
+	localmbox[sizeof(localmbox) - 1] = '\0';
+    }
+
+    return localmbox;
+}
+
+/*
  * Find the user's username and full name, and cache them.
  * Also, handle "mmailid" username masquerading controlled from the GECOS field
  * of the passwd file. 
@@ -412,9 +441,12 @@ getuserinfo (void)
 	strncpy (username, pw->pw_name, sizeof(username));
 
     /* The $SIGNATURE environment variable overrides the GECOS field's idea of
-       your real name. */
+       your real name. If SIGNATURE isn't set, use the Signature profile
+       setting if it exists. */
     if ((cp = getenv ("SIGNATURE")) && *cp)
 	strncpy (fullname, cp, sizeof(fullname));
+    else if ((cp = context_find("Signature")))
+    	strncpy (fullname, cp, sizeof(fullname));
 
     if (strchr(fullname, '.')) {		/*  quote any .'s */
 	char tmp[BUFSIZ];
@@ -424,13 +456,17 @@ getuserinfo (void)
 	strncpy (fullname, tmp, sizeof(fullname));
     }
 
+    fullname[sizeof(fullname) - 1] = '\0';
+
+    localmbox[0] = '\0';
+
     return;
 }
 
 static const char*
 get_mtsconf_pathname (void)
 {
-    const char *cp = getenv ( "MHMTSCONF ");
+    const char *cp = getenv ( "MHMTSCONF" );
     if (cp != NULL && *cp != '\0') {
         return cp;
     }