Frank Kobzik has uploaded a new change for review.

Change subject: frontend: Small changes in spice descriptor generating
......................................................................

frontend: Small changes in spice descriptor generating

1, Adding delete-this-file option in spice descriptor to ensure deletion after
   reading.
2, tls-ciphers row will not be generated when the ciphersuite is null.

Change-Id: I7ed05adcd3fa8c6f93ebe6e77a02710a291f6159
Signed-off-by: Frantisek Kobzik <[email protected]>
---
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/14830/1

diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java
index fcb9488..b7ca3b1 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java
@@ -39,13 +39,16 @@
             .append("\nport=").append(Integer.toString(getPort())) 
//$NON-NLS-1$
             .append("\npassword=").append(getPassword()) //$NON-NLS-1$
             .append("\ntls-port=").append(getSecurePort()) //$NON-NLS-1$
-            .append("\ntls-ciphers=").append(getCipherSuite()) //$NON-NLS-1$
             .append("\nfullscreen=").append(fullscreen) //$NON-NLS-1$
             .append("\ntitle=").append(getTitle()) //$NON-NLS-1$
             .append("\nenable-smartcard=").append(enableSmartcard) 
//$NON-NLS-1$
             .append("\nenable-usb-autoshare=").append(usbAutoShare) 
//$NON-NLS-1$
+            .append("\ndelete-this-file=1") //$NON-NLS-1$
             .append("\nusb-filter=").append(getUsbFilter()); //$NON-NLS-1$
 
+        if (getCipherSuite() != null) {
+            configBuilder.append("\ntls-ciphers=").append(getCipherSuite()); 
//$NON-NLS-1$
+        }
 
         if (!StringHelper.isNullOrEmpty(getHostSubject())) {
             configBuilder.append("\nhost-subject=").append(getHostSubject()); 
//$NON-NLS-1$


--
To view, visit http://gerrit.ovirt.org/14830
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ed05adcd3fa8c6f93ebe6e77a02710a291f6159
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Frank Kobzik <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to