mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-16 09:03:42 +00:00
* qemu-kvm: increase the size of the buffer used to build the smbd
command line. svn path=/nixpkgs/trunk/; revision=19756
This commit is contained in:
parent
277e66450b
commit
b22880b12d
@ -1,19 +1,27 @@
|
|||||||
Honour $TMPDIR for the qemu-smb temporary directory.
|
Honour $TMPDIR for the qemu-smb temporary directory.
|
||||||
|
|
||||||
diff -rc -x '*~' qemu-kvm-0.12.2-orig/net/slirp.c qemu-kvm-0.12.2/net/slirp.c
|
diff -rc -x '*~' qemu-kvm-0.12.2-orig/net/slirp.c qemu-kvm-0.12.2/net/slirp.c
|
||||||
*** qemu-kvm-0.12.2-orig/net/slirp.c 2010-01-18 19:48:25.000000000 +0100
|
*** qemu-kvm-0.12.2-orig/net/slirp.c 2010-02-01 19:05:24.000000000 +0100
|
||||||
--- qemu-kvm-0.12.2/net/slirp.c 2010-02-01 15:56:43.000000000 +0100
|
--- qemu-kvm-0.12.2/net/slirp.c 2010-02-01 19:05:54.000000000 +0100
|
||||||
***************
|
***************
|
||||||
*** 480,486 ****
|
*** 476,486 ****
|
||||||
char smb_cmdline[128];
|
struct in_addr vserver_addr)
|
||||||
|
{
|
||||||
|
static int instance;
|
||||||
|
! char smb_conf[128];
|
||||||
|
! char smb_cmdline[128];
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
! snprintf(s->smb_dir, sizeof(s->smb_dir), "/tmp/qemu-smb.%ld-%d",
|
! snprintf(s->smb_dir, sizeof(s->smb_dir), "/tmp/qemu-smb.%ld-%d",
|
||||||
(long)getpid(), instance++);
|
(long)getpid(), instance++);
|
||||||
if (mkdir(s->smb_dir, 0700) < 0) {
|
if (mkdir(s->smb_dir, 0700) < 0) {
|
||||||
qemu_error("could not create samba server dir '%s'\n", s->smb_dir);
|
qemu_error("could not create samba server dir '%s'\n", s->smb_dir);
|
||||||
--- 480,489 ----
|
--- 476,489 ----
|
||||||
char smb_cmdline[128];
|
struct in_addr vserver_addr)
|
||||||
|
{
|
||||||
|
static int instance;
|
||||||
|
! char smb_conf[1024];
|
||||||
|
! char smb_cmdline[1024];
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
! char *tmpdir = getenv("TMPDIR");
|
! char *tmpdir = getenv("TMPDIR");
|
||||||
|
Loading…
Reference in New Issue
Block a user