Index: univention-virtual-machine-manager-node/conffiles/etc/libvirt/qemu.conf
===================================================================
--- univention-virtual-machine-manager-node/conffiles/etc/libvirt/qemu.conf	(Revision 69523)
+++ univention-virtual-machine-manager-node/conffiles/etc/libvirt/qemu.conf	(Arbeitskopie)
@@ -68,6 +68,9 @@
 # example here before you set this.
 #
 # vnc_password = "XYZ12345"
+@!@
+print 'vnc_password = \'%s\')' % (configRegistry.get('uvmm/kvm/vnc/password', ''),)
+@!@
 
 
 # Enable use of SASL encryption on the VNC server. This requires
Index: univention-virtual-machine-manager-node/debian/univention-virtual-machine-manager-node-kvm.univention-config-registry
===================================================================
--- univention-virtual-machine-manager-node/debian/univention-virtual-machine-manager-node-kvm.univention-config-registry	(Revision 69523)
+++ univention-virtual-machine-manager-node/debian/univention-virtual-machine-manager-node-kvm.univention-config-registry	(Arbeitskopie)
@@ -1,6 +1,7 @@
 Type: file
 File: etc/libvirt/qemu.conf
 Variables: uvmm/kvm/qemu/.*
+Variables: uvmm/kvm/vnc/password
 
 Type: file
 File: etc/udev/rules.d/99-uvmm-node-kvm.rules
Index: univention-virtual-machine-manager-node/debian/univention-virtual-machine-manager-node-kvm.univention-config-registry-variables
===================================================================
--- univention-virtual-machine-manager-node/debian/univention-virtual-machine-manager-node-kvm.univention-config-registry-variables	(Revision 69523)
+++ univention-virtual-machine-manager-node/debian/univention-virtual-machine-manager-node-kvm.univention-config-registry-variables	(Arbeitskopie)
@@ -9,3 +9,9 @@
 Description[en]=The network interface to be used for the KVM network bridge. Otherwise the network interface is used, over which the standard gateway is reached.
 Type=str
 Categories=uvmm
+
+[uvmm/kvm/vnc/password]
+Description[de]=Hier kann ein globales Passwort für VNC-Verbindungen konfiguriert werden. Ist die Variable nicht gesetzt, erfolgt die Konfiguration individuell pro virtueller Maschine.
+Description[en]=A global password for VNC connections can be configured here. If the variable is unset, the password is configured individually on a per virtual machine basis.
+Type=str
+Categories=uvmm