Mixup between SPF reason and identity field

[Laurent Bigonville]

Hello

In the code, I can see the following comment:

    '''Data structure for results is a list of:
        [0] SPF result
        [1] SPF reason
        [2] Identity (HELO/Mail From)
        [3] Action based on local policy
        [4] Header
        [5] last_action (need to know if we've prepended already)'''

But multiple time later in the code, the position in the array is not respected:

For example:

            if helo_result[0] == 'None':
                helo_result[2] = "no SPF record"

(should be helo_result[1] otherwise the identity field is replaced by the comment)

or
                        header = 'Received-SPF: '+ mfrom_result[0] + ' (' + mfrom_result[2] +') ' + spfDetail

Here, mfrom_result[2] should be mfrom_result[1]

[Scott Kitterman (kitterman)]

Sorry, commented on the wrong bug.

[Scott Kitterman (kitterman)]

--- 2.9.1 (2019-10-06)
  * Use /run instead of /var/run
  * Fix-up sysv init so it works
  * Catch pyspf tracebacks so at least we don't die (thanks to Adi Pircalabu
    for both the report and the suggested fix) (LP: #1842005)
  * Correct over-writing of SPF identity by SPF reason for HELO checks and the
    reverse for Mail From (LP: #1822685)