samlauth_acs uses wrong configuration variables to map an existing user?

Problem/Motivation

I've just started investigating samlauth and have been trying out the option to map a SAML user to an existing local Drupal user. I was getting confusing results and on investigating it looks to me like the code in the samlauth_acs function that deals with mapping users actually uses the wrong configuration variables.

Steps to reproduce

The config form has fields related to mapping users like this:

  $form['user_info']['samlauth_map_users'] = array(
    '#type' => 'checkbox',
    '#title' => t('Attempt to map SAML users to existing local users?'),
    '#description' => t('If this option is enabled and a SAML authentication response is received for a user that already exists locally, and the user\'s email matches the configured attribute, the SAML user will be mapped to the local user and then logged in.'),
    '#default_value' => variable_get('samlauth_map_users', FALSE),
  );

  $form['user_info']['samlauth_map_users_email'] = array(
    '#type' => 'textfield',
    '#title' => t('Email attribute (for mapping)'),
    '#description' => t('This attribute will be used for mapping SAML users to local Drupal users.'),
    '#default_value' => variable_get('samlauth_map_users_email', FALSE),
    '#states' => array(
      'invisible' => array(
        ':input[name="samlauth_map_users"]' => array('checked' => FALSE),
      ),
    ),
  );

and the samlauth_acs function code to map to an existing user looks like this:

else {
      $mail_attribute = variable_get('samlauth_user_mail_attribute', 'email');
      if (variable_get('samlauth_map_users_email', FALSE) && $account = user_load_by_mail($saml_data[$mail_attribute])) {
        samlauth_associate_saml_id_with_account($unique_id, $account);
      }
      elseif (variable_get('samlauth_create_users', FALSE)) {
        $account = samlauth_create_user_from_saml_data($saml_data);
      }
      else {
        throw new Exception('No existing user account matches the SAML ID provided. This authentication service is not configured to create new accounts.');
      }
    }

Proposed resolution

I think the code should look like this:

else {
      $mail_attribute = variable_get('samlauth_map_users_email', 'email');
      if (variable_get('samlauth_map_users', FALSE) && $account = user_load_by_mail($saml_data[$mail_attribute])) {
        samlauth_associate_saml_id_with_account($unique_id, $account);
      }
      elseif (variable_get('samlauth_create_users', FALSE)) {
        $account = samlauth_create_user_from_saml_data($saml_data);
      }
      else {
        throw new Exception('No existing user account matches the SAML ID provided. This authentication service is not configured to create new accounts.');
      }
    }

i.e.

$ diff old.txt new.txt
2,3c2,3
<       $mail_attribute = variable_get('samlauth_user_mail_attribute', 'email');
<       if (variable_get('samlauth_map_users_email', FALSE) && $account = user_load_by_mail($saml_data[$mail_attribute])) {
---
>       $mail_attribute = variable_get('samlauth_map_users_email', 'email');
>       if (variable_get('samlauth_map_users', FALSE) && $account = user_load_by_mail($saml_data[$mail_attribute])) {