[libvirt] [PATCH 2/1] command: reject pidfile on non-daemon

Daniel P. Berrange berrange at redhat.com
Wed Mar 23 12:24:03 UTC 2011


On Tue, Mar 22, 2011 at 04:45:08PM -0600, Eric Blake wrote:
> * src/util/command.c (virCommandRunAsync): Since virExec only
> creates pidfiles for daemon, enforce this in virCommand.
> ---
>  src/util/command.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/src/util/command.c b/src/util/command.c
> index 89f82c7..7b4337f 100644
> --- a/src/util/command.c
> +++ b/src/util/command.c
> @@ -1172,7 +1172,11 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid)
>                          cmd->pwd);
>          return -1;
>      }
> -
> +    if (cmd->pidfile && !(cmd->flags & VIR_EXEC_DAEMON)) {
> +        virCommandError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                        _("creation of pid file requires daemonized command"));
> +        return -1;
> +    }
> 
>      str = virCommandToString(cmd);
>      VIR_DEBUG("About to run %s", str ? str : cmd->args[0]);

ACK

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|




More information about the libvir-list mailing list