From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 3 Aug 2022 09:28:08 +0000 (+0200)
Subject: REORG: server: Export srv_settings_cpy() function
X-Git-Tag: v2.7-dev3~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b32cb9b5151d4b42ff92edd707d61960f8b3a536;p=thirdparty%2Fhaproxy.git

REORG: server: Export srv_settings_cpy() function

This function will be used to init a proxy with settings of the default
proxy. It is mandatory to fix a bug. To do so, it must be exposed.
---

diff --git a/include/haproxy/server.h b/include/haproxy/server.h
index 2572b72305..7238744848 100644
--- a/include/haproxy/server.h
+++ b/include/haproxy/server.h
@@ -44,6 +44,7 @@ extern struct dict server_key_dict;
 int srv_downtime(const struct server *s);
 int srv_lastsession(const struct server *s);
 int srv_getinter(const struct check *check);
+void srv_settings_cpy(struct server *srv, const struct server *src, int srv_tmpl);
 int parse_server(const char *file, int linenum, char **args, struct proxy *curproxy, const struct proxy *defproxy, int parse_flags);
 int srv_update_addr(struct server *s, void *ip, int ip_sin_family, const char *updater);
 int server_parse_sni_expr(struct server *newsrv, struct proxy *px, char **err);
diff --git a/src/server.c b/src/server.c
index 73a73232e4..debbd71e1f 100644
--- a/src/server.c
+++ b/src/server.c
@@ -2169,7 +2169,7 @@ int srv_prepare_for_resolution(struct server *srv, const char *hostname)
  * <srv_tmpl> distinguishes these two cases (must be 1 if <srv> is a template,
  * 0 if not).
  */
-static void srv_settings_cpy(struct server *srv, const struct server *src, int srv_tmpl)
+void srv_settings_cpy(struct server *srv, const struct server *src, int srv_tmpl)
 {
 	/* Connection source settings copy */
 	srv_conn_src_cpy(srv, src);