X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fcommand.c;h=48bed2de0262760f49e944b119632f6907c6e459;hp=b2b5ef91d8f1fb0c52cbdb885cd26f3c5f05dbee;hb=d600342b7d29c0176ff96a7807ebb38303ecb3a6;hpb=e82d864e02f7ab36881c6cda2798bb76370ee6c7 diff --git a/daemon/command.c b/daemon/command.c index b2b5ef9..48bed2d 100644 --- a/daemon/command.c +++ b/daemon/command.c @@ -36,14 +36,14 @@ do_command (char *const *argv) int dev_ok, dev_pts_ok, proc_ok, selinux_ok, sys_ok; /* We need a root filesystem mounted to do this. */ - NEED_ROOT (return NULL); + NEED_ROOT (0, return NULL); /* Conveniently, argv is already a NULL-terminated argv-style array * of parameters, so we can pass it straight in to our internal * commandv. We just have to check the list is non-empty. */ if (argv[0] == NULL) { - reply_with_error ("command: passed an empty list"); + reply_with_error ("passed an empty list"); return NULL; } @@ -85,7 +85,7 @@ do_command (char *const *argv) sys_ok = r != -1; CHROOT_IN; - r = commandv (&out, &err, argv); + r = commandv (&out, &err, (const char * const *) argv); CHROOT_OUT; if (sys_ok) command (NULL, NULL, "umount", sysroot_sys, NULL);