View | Details | Raw Unified | Return to bug 36105 | Differences between
and this patch

Collapse All | Expand All

(-)a/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-daemon/debian/changelog (+6 lines)
 Lines 1-3    Link Here 
1
univention-virtual-machine-manager-daemon (4.0.20-8) unstable; urgency=low
2
3
  * Bug #36105: Fix VNC running on localhost only.
4
5
 -- Philipp Hahn <hahn@univention.de>  Thu, 11 Dec 2014 09:26:54 +0100
6
1
univention-virtual-machine-manager-daemon (4.0.20-7) unstable; urgency=low
7
univention-virtual-machine-manager-daemon (4.0.20-7) unstable; urgency=low
2
8
3
  * Bug #36380: Add progressbar while waiting for changed instance state
9
  * Bug #36380: Add progressbar while waiting for changed instance state
(-)a/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-daemon/src/univention/uvmm/node.py (-4 / +8 lines)
 Lines 40-46   import logging Link Here 
40
from xml.dom.minidom import parseString
40
from xml.dom.minidom import parseString
41
from xml.parsers.expat import ExpatError
41
from xml.parsers.expat import ExpatError
42
import math
42
import math
43
from helpers import TranslatableException, ms, tuple2version, N_ as _, uri_encode
43
from helpers import TranslatableException, ms, tuple2version, N_ as _, uri_encode, FQDN
44
from uvmm_ldap import ldap_annotation, LdapError, LdapConnectionError, ldap_modify
44
from uvmm_ldap import ldap_annotation, LdapError, LdapConnectionError, ldap_modify
45
import univention.admin.uexceptions
45
import univention.admin.uexceptions
46
import threading
46
import threading
 Lines 748-758   class Node(PersistentCached): Link Here 
748
					continue
748
					continue
749
				if gfx.type != Graphic.TYPE_VNC:
749
				if gfx.type != Graphic.TYPE_VNC:
750
					continue
750
					continue
751
				if gfx.listen != '0.0.0.0':
752
					continue
753
				if gfx.port <= 0:
751
				if gfx.port <= 0:
754
					continue
752
					continue
755
				print >> tmp_file, '%s: %s:%d' % (uuid, self.pd.name, gfx.port)
753
				if gfx.listen == '0.0.0.0':
754
					vnc_addr = self.pd.name
755
				elif gfx.listen is None and self.pd.name == FQDN:
756
					vnc_addr = '127.0.0.1'
757
				else:
758
					continue
759
				print >> tmp_file, '%s: %s:%d' % (uuid, vnc_addr, gfx.port)
756
		os.rename(tmp_file.name, path)
760
		os.rename(tmp_file.name, path)
757
761
758
	def wait_update(self, domain, state_key, timeout=10):
762
	def wait_update(self, domain, state_key, timeout=10):
(-)a/branches/ucs-4.0/ucs-4.0-0/virtualization/univention-virtual-machine-manager-daemon/test/urlparser.py (-1 / +1 lines)
 Lines 30-35    Link Here 
30
# License with the Debian GNU/Linux or Univention distribution in file
30
# License with the Debian GNU/Linux or Univention distribution in file
31
# /usr/share/common-licenses/AGPL-3; if not, see
31
# /usr/share/common-licenses/AGPL-3; if not, see
32
# <http://www.gnu.org/licenses/>.
32
# <http://www.gnu.org/licenses/>.
33
from univention.uvmm.helpers import urlparse
33
34
34
def __test():
35
def __test():
35
	URIS = filter(None, map(lambda u: u.lstrip(), """\
36
	URIS = filter(None, map(lambda u: u.lstrip(), """\
36
- 

Return to bug 36105