Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / modules / smtp / smtp_util.h

diff --git a/citadel/modules/smtp/smtp_util.h b/citadel/modules/smtp/smtp_util.h
index f3c53f972f988c637ada478e31e55680d0e0aa76..7666a34dfc3980abe56ca9ce833867faaf493c80 100644 (file)
--- a/citadel/modules/smtp/smtp_util.h
+++ b/citadel/modules/smtp/smtp_util.h
@@ -20,36 +20,37 @@
  * The VRFY and EXPN commands have been removed from this implementation
  * because nobody uses these commands anymore, except for spammers.
  *
- * Copyright (c) 1998-2009 by the citadel.org team
+ * Copyright (c) 1998-2013 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 const char *smtp_get_Recipients(void);
 
 typedef struct _citsmtp {              /* Information about the current session */
        int command_state;
-       char helo_node[SIZ];
-       char from[SIZ];
-       char recipients[SIZ];
+       StrBuf *Cmd;
+       StrBuf *helo_node;
+       StrBuf *from;
+       StrBuf *recipients;
+       StrBuf *OneRcpt;
        int number_of_recipients;
        int delivery_mode;
        int message_originated_locally;
        int is_lmtp;
        int is_unfiltered;
        int is_msa;
-}citsmtp;
+       StrBuf *preferred_sender_email;
+       StrBuf *preferred_sender_name;
+} citsmtp;
 
 #define SMTP           ((citsmtp *)CC->session_specific_data)
+
+void smtp_do_bounce(char *instr, StrBuf *OMsgTxt);