* Check the "Permission to send Internet mail" access controls when

  messages are submitted via Authenticated SMTP.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 3866d670ceb26862806059ae13a135370d60466c..341a230e30d36f035af42532995475e503af7cad 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 622.6  2004/07/03 04:09:37  ajc
+ * Check the "Permission to send Internet mail" access controls when
+   messages are submitted via Authenticated SMTP.
+
  Revision 622.5  2004/06/28 17:09:20  ajc
  * Properly re-terminate messages posted via IMAP APPEND.  The newline
    conversion process was shortening the text but not adjusting string
@@ -5891,3 +5895,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 0f1dcb88c201c410be81a27c9a27bf33f1ce9815..137ac0f65c0cc122231872f6475921cd5f6e7b77 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -223,7 +223,7 @@ install-exec: all
                        $(INSTALL) $$i $(root)$(prefix)/$$i; \
                fi \
        done
-       @for i in utilsmenu ; do \
+       @for i in utilsmenu database_cleanup.sh ; do \
                if test -f $(srcdir)/$$i; then \
                        echo $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \
                        $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index 8111416d30e492571b02aab71f09a515aba0004b..914e0ee53ba129d80eb3ed20df5364a92312930a 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -578,6 +578,16 @@ void smtp_rcpt(char *argbuf) {
                return;
        }
 
+       if (valid->num_internet > 0) {
+               if (CC->logged_in) {
+                        if (CtdlCheckInternetMailPermission(&CC->user)==0) {
+                               cprintf("551 5.7.1 <%s> - you do not have permission to send Internet mail\r\n", recp);
+                                free(valid);
+                                return;
+                        }
+                }
+       }
+
        if (valid->num_internet > 0) {
                if ( (SMTP->message_originated_locally == 0)
                   && (SMTP->is_lmtp == 0) ) {