cosmetic changes.

sympa-community · Dec 9, 2018 · b37b32a · b37b32a
1 parent 86d3b2b
commit b37b32a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/src/lib/Conf.pm b/src/lib/Conf.pm
@@ -933,15 +933,15 @@ sub _load_auth {
             'suffix'          => '.+',
             'bind_dn'         => '.+',
             'bind_password'   => '.+',
-            'get_dn_by_uid_filter'        => '.+',
-            'get_dn_by_email_filter'      => '.+',
-            'email_attribute'             => Sympa::Regexps::ldap_attrdesc(),
-            'alternative_email_attribute' => '.*',                # Obsoleted
-            'scope'                   => 'base|one|sub',
-            'authentication_info_url' => 'http(s)?:/.*',
-            'use_tls'                 => 'starttls|ldaps|none',
-            'use_ssl'                 => '1',                     # Obsoleted
-            'use_start_tls'           => '1',                     # Obsoleted
+            'get_dn_by_uid_filter'   => '.+',
+            'get_dn_by_email_filter' => '.+',
+            'email_attribute'        => Sympa::Regexps::ldap_attrdesc(),
+            'alternative_email_attribute' => '.*',                 # Obsoleted
+            'scope'                       => 'base|one|sub',
+            'authentication_info_url'     => 'http(s)?:/.*',
+            'use_tls'                     => 'starttls|ldaps|none',
+            'use_ssl'                     => '1',                  # Obsoleted
+            'use_start_tls'               => '1',                  # Obsoleted
             'ssl_version' => 'sslv2/3|sslv2|sslv3|tlsv1|tlsv1_[123]',
             'ssl_ciphers' => '[\w:]+',
             'ssl_cert'    => '.+',

diff --git a/src/lib/Sympa/WWW/Auth.pm b/src/lib/Sympa/WWW/Auth.pm
@@ -74,8 +74,8 @@ sub check_auth {
                 $user = {'email' => $canonic};
             }
             return {
-                'user'       => $user,
-                'auth'       => 'ldap',
+                'user' => $user,
+                'auth' => 'ldap',
             };
 
         } else {
@@ -160,8 +160,8 @@ sub authentication {
                 Sympa::User::update_global_user($email,
                     {wrong_login_count => 0});
                 return {
-                    'user'       => $user,
-                    'auth'       => 'classic',
+                    'user' => $user,
+                    'auth' => 'classic',
                 };
             }
         } elsif ($auth_service->{'auth_type'} eq 'ldap') {
@@ -175,8 +175,8 @@ sub authentication {
                 Sympa::User::update_global_user($canonic,
                     {wrong_login_count => 0});
                 return {
-                    'user'       => $user,
-                    'auth'       => 'ldap',
+                    'user' => $user,
+                    'auth' => 'ldap',
                 };
             }
         }
@@ -190,8 +190,6 @@ sub authentication {
         unless $ENV{'SYMPA_SOAP'};
     $log->syslog('err', 'Incorrect password for user %s', $email);
 
-    my $param;    #FIXME FIXME: not used.
-    $param->{'init_email'} = $email;
     return undef;
 }