← Back to branch summary

~ubuntu-branches/ubuntu/quantal/dovecot/quantal

« back to all changes in this revision

Viewing changes to sieve/src/testsuite/testsuite-message.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-06-29 09:21:32 UTC
  • mfrom: (4.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20100629092132-q4pr5lfuvmjqou19
Tags: 1:1.2.12-1ubuntu1
https://launchpad.net/bugs/597818
* Merge from Debian Unstable, remaining changes:
  + Add mail-stack-delivery as per server-maverick-mail-integration spec:
   - Update debian/rules
   - Convert existing package to a dummy package and add new binary in debian/control
   - Update maintainer scripts.
   - Move previously installed backups and config files to new package name
     space in preinst
   - Add new debian/mail-stack-delivery.prerm to handle downgrades
   - Rename debian/dovecot-postfix.* to debian/mail-stack-delivery.*
  + Use Snakeoil SSL certificates by default.
    - debian/control: Depend on ssl-cert.
    - debian/patches/ssl-cert-snakeoil.dpatch: Change default SSL cert paths to snakeoil.
    - debian/dovecot-common.postinst: Relax grep for SSL_* a bit.
  + Add autopkgtest to debian/tests/*.
  + Add ufw integration:
    - Created debian/dovecot-common.ufw.profile.
    - debian/rules: install profile.
    - debian/control: suggest ufw.
  + debian/{control,rules}: enable PIE hardening.
  + debian/control: Update Vcs-* headers.
  + Add SMTP-AUTH support for Outlook (login auth mechanism) 
  + debian/dovecot-common.dirs: Added usr/share/doc/dovecot-common
  + debian/patches/fix-dovecot-config-parser.patch: Fix ordering of external config 
    files. (LP: #597818)

Show diffs side-by-side

added added

removed removed

Lines of Context:
sieve/src/testsuite/testsuite-message.c
15
15
#include "testsuite-common.h"
16
16
#include "testsuite-message.h"
17
17
 
18
 
/* 
19
 
 * Testsuite message environment 
 
18
/*
 
19
 * Testsuite message environment
20
20
 */
21
 
 
 
21
 
22
22
struct sieve_message_data testsuite_msgdata;
23
23
 
24
24
static const char *testsuite_user;
25
25
static struct mail_raw *_raw_message;
26
26
 
27
 
static const char *_default_message_data = 
 
27
static const char *_default_message_data =
28
28
"From: stephan@rename-it.nl\n"
29
29
"To: sirius@drunksnipers.com\n"
30
30
"Subject: Frop!\n"
40
40
static void _testsuite_message_set_data(struct mail *mail)
41
41
{
42
42
        const char *recipient = NULL, *sender = NULL;
43
 
        
44
 
        /* 
45
 
         * Collect necessary message data 
 
43
 
 
44
        /*
 
45
         * Collect necessary message data
46
46
         */
47
 
         
48
 
        /* Get recipient address */ 
 
47
 
 
48
        /* Get recipient address */
49
49
        (void)mail_get_first_header(mail, "Envelope-To", &recipient);
50
50
        if ( recipient == NULL )
51
51
                (void)mail_get_first_header(mail, "To", &recipient);
52
 
        if ( recipient == NULL ) 
 
52
        if ( recipient == NULL )
53
53
                recipient = "recipient@example.com";
54
 
        
 
54
 
55
55
        /* Get sender address */
56
56
        (void)mail_get_first_header(mail, "Return-path", &sender);
57
 
        if ( sender == NULL ) 
 
57
        if ( sender == NULL )
58
58
                (void)mail_get_first_header(mail, "Sender", &sender);
59
 
        if ( sender == NULL ) 
 
59
        if ( sender == NULL )
60
60
                (void)mail_get_first_header(mail, "From", &sender);
61
 
        if ( sender == NULL ) 
 
61
        if ( sender == NULL )
62
62
                sender = "sender@example.com";
63
63
 
64
 
        memset(&testsuite_msgdata, 0, sizeof(testsuite_msgdata));       
 
64
        memset(&testsuite_msgdata, 0, sizeof(testsuite_msgdata));
65
65
        testsuite_msgdata.mail = mail;
66
66
        testsuite_msgdata.auth_user = testsuite_user;
67
67
        testsuite_msgdata.return_path = sender;
71
71
}
72
72
 
73
73
void testsuite_message_init(const char *user)
74
 
{               
 
74
{
75
75
        message_pool = pool_alloconly_create("testsuite_message", 6096);
76
76
 
77
77
        string_t *default_message = str_new(message_pool, 1024);
98
98
 
99
99
        sieve_message_context_flush(renv->msgctx);
100
100
 
101
 
        /*{ 
 
101
        /*{
102
102
                const unsigned char *data;
103
103
                struct istream *input;
104
104
                size_t size;
119
119
(const struct sieve_runtime_env *renv, const char *file_path)
120
120
{
121
121
        mail_raw_close(_raw_message);
122
 
         
 
122
 
123
123
        _raw_message = mail_raw_open_file(file_path);
124
124
 
125
125
        _testsuite_message_set_data(_raw_message->mail);
134
134
 
135
135
        sieve_message_context_flush(renv->msgctx);
136
136
}
137
 
        
 
137
 
138
138
void testsuite_message_deinit(void)
139
139
{
140
140
        mail_raw_close(_raw_message);
180
180
        testsuite_msgdata.auth_user = str_c(envelope_auth);
181
181
 
182
182
        sieve_message_context_flush(renv->msgctx);
183
 
} 
184
 
 
 
183
}
 
184