From 8c7871ae7bead58e9e159e43fbe2d034107c9cf0 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 30 Oct 2012 10:16:17 +0100 Subject: [PATCH] Update to Samba 4.0.0rc4. --- .gitignore | 1 + ...a-4.0.0rc5-fix_winbind_offline_logon.patch | 33 +++++++++++++++++++ samba.spec | 9 +++-- sources | 2 +- 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 samba-4.0.0rc5-fix_winbind_offline_logon.patch diff --git a/.gitignore b/.gitignore index 4471443..db922a5 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ samba-3.6.0pre1.tar.gz /samba-4.0.0rc1.tar.bz2 /samba-4.0.0rc2.tar.bz2 /samba-4.0.0rc3.tar.bz2 +/samba-4.0.0rc4.tar.bz2 diff --git a/samba-4.0.0rc5-fix_winbind_offline_logon.patch b/samba-4.0.0rc5-fix_winbind_offline_logon.patch new file mode 100644 index 0000000..60e8d86 --- /dev/null +++ b/samba-4.0.0rc5-fix_winbind_offline_logon.patch @@ -0,0 +1,33 @@ +From 33cb7ed204136a4459cf71a6adc8711b0a554f7a Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Tue, 23 Oct 2012 14:07:38 +0200 +Subject: [PATCH] BUG 9321: Fix winbind offline logon support. + +We store the current time in the cache entry but we never read it in +wcache_fetch_creds(). So the first entry we try to fetch is a hash16, +which always fails cause we have a time entry first. + +The read of the time value has been removed with +21528da9cd12a4f5c3792a482a5d18fe946a6f7a. + +Signed-off-by: Andreas Schneider +--- + source3/winbindd/winbindd_cache.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c +index 2c9dd4a..1e3ab2d 100644 +--- a/source3/winbindd/winbindd_cache.c ++++ b/source3/winbindd/winbindd_cache.c +@@ -1397,8 +1397,6 @@ NTSTATUS wcache_save_creds(struct winbindd_domain *domain, + + dump_data_pw("nt_pass", nt_pass, NT_HASH_LEN); + +- centry_put_time(centry, time(NULL)); +- + /* Create a salt and then salt the hash. */ + generate_random_buffer(cred_salt, NT_HASH_LEN); + E_md5hash(cred_salt, nt_pass, salted_hash); +-- +1.7.12.3 + diff --git a/samba.spec b/samba.spec index 72b3157..ceaaa82 100644 --- a/samba.spec +++ b/samba.spec @@ -1,4 +1,4 @@ -%define main_release 162 +%define main_release 163 %define samba_version 4.0.0 %define talloc_version 2.0.7 @@ -6,7 +6,7 @@ %define tdb_version 1.2.10 %define tevent_version 0.9.17 %define ldb_version 1.1.12 -%define pre_release rc3 +%define pre_release rc4 %define samba_release %{main_release}%{?dist}.%{pre_release} @@ -67,6 +67,7 @@ Source201: README.downgrade Patch0: samba-4.0.0rc4-request_aes_krb_keys.patch Patch1: samba-4.0.0rc4-add_aes_enctypes_to_krb5_conf.patch +Patch2: samba-4.0.0rc5-fix_winbind_offline_logon.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -412,6 +413,7 @@ the local kerberos library to use the same KDC as samba and winbind use %patch0 -p1 -b .request_aes_krb_keys %patch1 -p1 -b .add_aes_enctypes_to_krb5_conf +%patch2 -p1 -b .winbind_offline_logon %build %global _talloc_lib ,talloc,pytalloc,pytalloc-util @@ -1310,6 +1312,9 @@ rm -rf %{buildroot} %{_mandir}/man7/winbind_krb5_locator.7* %changelog +* Tue Oct 30 2012 - Andreas Schneider - 2:4.0.0-163.rc4 +- Update to Samba 4.0.0rc4. + * Mon Oct 29 2012 - Andreas Schneider - 2:4.0.0-162.rc3 - resolves: #870630 - Fix scriptlets interpeting a comment as argument. diff --git a/sources b/sources index 4b53f0a..e0007de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -147cad905cb3e2fb6706566907d2481a samba-4.0.0rc3.tar.bz2 +6909008476f67de5da69e2b350bd3633 samba-4.0.0rc4.tar.bz2