diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2024-02-20 04:10:03 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-02-20 15:10:55 +1100 |
| commit | ee6d932acb532f80b11bb7cf161668c70ec8a117 (patch) | |
| tree | 499247616d923a067ba887a372093406cd33672f | |
| parent | e27f032aa8fcbae9b2e7c451baaf4b8ac6fa3d45 (diff) | |
upstream: don't append a gratuitous space to the end of subsystem
arguments; bz3667
OpenBSD-Commit-ID: e11023aeb3f30b77a674e37b8292c862926d5dc6
| -rw-r--r-- | servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.c,v 1.403 2023/10/11 22:42:26 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.404 2024/02/20 04:10:03 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -1945,7 +1945,7 @@ process_server_config_line_depth(ServerOptions *options, char *line, arg = argv_assemble(1, &arg); /* quote command correctly */ arg2 = argv_assemble(ac, av); /* rest of command */ xasprintf(&options->subsystem_args[options->num_subsystems], - "%s %s", arg, arg2); + "%s%s%s", arg, *arg2 == '\0' ? "" : " ", arg2); free(arg2); argv_consume(&ac); options->num_subsystems++; |