2017-01-02 14:42:13 +00:00
|
|
|
diff -up openssh-7.4p1/servconf.c.memory openssh-7.4p1/servconf.c
|
|
|
|
|
--- openssh-7.4p1/servconf.c.memory 2016-12-23 15:37:48.181422360 +0100
|
|
|
|
|
+++ openssh-7.4p1/servconf.c 2016-12-23 15:38:30.189429116 +0100
|
|
|
|
|
@@ -2006,6 +2006,8 @@ copy_set_server_options(ServerOptions *d
|
2015-05-27 14:16:41 +00:00
|
|
|
dst->n = src->n; \
|
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
|
|
+ u_int i;
|
|
|
|
|
+
|
|
|
|
|
M_CP_INTOPT(password_authentication);
|
|
|
|
|
M_CP_INTOPT(gss_authentication);
|
2017-01-02 14:42:13 +00:00
|
|
|
M_CP_INTOPT(pubkey_authentication);
|
|
|
|
|
@@ -2058,8 +2060,10 @@ copy_set_server_options(ServerOptions *d
|
2015-05-27 14:16:41 +00:00
|
|
|
} while(0)
|
|
|
|
|
#define M_CP_STRARRAYOPT(n, num_n) do {\
|
|
|
|
|
if (src->num_n != 0) { \
|
|
|
|
|
+ for (i = 0; i < dst->num_n; i++) \
|
|
|
|
|
+ free(dst->n[i]); \
|
|
|
|
|
for (dst->num_n = 0; dst->num_n < src->num_n; dst->num_n++) \
|
|
|
|
|
- dst->n[dst->num_n] = xstrdup(src->n[dst->num_n]); \
|
|
|
|
|
+ dst->n[dst->num_n] = src->n[dst->num_n]; \
|
|
|
|
|
} \
|
|
|
|
|
} while(0)
|
2017-09-26 12:04:45 +00:00
|
|
|
#define M_CP_STRARRAYOPT_ALLOC(n, num_n) do { \
|
