Hello,
Jordi Pujol, le jeu. 31 oct. 2019 14:33:00 +0100, a ecrit:
> The smbd daemon takes additional command line options
> from environment variable SMBDOPTIONS.
> Set the environment variable SMBDOPTIONS before executing qemu.
>
> Example:
>
> export SMBDOPTIONS="--option='server min protocol=CORE' -d 4"
>
> Signed-off-by: Jordi Pujol Palomer <jordipuj...@gmail.com>
> ---
> --- qemu-4.1-a/net/slirp.c
> +++ qemu_4.1-b/net/slirp.c
> @@ -909,6 +909,12 @@ static int slirp_smb(SlirpState* s, cons
> CONFIG_SMBD_COMMAND, s->smb_dir, smb_conf);
> g_free(smb_conf);
>
> + char *options = g_strdup(g_getenv("SMBDOPTIONS"));
Why strduping it? you can just use g_getenv.
> + if (options) {
> + smb_cmdline = g_strdup_printf("%s %s", smb_cmdline, options);
> + }
> + g_free(options);
> +
> if (slirp_add_exec(s->slirp, smb_cmdline, &vserver_addr, 139) < 0 ||
> slirp_add_exec(s->slirp, smb_cmdline, &vserver_addr, 445) < 0) {
> slirp_smb_cleanup(s);
>
> --- qemu-4.1-a/slirp/src/misc.c 2019-10-29 14:40:15.043120941 +0100
> +++ qemu-4.1-b/slirp/src/misc.c 2019-10-29 14:41:04.440235684 +0100
Please submit this part to https://gitlab.freedesktop.org/slirp/libslirp/
Make sure to note in the changelog that g_shell_parse_argv does only
tokenization, and no replacement.
Samuel
> @@ -168,7 +168,9 @@ g_spawn_async_with_fds_slirp(const gchar
> int fork_exec(struct socket *so, const char *ex)
> {
> GError *err = NULL;
> - char **argv;
> + gint argc = 0;
> + gchar **argv = NULL;
> + gboolean ret;
> int opt, sp[2];
>
> DEBUG_CALL("fork_exec");
> @@ -179,7 +181,13 @@ int fork_exec(struct socket *so, const c
> return 0;
> }
>
> - argv = g_strsplit(ex, " ", -1);
> + ret = g_shell_parse_argv(ex, &argc, &argv, &err);
> + if (err) {
> + g_critical("fork_exec invalid command: %s", err->message);
> + g_error_free(err);
> + return 0;
> + }
> +
> g_spawn_async_with_fds(NULL /* cwd */, argv, NULL /* env */,
> G_SPAWN_SEARCH_PATH, fork_exec_child_setup,
> NULL /* data */, NULL /* child_pid */, sp[1],
> sp[1],
> **************************************************
>
> Thanks,
>
> Jordi Pujol
>
