rpms/gtk-vnc
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix generation of SASL address when using AF_UNIX

Browse Source
This commit is contained in:
Daniel P. Berrange 2009-03-05 16:10:38 +00:00
parent 5a4069919d
commit a6e20e9bf2
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk-vnc-0.3.8-sasl-auth-tunnel.patch Normal file
View File

@ -0,0 +1,25 @@
diff -rup gtk-vnc-0.3.8.orig/src/gvnc.c gtk-vnc-0.3.8.new/src/gvnc.c
--- gtk-vnc-0.3.8.orig/src/gvnc.c 2009-03-05 15:35:33.000000000 +0000
+++ gtk-vnc-0.3.8.new/src/gvnc.c 2009-03-05 15:57:58.000000000 +0000
@@ -2579,7 +2579,9 @@ static gboolean gvnc_perform_auth_sasl(s
errno, strerror(errno));
goto error;
}
- if ((localAddr = gvnc_addr_to_string(&sa, salen)) == NULL)
+ if ((sa.ss_family == AF_INET ||
+ sa.ss_family == AF_INET6) &&
+ (localAddr = gvnc_addr_to_string(&sa, salen)) == NULL)
goto error;
/* Get remote address in form IPADDR:PORT */
@@ -2590,7 +2592,9 @@ static gboolean gvnc_perform_auth_sasl(s
g_free(localAddr);
goto error;
}
- if ((remoteAddr = gvnc_addr_to_string(&sa, salen)) == NULL) {
+ if ((sa.ss_family == AF_INET ||
+ sa.ss_family == AF_INET6) &&
+ (remoteAddr = gvnc_addr_to_string(&sa, salen)) == NULL) {
g_free(localAddr);
goto error;
}

7
gtk-vnc.spec
View File

@ -7,12 +7,13 @@
Summary: A GTK widget for VNC clients Summary: A GTK widget for VNC clients
Name: gtk-vnc Name: gtk-vnc
Version: 0.3.8 Version: 0.3.8
Release: 5%{?dist} Release: 6%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries Group: Development/Libraries
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.gz Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.gz
Patch1: %{name}-%{version}-relative-mouse.patch Patch1: %{name}-%{version}-relative-mouse.patch
Patch2: %{name}-%{version}-sasl-auth.patch Patch2: %{name}-%{version}-sasl-auth.patch
Patch3: %{name}-%{version}-sasl-auth-tunnel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://live.gnome.org/gtk-vnc URL: http://live.gnome.org/gtk-vnc
BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel
@ -73,6 +74,7 @@ browsers.
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
# Temp hack for patch2 # Temp hack for patch2
@ -132,6 +134,9 @@ rm -fr %{buildroot}
%endif %endif
%changelog %changelog
* Thu Mar 5 2009 Daniel P. Berrange <berrange@redhat.com> - 0.3.8-6.fc11
- Fix SASL address generation when using AF_UNIX sockets
* Tue Mar 3 2009 Daniel P. Berrange <berrange@redhat.com> - 0.3.8-5.fc11 * Tue Mar 3 2009 Daniel P. Berrange <berrange@redhat.com> - 0.3.8-5.fc11
- Support SASL authentication extension - Support SASL authentication extension