search for: auth_for_password_fil

...in case we have a password to supply. --- v2v/libvirt_utils.ml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/v2v/libvirt_utils.ml b/v2v/libvirt_utils.ml index 7df17b29..4d0b8639 100644 --- a/v2v/libvirt_utils.ml +++ b/v2v/libvirt_utils.ml @@ -33,10 +33,14 @@ let auth_for_password_file ?password_file () = ) creds in - { - Libvirt.Connect.credtype = [ Libvirt.Connect.CredentialPassphrase ]; - cb = auth_fn; - } + let base_auth = Libvirt.Connect.get_auth_default () in + + if password_file = None then + base_auth + else + { base_auth with + cb = auth_...

...g Xie. --- v2v/libvirt_utils.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/libvirt_utils.ml b/v2v/libvirt_utils.ml index 4d0b8639..1a24b049 100644 --- a/v2v/libvirt_utils.ml +++ b/v2v/libvirt_utils.ml @@ -24,8 +24,8 @@ open Common_gettext.Gettext module. *) let auth_for_password_file ?password_file () = + let password = Option.map read_first_line_from_file password_file in let auth_fn creds = - let password = Option.map read_first_line_from_file password_file in List.map ( function | { Libvirt.Connect.typ = Libvirt.Connect.CredentialPassphrase } ->...

...-125,7 +125,12 @@ read the man page virt-v2v-copy-to-local(1). (* Get the remote libvirt XML. *) message (f_"Fetching the remote libvirt XML metadata ..."); - let xml = Libvirt_utils.dumpxml ?password_file ~conn:input_conn guest_name in + let xml = + let auth = Libvirt_utils.auth_for_password_file ?password_file () in + let conn = Libvirt.Connect.connect_auth ~name:input_conn auth in + let dom = Libvirt_utils.get_domain conn guest_name in + (* Use XmlSecure to get passwords (RHBZ#1174123). *) + Libvirt.Domain.get_xml_desc_flags dom [Libvirt.Domain.XmlSecure] in debug "...

Hi, this is a mostly done attempt to switch to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not

Hi, this is a mostly done attempt to switch to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not

Hi, this is a mostly done attempt to switch to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not

Hi, this series switches virt-2v to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not test all

Hi, this series switches virt-2v to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not test all