- drop kerberos support, we need pam and there is no fallback when

  built with kerberos

diff --git a/heimdal.patch b/heimdal.patch
deleted file mode 100644 (file)
index 80f3750..0000000
--- a/heimdal.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- xrdp-v0.6.1/sesman/verify_user_kerberos.c~ 2013-11-09 21:11:15.000000000 +0100
-+++ xrdp-v0.6.1/sesman/verify_user_kerberos.c  2013-12-07 19:01:56.670626777 +0100
-@@ -187,11 +187,15 @@
- 
-   u_info = (struct user_info*)data;
-   rc = 0;
-+#ifndef HEIMDAL
-   types = krb5_get_prompt_types(ctx);
-+#endif
-   for (i = 0; i < num_prompts; i++)
-   {
-+#ifndef HEIMDAL
-     if (types[i] == KRB5_PROMPT_TYPE_PASSWORD ||
-         types[i] == KRB5_PROMPT_TYPE_NEW_PASSWORD_AGAIN)
-+#endif
-     {
-       g_strncpy(prompts[i].reply->data, u_info->pass, 255);
-     }
-@@ -214,7 +214,11 @@
-   krb5_creds my_creds;
-   krb5_error_code code = 0;
-   krb5_get_init_creds_opt options;
-+#ifdef HEIMDAL
-+  krb5_addresses* addresses;
-+#else
-   krb5_address** addresses;
-+#endif
- 
-   krb5_get_init_creds_opt_init(&options);
-   g_memset(&my_creds, 0, sizeof(my_creds));
-@@ -245,7 +249,11 @@
-   if (opts->addresses)
-   {
-     addresses = NULL;
-+#ifdef HEIMDAL
-+    code = krb5_get_all_client_addrs(k5->ctx, addresses);
-+#else
-     code = krb5_os_localaddr(k5->ctx, &addresses);
-+#endif
-     if (code != 0)
-     {
-       g_printf("krb5_os_localaddr failed in k5_kinit\n");

diff --git a/xrdp.spec b/xrdp.spec
index 8f5eef24ddf391e0072ae62e787f143a0db46839..d17eb4cf2d7f5414b96d3590b127d124ae7b3b0c 100644 (file)
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -2,7 +2,7 @@ Summary:        Remote desktop server
 Summary(pl.UTF-8):     Serwer remote desktop
 Name:          xrdp
 Version:       0.6.1
-Release:       1
+Release:       1.1
 License:       GPL
 Group:         X11/Applications/Networking
 Source0:       http://download.sourceforge.net/xrdp/%{name}-v%{version}.tar.gz
@@ -15,13 +15,11 @@ Source5:    %{name}.README.TLD
 Source6:       %{name}.README.TLD.pl
 Patch0:                format-security.patch
 Patch1:                build.patch
-Patch2:                heimdal.patch
-Patch3:                link.patch
+Patch2:                link.patch
 URL:           http://xrdp.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: freerdp-devel
-BuildRequires: heimdal-devel >= 1.5.3-4
 BuildRequires: libtool
 BuildRequires: openssl-devel
 BuildRequires: pam-devel
@@ -54,11 +52,10 @@ xrdp używa jako backendu Xvnc lub X11rdp.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 install %{SOURCE5} README.TLD
 install %{SOURCE6} README.TLD.pl
-awk '{gsub("LIBDIR","%{_libdir}"); print}' < %{SOURCE3} > xrdp.ini
+awk '{gsub("LIBDIR","%{_libdir}"); print}' < %{SOURCE3} > xrdp/xrdp.ini
 
 %build
 %{__libtoolize}
@@ -66,7 +63,6 @@ awk '{gsub("LIBDIR","%{_libdir}"); print}' < %{SOURCE3} > xrdp.ini
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-export CFLAGS="%{rpmcflags} -DHEIMDAL"
 %configure \
        --enable-freerdp1
 %{__make}