Fixing implementation for the non-kerberos case, patch thanks to Volker Lendecke <vl@samba.org> bug #342377

(Portage version: 2.1.9.24/cvs/Linux i686)

5 files changed, 71 insertions, 3 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 16b48ad13c5e..eb95db1f1bc3 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.455 2010/12/22 19:36:59 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.456 2010/12/23 17:41:50 vostorga Exp $
+
+  23 Dec 2010; Víctor Ostorga <vostorga@gentoo.org> samba-3.4.9.ebuild,
+  +files/3.4/samba-3.4.9-kerberos-dummy.patch, samba-3.5.6.ebuild,
+  +files/3.5/samba-3.5.6-kerberos-dummy.patch:
+  Fixing implementation for the non-kerberos case, patch thanks to Volker
+  Lendecke <vl@samba.org> bug #342377
 
   22 Dec 2010; Víctor Ostorga <vostorga@gentoo.org> samba-3.4.9.ebuild,
   samba-3.5.6.ebuild:
diff --git a/net-fs/samba/files/3.4/samba-3.4.9-kerberos-dummy.patch b/net-fs/samba/files/3.4/samba-3.4.9-kerberos-dummy.patch
new file mode 100644
index 000000000000..fa52c589f6c7
--- /dev/null
+++ b/net-fs/samba/files/3.4/samba-3.4.9-kerberos-dummy.patch
@@ -0,0 +1,28 @@
+diff -NrU5 samba-3.4.9.original/source3/include/krb5_protos.h samba-3.4.9/source3/include/krb5_protos.h
+--- samba-3.4.9.original/source3/include/krb5_protos.h	2010-09-09 08:23:21.000000000 -0600
++++ samba-3.4.9/source3/include/krb5_protos.h	2010-12-23 08:39:02.000000000 -0600
+@@ -86,14 +86,10 @@
+ 					    const char *name,
+ 					    krb5_principal *principal);
+ bool smb_krb5_principal_compare_any_realm(krb5_context context,
+ 					  krb5_const_principal princ1,
+ 					  krb5_const_principal princ2);
+-int cli_krb5_get_ticket(const char *principal, time_t time_offset,
+-			DATA_BLOB *ticket, DATA_BLOB *session_key_krb5,
+-			uint32 extra_ap_opts, const char *ccname,
+-			time_t *tgs_expire);
+ krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *expire_time);
+ krb5_error_code kpasswd_err_to_krb5_err(krb5_error_code res_code);
+ krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr);
+ krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses *addr);
+ NTSTATUS krb5_to_nt_status(krb5_error_code kerberos_error);
+@@ -143,5 +139,9 @@
+ 				   krb5_creds **creds_p);
+ char *smb_krb5_principal_get_realm(krb5_context context,
+ 				   krb5_principal principal);
+ #endif /* HAVE_KRB5 */
+ 
++int cli_krb5_get_ticket(const char *principal, time_t time_offset,
++                        DATA_BLOB *ticket, DATA_BLOB *session_key_krb5,
++                        uint32 extra_ap_opts, const char *ccname,
++                        time_t *tgs_expire);
diff --git a/net-fs/samba/files/3.5/samba-3.5.6-kerberos-dummy.patch b/net-fs/samba/files/3.5/samba-3.5.6-kerberos-dummy.patch
new file mode 100644
index 000000000000..ef76afff7ef6
--- /dev/null
+++ b/net-fs/samba/files/3.5/samba-3.5.6-kerberos-dummy.patch
@@ -0,0 +1,30 @@
+diff -NrU5 samba-3.5.6.original/source3/include/krb5_protos.h samba-3.5.6/source3/include/krb5_protos.h
+--- samba-3.5.6.original/source3/include/krb5_protos.h	2010-10-07 10:41:16.000000000 -0600
++++ samba-3.5.6/source3/include/krb5_protos.h	2010-12-23 11:01:09.000000000 -0600
+@@ -86,15 +86,10 @@
+ 					    const char *name,
+ 					    krb5_principal *principal);
+ bool smb_krb5_principal_compare_any_realm(krb5_context context,
+ 					  krb5_const_principal princ1,
+ 					  krb5_const_principal princ2);
+-int cli_krb5_get_ticket(const char *principal, time_t time_offset,
+-			DATA_BLOB *ticket, DATA_BLOB *session_key_krb5,
+-			uint32 extra_ap_opts, const char *ccname,
+-			time_t *tgs_expire,
+-			const char *impersonate_princ_s);
+ krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *expire_time);
+ krb5_error_code kpasswd_err_to_krb5_err(krb5_error_code res_code);
+ krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr);
+ krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses *addr);
+ NTSTATUS krb5_to_nt_status(krb5_error_code kerberos_error);
+@@ -144,5 +139,10 @@
+ 				   krb5_creds **creds_p);
+ char *smb_krb5_principal_get_realm(krb5_context context,
+ 				   krb5_principal principal);
+ #endif /* HAVE_KRB5 */
+ 
++int cli_krb5_get_ticket(const char *principal, time_t time_offset,
++                        DATA_BLOB *ticket, DATA_BLOB *session_key_krb5,
++                        uint32 extra_ap_opts, const char *ccname,
++                        time_t *tgs_expire,
++                        const char *impersonate_princ_s);
diff --git a/net-fs/samba/samba-3.4.9.ebuild b/net-fs/samba/samba-3.4.9.ebuild
index ee842a21d5c1..1368ae7601eb 100644
--- a/net-fs/samba/samba-3.4.9.ebuild
+++ b/net-fs/samba/samba-3.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.9.ebuild,v 1.8 2010/12/22 19:36:59 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.9.ebuild,v 1.9 2010/12/23 17:41:50 vostorga Exp $
 
 EAPI="2"
 
@@ -110,6 +110,8 @@ src_prepare() {
 	sed -i \
 		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
 		configure || die "sed failed"
+
+	epatch "${CONFDIR}"/${P}-kerberos-dummy.patch
 }
 
 src_configure() {
diff --git a/net-fs/samba/samba-3.5.6.ebuild b/net-fs/samba/samba-3.5.6.ebuild
index cca42fdd8174..5671fe35042e 100644
--- a/net-fs/samba/samba-3.5.6.ebuild
+++ b/net-fs/samba/samba-3.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.6.ebuild,v 1.3 2010/12/22 19:36:59 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.6.ebuild,v 1.4 2010/12/23 17:41:50 vostorga Exp $
 
 EAPI="2"
 
@@ -112,6 +112,8 @@ src_prepare() {
 	sed -i \
 		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
 		configure || die "sed failed"
+
+	epatch "${CONFDIR}"/${P}-kerberos-dummy.patch
 }
 
 src_configure() {