Remove unneeded case statement

basho · Sep 20, 2013 · 7e9088e · 7e9088e
1 parent ce320ff
commit 7e9088e
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/riak_core_security.erl b/src/riak_core_security.erl
@@ -557,21 +557,15 @@ validate_options(Options) ->
         undefined ->
             {ok, Options};
         Pass ->
-            case validate_password_option(Pass, Options) of
-                {ok, NewOptions} ->
-                    %% Do not continue to store the plaintext password
-                    {ok, NewOptions};
-                {error, _E} ->
-                    {error, _E}
-            end
+            validate_password_option(Pass, Options)
     end.
 
 %% Handle 'password' option if given
 validate_password_option(Pass, Options) ->
     lager:info("Hashing password: ~p", [Pass]),
     case riak_core_pw_auth:hash_password(Pass) of
         {ok, HashedPass, AuthName, HashFunction, Salt, Iterations} ->
-            %% Add to options
+            %% Add to options, replacing plaintext password
             NewOptions = stash("password", {"password",
                                             [{hash_pass, HashedPass},
                                              {auth_name, AuthName},