[Qemu-trivial] [PATCH] net/slirp: specify logbase for smbd

[Qemu-trivial] [PATCH] net/slirp: specify logbase for smbd

[Michael Tokarev]

It looks like smbd always logs to /var/log/samba/log.$progname
even if config file specifies different logfile -- when it needs
to log something before completing reading the config file.  But
if it can't open it for writing, it fails and exits.  Tell smbd
to use our temp dir as logbase (-l option) to avoid that.

The same option is used by samba3 and samba4, so there should
be no incompatible changes.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 net/slirp.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/slirp.c b/net/slirp.c
index c171119..920af30 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -549,8 +549,8 @@ static int slirp_smb(SlirpState* s, const char *exported_dir,
             );
     fclose(f);
 
-    snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -s %s",
-             CONFIG_SMBD_COMMAND, smb_conf);
+    snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -l %s -s %s",
+             CONFIG_SMBD_COMMAND, s->smb_dir, smb_conf);
 
     if (slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 139) < 0 ||
         slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 445) < 0) {
-- 
1.7.10.4

[Qemu-devel] [PATCH] net/slirp: specify logbase for smbd

[Michael Tokarev]

It looks like smbd always logs to /var/log/samba/log.$progname
even if config file specifies different logfile -- when it needs
to log something before completing reading the config file.  But
if it can't open it for writing, it fails and exits.  Tell smbd
to use our temp dir as logbase (-l option) to avoid that.

The same option is used by samba3 and samba4, so there should
be no incompatible changes.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 net/slirp.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/slirp.c b/net/slirp.c
index c171119..920af30 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -549,8 +549,8 @@ static int slirp_smb(SlirpState* s, const char *exported_dir,
             );
     fclose(f);
 
-    snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -s %s",
-             CONFIG_SMBD_COMMAND, smb_conf);
+    snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -l %s -s %s",
+             CONFIG_SMBD_COMMAND, s->smb_dir, smb_conf);
 
     if (slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 139) < 0 ||
         slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 445) < 0) {
-- 
1.7.10.4

Re: [Qemu-trivial] [PATCH] net/slirp: specify logbase for smbd

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1380 bytes --]

On 2014-10-24 22:37, Michael Tokarev wrote:
> It looks like smbd always logs to /var/log/samba/log.$progname
> even if config file specifies different logfile -- when it needs
> to log something before completing reading the config file.  But
> if it can't open it for writing, it fails and exits.  Tell smbd
> to use our temp dir as logbase (-l option) to avoid that.
> 
> The same option is used by samba3 and samba4, so there should
> be no incompatible changes.
> 
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> ---
>  net/slirp.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/net/slirp.c b/net/slirp.c
> index c171119..920af30 100644
> --- a/net/slirp.c
> +++ b/net/slirp.c
> @@ -549,8 +549,8 @@ static int slirp_smb(SlirpState* s, const char *exported_dir,
>              );
>      fclose(f);
>  
> -    snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -s %s",
> -             CONFIG_SMBD_COMMAND, smb_conf);
> +    snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -l %s -s %s",
> +             CONFIG_SMBD_COMMAND, s->smb_dir, smb_conf);
>  
>      if (slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 139) < 0 ||
>          slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 445) < 0) {
> 

Cool, works for me as well!

Reviewed-and-tested-by: Jan Kiszka <jan.kiszka@siemens.com>

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [Qemu-devel] [PATCH] net/slirp: specify logbase for smbd

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1380 bytes --]

On 2014-10-24 22:37, Michael Tokarev wrote:
> It looks like smbd always logs to /var/log/samba/log.$progname
> even if config file specifies different logfile -- when it needs
> to log something before completing reading the config file.  But
> if it can't open it for writing, it fails and exits.  Tell smbd
> to use our temp dir as logbase (-l option) to avoid that.
> 
> The same option is used by samba3 and samba4, so there should
> be no incompatible changes.
> 
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> ---
>  net/slirp.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/net/slirp.c b/net/slirp.c
> index c171119..920af30 100644
> --- a/net/slirp.c
> +++ b/net/slirp.c
> @@ -549,8 +549,8 @@ static int slirp_smb(SlirpState* s, const char *exported_dir,
>              );
>      fclose(f);
>  
> -    snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -s %s",
> -             CONFIG_SMBD_COMMAND, smb_conf);
> +    snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -l %s -s %s",
> +             CONFIG_SMBD_COMMAND, s->smb_dir, smb_conf);
>  
>      if (slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 139) < 0 ||
>          slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 445) < 0) {
> 

Cool, works for me as well!

Reviewed-and-tested-by: Jan Kiszka <jan.kiszka@siemens.com>

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]