auth: auth-scram-server - Change return type of auth_scram_get_server_first() to...

diff --git a/src/auth/auth-scram-server.c b/src/auth/auth-scram-server.c
index 25fa48a3d9f4043f19f068d0eca1105c3287ef69..6ef04ca072bc7bc67afbbbba68687e4b8459b733 100644 (file)
--- a/src/auth/auth-scram-server.c
+++ b/src/auth/auth-scram-server.c
@@ -159,7 +159,7 @@ auth_scram_parse_client_first(struct scram_auth_request *server,
        return 0;
 }
 
-static const char *
+static string_t *
 auth_scram_get_server_first(struct scram_auth_request *server,
                            int iter, const char *salt)
 {
@@ -196,7 +196,7 @@ auth_scram_get_server_first(struct scram_auth_request *server,
                        strlen(salt));
        str_printfa(str, "r=%s%s,s=%s,i=%d", server->cnonce, server->snonce,
                    salt, iter);
-       return str_c(str);
+       return str;
 }
 
 static bool

diff --git a/src/auth/mech-scram.c b/src/auth/mech-scram.c
index c73b5e127aed758476a4e33550494c4636be0d10..ade3aca142c4c5ec12434defffb3a8a53ca66855 100644 (file)
--- a/src/auth/mech-scram.c
+++ b/src/auth/mech-scram.c
@@ -74,7 +74,7 @@ credentials_callback(enum passdb_result result,
                }
 
                request->server_first_message = p_strdup(request->pool,
-                       auth_scram_get_server_first(request, iter_count, salt));
+                       str_c(auth_scram_get_server_first(request, iter_count, salt)));
 
                auth_request_handler_reply_continue(auth_request,
                                        request->server_first_message,