0001-config-Fix-building-without-globbing-support.patch 1011 B

123456789101112131415161718192021222324252627282930
  1. From 97b2a61d74edebad43ad09612c92a0341090f165 Mon Sep 17 00:00:00 2001
  2. From: Andreas Schneider <asn@cryptomilk.org>
  3. Date: Tue, 25 Sep 2018 14:35:43 +0200
  4. Subject: [PATCH] config: Fix building without globbing support
  5. Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
  6. (cherry picked from commit f709c3ac585f7b47317758b8693a6d104b30f951)
  7. Signed-off-by: Baruch Siach <baruch@tkos.co.il>
  8. ---
  9. Upstream status: commit 97b2a61d74 (stable-0.8 branch)
  10. src/config.c | 2 +-
  11. 1 file changed, 1 insertion(+), 1 deletion(-)
  12. diff --git a/src/config.c b/src/config.c
  13. index df6b48bf6d5e..3d87a1780a58 100644
  14. --- a/src/config.c
  15. +++ b/src/config.c
  16. @@ -462,7 +462,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
  17. p = ssh_config_get_str_tok(&s, NULL);
  18. if (p && *parsing) {
  19. -#ifdef HAVE_GLOB
  20. +#if defined(HAVE_GLOB) && defined(HAVE_GLOB_GL_FLAGS_MEMBER)
  21. local_parse_glob(session, p, parsing, seen);
  22. #else
  23. local_parse_file(session, p, parsing, seen);
  24. --
  25. 2.19.1