Removed unneeded sbr code.

[mmh] / sbr / addrsbr.c

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 4ab3fec..d8f6a12 100644 (file)
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -262,7 +262,7 @@ mnfree (struct mailname *mp)
 #define empty(s) ((s) ? (s) : "")
 
 char *
-auxformat (struct mailname *mp, int extras)
+adrformat (struct mailname *mp)
 {
        static char addr[BUFSIZ];
        static char buffer[BUFSIZ];
@@ -281,9 +281,6 @@ auxformat (struct mailname *mp, int extras)
 #endif /* not BANG */
                snprintf (addr, sizeof(addr), "%s!%s", mp->m_host, mp->m_mbox);
 
-       if (!extras)
-               return addr;
-
        if (mp->m_pers || mp->m_path) {
                if (mp->m_note)
                        snprintf (buffer, sizeof(buffer), "%s %s <%s>",
@@ -302,65 +299,6 @@ auxformat (struct mailname *mp, int extras)
 }
 
 
-/*
- * address specific "sprintf"
- */
-
-char *
-adrsprintf (char *username, char *domain)
-{
-       int snprintf_return;
-       static char addr[BUFSIZ];
-
-       if (username == NULL)
-               username = getusername();
-
-       if (username_extension_masquerading) {
-               /* mts.conf contains "masquerade:[...]username_extension[...]",
-                * so tack on the value of the $USERNAME_EXTENSION environment
-                * variable, if set, to username.
-                */
-               char* extension = getenv("USERNAME_EXTENSION");
-               static char username_with_extension[BUFSIZ];
-
-               if (extension != NULL && *extension != '\0') {
-                       snprintf_return = snprintf(username_with_extension,
-                               sizeof(username_with_extension),
-                               "%s%s", username, extension);
-
-                       if (snprintf_return < 0 ||
-                               snprintf_return >= sizeof(username_with_extension))
-                               adios(NULL, "snprintf() error writing username (%d chars) and"
-                                         " $USERNAME_EXTENSION (%d chars) to array of BUFSIZ (%d)"
-                                         " chars",
-                                         strlen(username), strlen(extension), BUFSIZ);
-
-                       username = username_with_extension;
-               }
-       }
-
-#ifdef REALLYDUMB
-       return username;
-#endif
-
-       if (domain == NULL)
-               domain = LocalName();
-
-#ifndef BANG
-       snprintf_return = snprintf (addr, sizeof(addr), "%s@%s", username, domain);
-#else /* BANG */
-       snprintf_return = snprintf (addr, sizeof(addr), "%s!%s", domain, username);
-#endif /* BANG */
-
-       if (snprintf_return < 0 || snprintf_return >= sizeof(addr))
-               adios(NULL, "snprintf() error writing username (%d chars), domain (%d"
-                         " chars), and 1 separator char to array of BUFSIZ (%d) chars",
-                         strlen(username), strlen(domain), BUFSIZ);
-
-       return addr;
-}
-
-
 #define W_NIL   0x0000
 #define W_MBEG  0x0001
 #define W_MEND  0x0002