Hello community,
here is the log from the commit of package samba for openSUSE:Factory
checked in at Fri Mar 5 02:13:02 CET 2010.
--------
--- samba/samba.changes 2010-02-25 02:36:50.000000000 +0100
+++ /mounts/work_src_done/STABLE/samba/samba.changes 2010-03-02 01:46:06.915143000 +0100
@@ -1,0 +2,10 @@
+Mon Mar 1 16:22:52 CET 2010 - lmuelle@suse.de
+
+- Update to 3.5.0.
+ + Fix duplicate sam and unix accounts; (bso#7145).
+ + Keep the the correct negotiate_flags on the cli->dc structure; (bso#7160).
+ + Avoid calling cli_alloc_mid twice in cli_smb_req_iov_send; (bso#7166).
+ + Fix 'net ads dns' usage calls; (bso#7181).
+ + Fix uninitialized variable in wkssvc_enumerateusers; (bso#7182).
+
+-------------------------------------------------------------------
@@ -44,0 +55,45 @@
+Fri Feb 19 16:27:03 CET 2010 - lmuelle@suse.de
+
+- Update to 3.5.0rc3.
+ + Change parameter "wide links" to default to "no"; it's also incompatible
+ with "unix extensions"; (bso#7104); (bnc#577868).
+
+ + Fix vfs_full_audit; (bso#6557).
+ + Fix crash bug in 'cifs.upcall'; (bso#6868).
+ + Fix duplicate initializer in the rmdir module; (bso#6876).
+ + Fix printing with 64 bit clients; (bso#6888).
+ + Add cross option to samba_cv_linux_getgrouplist_ok; (bso#7047).
+ + Fix core dump on Ubuntu 8.04 64 bit; (bso#7063).
+ + Fix failing of smbd to respond to a read or a write caused by Linux
+ asynchronous IO (aio); (bso#7067).
+ + Fix 'smbget' error status; (bso#7069).
+ + Fix build of 'smbfilter'; (bso#7071).
+ + Fix unlocking of accounts from ldap; (bso#7072).
+ + Cliconnect gets realm wrong with trusted domains; (bso#7079).
+ + Fix vfs_expand_msdfs; (bso#7081).
+ + Fix storing of create time on directories in an EA in new create time
+ code; (bso#7084).
+ + Fix an early release of the global lock that can cause data corruption in
+ libtdb; (bso#7085).
+ + Fix string buffer overflow causing heap corruption in smbd; (bso#7096).
+ + Fix results of 'smbclient -L' with a large browse list; (bso#7098).
+ + Normalize "Changing password for" msg IDs and STRs; (bso#7102).
+ + Fix malformed require_membership_of_sid; (bso#7106).
+ + Add pdb_ldap performance fixes; (bso#7116).
+ + Change ldap filter to what really was intended; (bso#7116).
+ + Add new "nmbd bind explicit broadcast" parameter; (bso#7118).
+ + Fix nmbd problems with socket address; (bso#7118).
+ + Support large browselist; (bso#7119).
+ + Fix reading of large browselist; (bso#7122).
+ + Fix listing of printjobs in Windows 7; (bso#7130).
+ + Owner of file not available with Kerberos; (bso#7139).
+ + Fix IPv4/IPv6 problems; (bso#7140).
+ + Fix get_acl_blob in the acl_tdb VFS module; (bso#7148).
+ + "mangling method = hash" can crash storing a name containing a '.';
+ (bso#7154).
+ + Valgrind Conditional jump or move depends on uninitialised value(s) error
+ when "mangling method = hash"; (bso#7155).
+
+ + Fix some wrong newlines in de translation strings.
+
+-------------------------------------------------------------------
@@ -88,0 +144,32 @@
+Tue Jan 26 17:12:50 CET 2010 - lmuelle@suse.de
+
+- Update to 3.5.0rc2.
+ + The Using Samba HTML book has been removed.
+ + 'net', 'smbclient' and libsmbclient can use logon credentials cached by
+ Winbind; (bso#7062).
+ + New vfs_scannedonly module has been added; (bso#7028).
+
+ + Check password history before increasing "badPasswordCount"; (bso#4347).
+ + Fix changing of ACLs on writable file with "dos filemode=yes"; (bso#5202).
+ + Restore Samba 3.0.x behavior and use the first "uid" value in pdb_ldap;
+ (bso#6157).
+ + Fix deletion of an object whose parent folder does not have delete rights
+ fails even if the delete right is set on the object in vfs_acl_xattr and
+ vfs_acl_tdb; (bso#6876).
+ + Fix large paged search with DirX LDAP servers; (bso#6981).
+ + Fix a segfault in winbindd_dual_ccache_ntlm_auth(); (bso#7027).
+ + Disable sanity check in NetShareEnum for better compatibility with
+ Windows; (bso#7029).
+ + Fix SMBrmdir error message when deleting a directory fails; (bso#7033).
+ + Fix segfault in vfs_cap; (bso#7034).
+ + Fix 'net rpc getsid' in hardened Windows environments; (bso#7036).
+ + Fix a Winbind segfault in "trusted_domains"; (bso#7037).
+ + Complete and improve some German translation of 'net'; (bso#7039).
+ + Fix compile error with WITH_DNS_UPDATE. Update .po files; (bso#7039).
+ + Fix crash bug in libsmbclient; (bso#7043).
+ + Fix bad (non memory copying) interfaces in smbc_setXXXX calls; (bso#7045).
+ + Fix libsmbclient crash against OpenSolaris CIFS server; (bso#7046).
+
+ + Lock down some srvsvc calls according to what w2k3 seems to do.
+
+-------------------------------------------------------------------
@@ -111,32 +198 @@
-Thu Jan 7 11:21:35 UTC 2010 - lmuelle@suse.de
-
-- Update to 3.4.4.
- + Fix interdomain trust relationships with Win2008R2 (bug #6697).
- + Fix Winbind crashes when queried from nss (bug #6889).
- + Fix Winbind crash when retrieving empty group members (bug #7014).
- + Fix "UID range full" error in Winbind (bug #6901).
- + Fix multiple LDAP servers in "idmap backend" and "idmap alloc
- backend" (bug #6910).
-
- + BUG 4832: Fix iconv checks.
- + BUG 6338: Do not always display "none" in 'net rpc trustdom list'.
- + BUG 6851: Add pdbedit --kickoff-time/-K to set the user's kickoff time.
- + BUG 6828: Fix infinite timeout when byte lock held outside of samba.
- + BUG 6837: Fix "Too many open files" message when trying to access a large
- number of files with Windows 7.
- + BUG 6841: Fix "map acl inherit = yes".
- + BUG 6850: Fix shadow copy display on Windows 7.
- + BUG 6867: Fix listing of directories with a lot of files.
- + BUG 6868: Support building with Heimdal we well as with MIT.
- + BUG 6875: Fix DOS attributes on OS/2 clients.
- + BUG 6880: Fix listing of workgroup servers in libsmbclient.
- + BUG 6898: Samba duplicates file content on appending.
- + BUG 6918: Fix krb5 build problem on Ubuntu karmic.
- + BUG 6929: Fix build with recent heimdal.
- + BUG 6939: Fix long filenames with "mangling method = hash".
- + BUG 6967: Fix 'net ads join' with OU.
- + BUG 6981: Fix paged search with DirX LDAP server.
- + BUG 6982: Remove erroneous out of memory error path in lookup_sid.
- + BUG 6997: Fix _samr_GetAliasMembership for results with 0 rids.
- + BUG 7005: Fix "mangle method = hash" truncates files with dot "."
- character.
+Thu Jan 7 12:14:19 UTC 2010 - lmuelle@suse.de
@@ -144,2 +200,45 @@
- + Fix the build of the winbind krb5 locator plugin.
- + Fix enumprinter key client and server.
+- Update to 3.5.0rc1.
+ + BUG 6837: Fix "Too many open files" when trying to access large number of
+ files with Windows 7.
+ + BUG 6939: Fix long filenames when "mangling method" is set to "hash".
+ + BUG 6991: Create symbol links to shared libraries.
+ + BUG 6992: make test for getgrouplist cacheable.
+ + BUG 7014: Fix Winbind crash when retrieving empty group members.
+ + BUG 7020: Fix smbd using 2G memory.
+
+ + Ensure dos_mode can return FILE_ATTRIBUTE_NORMAL, then filter the returned
+ attributes by protocol level.
+ + Vector correctly through reply_openerror() (which uses the same logic).
+ + Fix bugs with the full Windows ACL support.
+ + Add a few missing gettext calls to the 'net' command.
+ + Fix up a share type translation and translate some more strings in 'net'.
+ + Allow to call "pdbedit -N description -u user" without specifiyng "-r".
+ + Add spoolss_DriverInfo7.
+ + Fix rpcclient after setprinter IDL fixes.
+ + Use generated krb5.conf in 'net ads testjoin'.
+ + Add some German translations for the 'net' command.
+ + Update mount.cifs man page with nounix option.
+ + Fix _samr_GetAliasMembership for results with 0 rids.
+ + Fix an error case in cli_negprot.
+ + Add a lower-cost alternative to wbinfo -t: wbinfo --ping-dc.
+ + Restore correct timeouts for SMB requests.
+ + Fix a 64-bit error in libsmb.
+ + Replace IS_DOMAIN_OFFLINE by a function in Winbind.
+ + Simplify/cleanup Winbind code.
+ + Fix write behind memory block in libtalloc.
+ + Fix result check for getaddrinfo().
+ + Add tsocket_address_bsd_sockaddr() and tsocket_address_bsd_from_sockaddr()
+ to tsocket.
+ + Always set tdb->tracefd to -1 to be safe on goto fail in libtdb.
+ + Add TDB_DISALLOW_NESTING and make TDB_ALLOW_NESTING the default behavior.
+ + Fix standalone 'make installdocs'.
+ + Output %p as unsigned in snprintf replacement.
+ + New attempt at TDB transaction nesting allow/disallow.
+ + Remove swig stuff from libtdb.
+ + Reset tdb->fd to -1 in tdb_close() in libtdb.
+ + Change the way mksysms work in libtalloc.
+ + Also build and install tdb manpages from standalone tdb.
+ + Fix infinite loop in NCACN_IP_TCP as there is no timeout.
+ + Make winbindd_cache.c aware of domain offline to avoid unnecessary backend
+ query.
+ + List trusted domains from wcache when domain is offline.
@@ -173,0 +273,46 @@
+Tue Dec 15 16:47:48 UTC 2009 - lmuelle@suse.de
+
+- Update to 3.5.0pre2.
+ + BUG 2350: Add LDAP Alias Dereferencing support.
+ + BUG 6288: SWAT adds a second share when changing parameters of an existing
+ share.
+ + BUG 6435: Fix minor memory corruption.
+ + BUG 6710: Only install the cifs.upcall man page if CIFSUPCALL_PROGS was
+ set while configure.
+ + BUG 6802: A created folder does not properly inherit permissions from
+ parent in vfs_acl_xattr.
+ + BUG 6837: "Too many open files" when trying to access large number of
+ files from Windows 7.
+ + BUG 6860: Fix shared library build on QNX.
+ + BUG 6879: Fix crash in Winbind.
+ + BUG 6929: Fix build with recent heimdal.
+ + BUG 6938 : No hook exists to check creation rights when using acl_xattr
+ module.
+ + BUG 6967: Prevent glibc error on 'net ads join'.
+
+ + Fix vfs_acl_xattr which was failing to call the NEXT connect function.
+ + Restructure the ACL code.
+ + Refactor reply_rmdir to use handle based code.
+ + Fix the build when no external talloc and tdb are installed.
+ + Fix detection of CTDB headers on systems without system-libtalloc.
++++ 33 more lines (skipped)
++++ between samba/samba.changes
++++ and /mounts/work_src_done/STABLE/samba/samba.changes
calling whatdependson for head-i586
Old:
----
samba-3.4.6.tar.bz2
New:
----
samba-3.5.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba-doc.spec ++++++
--- /var/tmp/diff_new_pack.1vX8lY/_old 2010-03-05 02:12:30.000000000 +0100
+++ /var/tmp/diff_new_pack.1vX8lY/_new 2010-03-05 02:12:30.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package samba-doc (Version 3.4.6)
+# spec file for package samba-doc (Version 3.5.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -55,14 +55,14 @@
%else
BuildRequires: pkgconfig
%endif
-%define samba_ver 3.4.6
+%define samba_ver 3.5.0
%define samba_ver_suffix %nil
%define samba_ver_full %{samba_ver}%{samba_ver_suffix}
%if 0%{?suse_version} && 0%{?suse_version} < 1111
%define guards_symbols pre_1111
%endif
Url: http://www.samba.org/
-Version: 3.4.6
+Version: 3.5.0
Release: 1
License: GPLv3+
Summary: Samba Documentation
@@ -244,6 +244,7 @@
%if %{make_cifsupcall}
--with-cifsupcall \
%endif
+ --with-cifsumount \
%if %{make_devel}
--enable-developer \
--enable-krb5developer \
@@ -277,8 +278,6 @@
DESTDIR=${RPM_BUILD_ROOT} \
CONFIGDIR=%{CONFIGDIR}
rm -f ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/tevent.pc
-ln -s libtevent.so.0.9.8 ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.so.0
-ln -s libtevent.so.0.9.8 ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.so
%if %{link_static_libs} == 0
rm ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.a
%endif
@@ -317,15 +316,13 @@
%__install -m 0644 source3/pam_smbpass/INSTALL examples/pam_smbpass/INSTALL
%__install -m 0644 source3/pam_smbpass/README examples/pam_smbpass/README
%__install -m 0644 source3/pam_smbpass/TODO examples/pam_smbpass/TODO
-mv COPYING Manifest README Read-Manifest-Now Roadmap WHATSNEW.txt ${RPM_BUILD_ROOT}/%{DOCDIR}/
+mv COPYING Manifest README Roadmap WHATSNEW.txt ${RPM_BUILD_ROOT}/%{DOCDIR}/
# this is empty
rm -rf docs/yodldocs
rm -rf docs/manpages
cp -a docs/* ${RPM_BUILD_ROOT}/%{DOCDIR}
rm -rf "${RPM_BUILD_ROOT}/%{DOCBOOKDIR}"
cp -a examples/ ${RPM_BUILD_ROOT}/%{DOCDIR}
-rm -rf "${RPM_BUILD_ROOT}/%{SWATDIR}/using_samba"
-ln -s "%{DOCDIR}/htmldocs/using_samba" "${RPM_BUILD_ROOT}/%{SWATDIR}"
test -e "${RPM_BUILD_ROOT}/%{SWATDIR}/help/manpages" || \
ln -s "%{DOCDIR}/htmldocs/manpages" "${RPM_BUILD_ROOT}/%{SWATDIR}/help"
# Install HTML pages only in the samba-doc package
@@ -385,7 +382,6 @@
%dir %{_datadir}/samba
%dir %{SWATDIR}
%dir %{SWATDIR}/help
-%{SWATDIR}/using_samba
%doc %{_datadir}/susehelp
%description
@@ -398,16 +394,13 @@
--------
The Samba Team
-Source Timestamp: 2314
-Branch : 3.4.6
+Source Timestamp: 2315
+Branch : trunk
-Source Timestamp: 2314
-Branch : 3.4.6
+Source Timestamp: 2315
+Branch : trunk
-Source Timestamp: 2314
-Branch : 3.4.6
-
-Source Timestamp: 2314
-Branch : 3.4.6
+Source Timestamp: 2315
+Branch : trunk
%changelog
++++++ samba.spec ++++++
++++ 767 lines (skipped)
++++ between samba/samba.spec
++++ and /mounts/work_src_done/STABLE/samba/samba.spec
++++++ build-source-timestamp ++++++
--- /var/tmp/diff_new_pack.1vX8lY/_old 2010-03-05 02:12:31.000000000 +0100
+++ /var/tmp/diff_new_pack.1vX8lY/_new 2010-03-05 02:12:31.000000000 +0100
@@ -1,2 +1,2 @@
-2314
-Branch : 3.4.6
+2315
+Branch : trunk
++++++ patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/2300ec3006098536c1a615820b4774d625f82c05 new/patches/samba.org/2300ec3006098536c1a615820b4774d625f82c05
--- old/patches/samba.org/2300ec3006098536c1a615820b4774d625f82c05 2010-02-24 14:38:39.000000000 +0100
+++ new/patches/samba.org/2300ec3006098536c1a615820b4774d625f82c05 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-From 2300ec3006098536c1a615820b4774d625f82c05 Mon Sep 17 00:00:00 2001
-From: Bo Yang
-Date: Fri, 6 Nov 2009 08:20:25 +0800
-Subject: [PATCH] s3: Fix kerberos refresh chain.
-
-Signed-off-by: Bo Yang
-(cherry picked from commit dde1c420037bfea48741ba1f600c047cca788a21)
----
- source3/winbindd/winbindd_pam.c | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-Index: source3/winbindd/winbindd_pam.c
-===================================================================
---- source3/winbindd/winbindd_pam.c.orig
-+++ source3/winbindd/winbindd_pam.c
-@@ -1001,7 +1001,9 @@ NTSTATUS winbindd_dual_pam_auth_cached(s
- #ifdef HAVE_KRB5
- if ((state->request.flags & WBFLAG_PAM_KRB5) &&
- ((tdc_domain = wcache_tdc_fetch_domain(state->mem_ctx, name_domain)) != NULL) &&
-- (tdc_domain->trust_type & NETR_TRUST_TYPE_UPLEVEL)) {
-+ ((tdc_domain->trust_type & NETR_TRUST_TYPE_UPLEVEL) ||
-+ /* used to cope with the case winbindd starting without network. */
-+ !strequal(tdc_domain->domain_name, tdc_domain->dns_name))) {
-
- uid_t uid = -1;
- const char *cc = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/2d063d077aed01f020352e859b766415fe094fa5 new/patches/samba.org/2d063d077aed01f020352e859b766415fe094fa5
--- old/patches/samba.org/2d063d077aed01f020352e859b766415fe094fa5 2010-02-24 14:42:09.000000000 +0100
+++ new/patches/samba.org/2d063d077aed01f020352e859b766415fe094fa5 1970-01-01 01:00:00.000000000 +0100
@@ -1,219 +0,0 @@
-commit 2d063d077aed01f020352e859b766415fe094fa5
-Author: Bo Yang
-Date: Thu Dec 10 14:30:13 2009 +0800
-
- s3: Give the user a chance to change password when password will expire soon.
-
- Signed-off-by: Bo Yang
- (cherry picked from commit f7723293a07d1b7a4f3476939590fa8db6080d06)
-
-Index: nsswitch/pam_winbind.c
-===================================================================
---- nsswitch/pam_winbind.c.orig
-+++ nsswitch/pam_winbind.c
-@@ -803,6 +803,37 @@ static int wbc_auth_error_to_pam_error(s
- return pam_winbind_request_log(ctx, ret, username, fn);
- }
-
-+static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
-+{
-+ struct pam_message msg, *pmsg;
-+ struct pam_response *resp = NULL;
-+ const char *prompt;
-+ int ret;
-+ bool retval = false;
-+ prompt = _("Do you want to change your password now?");
-+ pmsg = &msg;
-+ msg.msg_style = PAM_RADIO_TYPE;
-+ msg.msg = prompt;
-+ ret = converse(ctx->pamh, 1, &pmsg, &resp);
-+ if (resp == NULL) {
-+ if (ret == PAM_SUCCESS) {
-+ _pam_log(ctx, LOG_CRIT, "pam_winbind: system error!\n");
-+ return false;
-+ }
-+ }
-+ if (ret != PAM_SUCCESS) {
-+ return false;
-+ }
-+ _pam_log(ctx, LOG_CRIT, "Received [%s] reply from application.\n", resp->resp);
-+
-+ if (strcasecmp(resp->resp, "yes") == 0) {
-+ retval = true;
-+ }
-+
-+ _pam_drop_reply(resp, 1);
-+ return retval;
-+}
-+
-
- /**
- * send a password expiry message if required
-@@ -819,15 +850,22 @@ static bool _pam_send_password_expiry_me
- time_t next_change,
- time_t now,
- int warn_pwd_expire,
-- bool *already_expired)
-+ bool *already_expired,
-+ bool *change_pwd)
- {
- int days = 0;
- struct tm tm_now, tm_next_change;
-+ bool retval = false;
-+ int ret;
-
- if (already_expired) {
- *already_expired = false;
- }
-
-+ if (change_pwd) {
-+ *change_pwd = false;
-+ }
-+
- if (next_change <= now) {
- PAM_WB_REMARK_DIRECT(ctx, "NT_STATUS_PASSWORD_EXPIRED");
- if (already_expired) {
-@@ -850,15 +888,61 @@ static bool _pam_send_password_expiry_me
- (tm_now.tm_yday+tm_now.tm_year*365);
-
- if (days == 0) {
-- _make_remark(ctx, PAM_TEXT_INFO,
-- _("Your password expires today"));
-+ ret = _make_remark(ctx, PAM_TEXT_INFO,
-+ _("Your password expires today.\n"));
-+
-+ /*
-+ * If change_pwd and already_expired is null.
-+ * We are just sending a notification message.
-+ * We don't expect any response in this case.
-+ */
-+
-+ if (!change_pwd && !already_expired) {
-+ return true;
-+ }
-+
-+ /*
-+ * successfully sent the warning message.
-+ * Give the user a chance to change pwd.
-+ */
-+ if (ret == PAM_SUCCESS) {
-+ if (change_pwd) {
-+ retval = _pam_winbind_change_pwd(ctx);
-+ if (retval) {
-+ *change_pwd = true;
-+ }
-+ }
-+ }
- return true;
- }
-
- if (days > 0 && days < warn_pwd_expire) {
-- _make_remark_format(ctx, PAM_TEXT_INFO,
-- _("Your password will expire in %d %s"),
-- days, (days > 1) ? _("days"):_("day"));
-+
-+ ret = _make_remark_format(ctx, PAM_TEXT_INFO,
-+ _("Your password will expire in %d %s.\n"),
-+ days, (days > 1) ? _("days"):_("day"));
-+ /*
-+ * If change_pwd and already_expired is null.
-+ * We are just sending a notification message.
-+ * We don't expect any response in this case.
-+ */
-+
-+ if (!change_pwd && !already_expired) {
-+ return true;
-+ }
-+
-+ /*
-+ * successfully sent the warning message.
-+ * Give the user a chance to change pwd.
-+ */
-+ if (ret == PAM_SUCCESS) {
-+ if (change_pwd) {
-+ retval = _pam_winbind_change_pwd(ctx);
-+ if (retval) {
-+ *change_pwd = true;
-+ }
-+ }
-+ }
- return true;
- }
-
-@@ -879,7 +963,8 @@ static void _pam_warn_password_expiry(st
- const struct wbcAuthUserInfo *info,
- const struct wbcUserPasswordPolicyInfo *policy,
- int warn_pwd_expire,
-- bool *already_expired)
-+ bool *already_expired,
-+ bool *change_pwd)
- {
- time_t now = time(NULL);
- time_t next_change = 0;
-@@ -892,6 +977,10 @@ static void _pam_warn_password_expiry(st
- *already_expired = false;
- }
-
-+ if (change_pwd) {
-+ *change_pwd = false;
-+ }
-+
- /* accounts with WBC_ACB_PWNOEXP set never receive a warning */
- if (info->acct_flags & WBC_ACB_PWNOEXP) {
- return;
-@@ -907,7 +996,8 @@ static void _pam_warn_password_expiry(st
-
- if (_pam_send_password_expiry_message(ctx, next_change, now,
- warn_pwd_expire,
-- already_expired)) {
-+ already_expired,
-+ change_pwd)) {
- return;
- }
-
-@@ -923,7 +1013,8 @@ static void _pam_warn_password_expiry(st
-
- if (_pam_send_password_expiry_message(ctx, next_change, now,
- warn_pwd_expire,
-- already_expired)) {
-+ already_expired,
-+ change_pwd)) {
- return;
- }
-
-@@ -1752,11 +1843,13 @@ static int winbind_auth_request(struct p
- if ((ret == PAM_SUCCESS) && user_info && policy && info) {
-
- bool already_expired = false;
-+ bool change_pwd = false;
-
- /* warn a user if the password is about to expire soon */
- _pam_warn_password_expiry(ctx, user_info, policy,
- warn_pwd_expire,
-- &already_expired);
-+ &already_expired,
-+ &change_pwd);
-
- if (already_expired == true) {
-
-@@ -1775,6 +1868,11 @@ static int winbind_auth_request(struct p
- return PAM_AUTHTOK_EXPIRED;
- }
-
-+ if (change_pwd) {
-+ ret = PAM_NEW_AUTHTOK_REQD;
-+ goto done;
-+ }
-+
- /* inform about logon type */
- _pam_warn_logon_type(ctx, user, user_info->user_flags);
-
-@@ -3132,7 +3230,7 @@ int pam_sm_chauthtok(pam_handle_t * pamh
- * expire soon */
- _pam_warn_password_expiry(ctx, user_info, policy,
- warn_pwd_expire,
-- NULL);
-+ NULL, NULL);
-
- /* set some info3 info for other modules in the
- * stack */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/3ae5dac462c4ed0fb2cd94553583c56fce2f9d80 new/patches/samba.org/3ae5dac462c4ed0fb2cd94553583c56fce2f9d80
--- old/patches/samba.org/3ae5dac462c4ed0fb2cd94553583c56fce2f9d80 2010-02-24 14:38:39.000000000 +0100
+++ new/patches/samba.org/3ae5dac462c4ed0fb2cd94553583c56fce2f9d80 2010-02-09 22:20:37.000000000 +0100
@@ -14,10 +14,10 @@
Signed-off-by: Jeff Layton
-Index: source3/client/mount.cifs.c
+Index: client/mount.cifs.c
===================================================================
---- source3/client/mount.cifs.c.orig
-+++ source3/client/mount.cifs.c
+--- client/mount.cifs.c.orig
++++ client/mount.cifs.c
@@ -179,7 +179,7 @@ check_mountpoint(const char *progname, c
struct stat statbuf;
@@ -27,7 +27,7 @@
if (err) {
fprintf(stderr, "%s: failed to stat %s: %s\n", progname,
mountpoint, strerror(errno));
-@@ -1383,6 +1383,14 @@ int main(int argc, char ** argv)
+@@ -1378,6 +1378,14 @@ int main(int argc, char ** argv)
}
/* make sure mountpoint is legit */
@@ -42,7 +42,7 @@
rc = check_mountpoint(thisprogram, mountpoint);
if (rc)
goto mount_exit;
-@@ -1445,13 +1453,23 @@ int main(int argc, char ** argv)
+@@ -1440,13 +1448,23 @@ int main(int argc, char ** argv)
/* BB save off path and pop after mount returns? */
resolved_path = (char *)malloc(PATH_MAX+1);
@@ -72,7 +72,7 @@
if(got_user == 0) {
/* Note that the password will not be retrieved from the
USER env variable (ie user%password form) as there is
-@@ -1585,7 +1603,7 @@ mount_retry:
+@@ -1590,7 +1608,7 @@ mount_retry:
if (verboseflag)
fprintf(stderr, "\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66 new/patches/samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66
--- old/patches/samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66 2010-02-24 14:42:31.000000000 +0100
+++ new/patches/samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66 1970-01-01 01:00:00.000000000 +0100
@@ -1,75 +0,0 @@
-commit 3d72c96d125a9dd048cc9c358b01aa354a5afa66
-Author: Bo Yang
-Date: Thu Dec 10 19:29:24 2009 +0800
-
- s3: check for PAM_RADIO_TYPE.
-
- Signed-off-by: Bo Yang
- (cherry picked from commit c7e3a2dc319cc6504356be7fa7970917404a69b5)
-
-Index: nsswitch/pam_winbind.c
-===================================================================
---- nsswitch/pam_winbind.c.orig
-+++ nsswitch/pam_winbind.c
-@@ -803,8 +803,7 @@ static int wbc_auth_error_to_pam_error(s
- return pam_winbind_request_log(ctx, ret, username, fn);
- }
-
--/* PAM_RADIO_TYPE is linux-only. */
--#ifdef LINUX
-+#if defined(HAVE_PAM_RADIO_TYPE)
- static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
- {
- struct pam_message msg, *pmsg;
-@@ -842,7 +841,6 @@ static bool _pam_winbind_change_pwd(stru
- }
- #endif
-
--
- /**
- * send a password expiry message if required
- *
-Index: source3/configure.in
-===================================================================
---- source3/configure.in.orig
-+++ source3/configure.in
-@@ -4210,6 +4210,39 @@ if test x"${try_pam}" != x"no";then
- fi # try_pam != no
-
- #################################################
-+# check for PAM_RADIO_TYPE
-+AC_TRY_COMPILE([
-+#if (!defined(LINUX))
-+
-+#define PAM_EXTERN extern
-+#if defined(HAVE_SECURITY_PAM_APPL_H)
-+#include
-+#elif defined(HAVE_PAM_PAM_APPL_H)
-+#include
-+#endif
-+
-+#endif
-+
-+#if defined(HAVE_SECURITY_PAM_MODULES_H)
-+#include
-+#elif defined(HAVE_PAM_PAM_MODULES_H)
-+#include
-+#endif
-+
-+#if defined(HAVE_SECURITY__PAM_MACROS_H)
-+#include
-+#elif defined(HAVE_PAM__PAM_MACROS_H)
-+#include
-+#endif
-+
-+#ifdef HAVE_SECURITY_PAM_EXT_H
-+#include
-+#endif
-+],
-+[int i; i = PAM_RADIO_TYPE; ],
-+AC_DEFINE(HAVE_PAM_RADIO_TYPE, 1, [Define to 1 if PAM_RADIO_TYPE is available]),[])
-+
-+#################################################
- # check for pam_smbpass support
- PAM_MODULES=""
- INSTALL_PAM_MODULES=""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/a065c177dfc8f968775593ba00dffafeebb2e054 new/patches/samba.org/a065c177dfc8f968775593ba00dffafeebb2e054
--- old/patches/samba.org/a065c177dfc8f968775593ba00dffafeebb2e054 2010-02-24 14:38:39.000000000 +0100
+++ new/patches/samba.org/a065c177dfc8f968775593ba00dffafeebb2e054 2010-02-09 22:25:24.000000000 +0100
@@ -14,11 +14,11 @@
Signed-off-by: Jeff Layton
-Index: source3/client/mount.cifs.c
+Index: client/mount.cifs.c
===================================================================
---- source3/client/mount.cifs.c.orig
-+++ source3/client/mount.cifs.c
-@@ -1160,6 +1160,36 @@ static void print_cifs_mount_version(voi
+--- client/mount.cifs.c.orig
++++ client/mount.cifs.c
+@@ -1165,6 +1165,36 @@ static void print_cifs_mount_version(voi
MOUNT_CIFS_VENDOR_SUFFIX);
}
@@ -55,7 +55,7 @@
int main(int argc, char ** argv)
{
int c;
-@@ -1603,6 +1633,10 @@ mount_retry:
+@@ -1608,6 +1638,10 @@ mount_retry:
if (verboseflag)
fprintf(stderr, "\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/a0c31ec1c8d1220a5884e40d9ba6b191a04a24d5 new/patches/samba.org/a0c31ec1c8d1220a5884e40d9ba6b191a04a24d5
--- old/patches/samba.org/a0c31ec1c8d1220a5884e40d9ba6b191a04a24d5 2010-02-24 14:38:39.000000000 +0100
+++ new/patches/samba.org/a0c31ec1c8d1220a5884e40d9ba6b191a04a24d5 2010-02-09 22:27:11.000000000 +0100
@@ -19,10 +19,10 @@
Signed-off-by: Jeff Layton
-Index: source3/client/mount.cifs.c
+Index: client/mount.cifs.c
===================================================================
---- source3/client/mount.cifs.c.orig
-+++ source3/client/mount.cifs.c
+--- client/mount.cifs.c.orig
++++ client/mount.cifs.c
@@ -43,7 +43,7 @@
#include "mount.h"
@@ -80,7 +80,7 @@
#if CIFS_LEGACY_SETUID_CHECK
static int
check_fstab(const char *progname, char *mountpoint, char *devname,
-@@ -1222,6 +1256,9 @@ int main(int argc, char ** argv)
+@@ -1227,6 +1261,9 @@ int main(int argc, char ** argv)
struct sockaddr_in6 *addr6;
FILE * pmntfile;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/cc7b62269e4a90859dd93b8d6896390857ba17d7 new/patches/samba.org/cc7b62269e4a90859dd93b8d6896390857ba17d7
--- old/patches/samba.org/cc7b62269e4a90859dd93b8d6896390857ba17d7 2010-02-24 14:38:39.000000000 +0100
+++ new/patches/samba.org/cc7b62269e4a90859dd93b8d6896390857ba17d7 1970-01-01 01:00:00.000000000 +0100
@@ -1,336 +0,0 @@
-commit cc7b62269e4a90859dd93b8d6896390857ba17d7
-Author: Jeff Layton
-Date: Sat Jun 6 19:46:24 2009 -0400
-
- mount.cifs: properly check for mount being in fstab when running setuid root (try#3)
-
- This is the third attempt to clean up the checks when a setuid
- mount.cifs is run by an unprivileged user. The main difference in this
- patch from the last one is that it fixes a bug where the mount might
- have failed if unnecessarily if CIFS_LEGACY_SETUID_CHECK was set.
-
- When mount.cifs is installed setuid root and run as an unprivileged
- user, it does some checks to limit how the mount is used. It checks that
- the mountpoint is owned by the user doing the mount.
-
- These checks however do not match those that /bin/mount does when it is
- called by an unprivileged user. When /bin/mount is called by an
- unprivileged user to do a mount, it checks that the mount in question is
- in /etc/fstab, that it has the "user" option set, etc.
-
- This means that it's currently not possible to set up user mounts the
- standard way (by the admin, in /etc/fstab) and simultaneously protect
- from an unprivileged user calling mount.cifs directly to mount a share
- on any directory that that user owns.
-
- Fix this by making the checks in mount.cifs match those of /bin/mount
- itself. This is a necessary step to make mount.cifs safe to be installed
- as a setuid binary, but not sufficient. For that, we'd need to give
- mount.cifs a proper security audit.
-
- Since some users may be depending on the legacy behavior, this patch
- also adds the ability to build mount.cifs with the older behavior.
-
- Signed-off-by: Jeff Layton
-
-Index: source3/client/mount.cifs.c
-===================================================================
---- source3/client/mount.cifs.c.orig
-+++ source3/client/mount.cifs.c
-@@ -39,10 +39,11 @@
- #include
- #include
- #include
-+#include
- #include "mount.h"
-
- #define MOUNT_CIFS_VERSION_MAJOR "1"
--#define MOUNT_CIFS_VERSION_MINOR "12"
-+#define MOUNT_CIFS_VERSION_MINOR "13"
-
- #ifndef MOUNT_CIFS_VENDOR_SUFFIX
- #ifdef _SAMBA_BUILD_
-@@ -69,6 +70,10 @@
- #define MS_BIND 4096
- #endif
-
-+/* private flags - clear these before passing to kernel */
-+#define MS_USERS 0x40000000
-+#define MS_USER 0x80000000
-+
- #define MAX_UNC_LEN 1024
-
- #define CONST_DISCARD(type, ptr) ((type) ((void *) (ptr)))
-@@ -83,6 +88,27 @@
- /* currently maximum length of IPv6 address string */
- #define MAX_ADDRESS_LEN INET6_ADDRSTRLEN
-
-+/*
-+ * By default, mount.cifs follows the conventions set forth by /bin/mount
-+ * for user mounts. That is, it requires that the mount be listed in
-+ * /etc/fstab with the "user" option when run as an unprivileged user and
-+ * mount.cifs is setuid root.
-+ *
-+ * Older versions of mount.cifs however were "looser" in this regard. When
-+ * made setuid root, a user could run mount.cifs directly and mount any share
-+ * on a directory owned by that user.
-+ *
-+ * The legacy behavior is now disabled by default. To reenable it, set the
-+ * following #define to true.
-+ */
-+#define CIFS_LEGACY_SETUID_CHECK 0
-+
-+/*
-+ * When an unprivileged user runs a setuid mount.cifs, we set certain mount
-+ * flags by default. These defaults can be changed here.
-+ */
-+#define CIFS_SETUID_FLAGS (MS_NOSUID|MS_NODEV)
-+
- const char *thisprogram;
- int verboseflag = 0;
- int fakemnt = 0;
-@@ -142,6 +168,99 @@ static size_t strlcat(char *d, const cha
- }
- #endif
-
-+/*
-+ * If an unprivileged user is doing the mounting then we need to ensure
-+ * that the entry is in /etc/fstab.
-+ */
-+static int
-+check_mountpoint(const char *progname, char *mountpoint)
-+{
-+ int err;
-+ struct stat statbuf;
-+
-+ /* does mountpoint exist and is it a directory? */
-+ err = stat(mountpoint, &statbuf);
-+ if (err) {
-+ fprintf(stderr, "%s: failed to stat %s: %s\n", progname,
-+ mountpoint, strerror(errno));
-+ return EX_USAGE;
-+ }
-+
-+ if (!S_ISDIR(statbuf.st_mode)) {
-+ fprintf(stderr, "%s: %s is not a directory!", progname,
-+ mountpoint);
-+ return EX_USAGE;
-+ }
-+
-+#if CIFS_LEGACY_SETUID_CHECK
-+ /* do extra checks on mountpoint for legacy setuid behavior */
-+ if (!getuid() || geteuid())
-+ return 0;
-+
-+ if (statbuf.st_uid != getuid()) {
-+ fprintf(stderr, "%s: %s is not owned by user\n", progname,
-+ mountpoint);
-+ return EX_USAGE;
-+ }
-+
-+ if ((statbuf.st_mode & S_IRWXU) != S_IRWXU) {
-+ fprintf(stderr, "%s: invalid permissions on %s\n", progname,
-+ mountpoint);
-+ return EX_USAGE;
-+ }
-+#endif /* CIFS_LEGACY_SETUID_CHECK */
-+
-+ return 0;
-+}
-+
-+#if CIFS_LEGACY_SETUID_CHECK
-+static int
-+check_fstab(const char *progname, char *mountpoint, char *devname,
-+ char **options)
-+{
-+ return 0;
-+}
-+#else /* CIFS_LEGACY_SETUID_CHECK */
-+static int
-+check_fstab(const char *progname, char *mountpoint, char *devname,
-+ char **options)
-+{
-+ FILE *fstab;
-+ struct mntent *mnt;
-+
-+ /* make sure this mount is listed in /etc/fstab */
-+ fstab = setmntent(_PATH_FSTAB, "r");
-+ if (!fstab) {
-+ fprintf(stderr, "Couldn't open %s for reading!\n",
-+ _PATH_FSTAB);
-+ return EX_FILEIO;
-+ }
-+
-+ while((mnt = getmntent(fstab))) {
-+ if (!strcmp(mountpoint, mnt->mnt_dir))
-+ break;
-+ }
-+ endmntent(fstab);
-+
-+ if (mnt == NULL || strcmp(mnt->mnt_fsname, devname)) {
-+ fprintf(stderr, "%s: permission denied: no match for "
-+ "%s found in %s\n", progname, mountpoint,
-+ _PATH_FSTAB);
-+ return EX_USAGE;
-+ }
-+
-+ /*
-+ * 'mount' munges the options from fstab before passing them
-+ * to us. It is non-trivial to test that we have the correct
-+ * set of options. We don't want to trust what the user
-+ * gave us, so just take whatever is in /etc/fstab.
-+ */
-+ free(*options);
-+ *options = strdup(mnt->mnt_opts);
-+ return 0;
-+}
-+#endif /* CIFS_LEGACY_SETUID_CHECK */
-+
- /* BB finish BB
-
- cifs_umount
-@@ -373,7 +492,7 @@ static int get_password_from_file(int fi
- return rc;
- }
-
--static int parse_options(char ** optionsp, int * filesys_flags)
-+static int parse_options(char ** optionsp, unsigned long * filesys_flags)
- {
- const char * data;
- char * percent_char = NULL;
-@@ -423,6 +542,7 @@ static int parse_options(char ** options
-
- if (strncmp(data, "users",5) == 0) {
- if(!value || !*value) {
-+ *filesys_flags |= MS_USERS;
- goto nocopy;
- }
- } else if (strncmp(data, "user_xattr",10) == 0) {
-@@ -431,10 +551,7 @@ static int parse_options(char ** options
-
- if (!value || !*value) {
- if(data[4] == '\0') {
-- if(verboseflag)
-- printf("\nskipping empty user mount parameter\n");
-- /* remove the parm since it would otherwise be confusing
-- to the kernel code which would think it was a real username */
-+ *filesys_flags |= MS_USER;
- goto nocopy;
- } else {
- printf("username specified with no parameter\n");
-@@ -1046,7 +1163,7 @@ static void print_cifs_mount_version(voi
- int main(int argc, char ** argv)
- {
- int c;
-- int flags = MS_MANDLOCK; /* no need to set legacy MS_MGC_VAL */
-+ unsigned long flags = MS_MANDLOCK;
- char * orgoptions = NULL;
- char * share_name = NULL;
- const char * ipaddr = NULL;
-@@ -1069,7 +1186,6 @@ int main(int argc, char ** argv)
- size_t current_len;
- int retry = 0; /* set when we have to retry mount with uppercase */
- struct addrinfo *addrhead = NULL, *addr;
-- struct stat statbuf;
- struct utsname sysinfo;
- struct mntent mountent;
- struct sockaddr_in *addr4;
-@@ -1127,8 +1243,8 @@ int main(int argc, char ** argv)
- exit(EX_USAGE);
- }
-
-- /* add sharename in opts string as unc= parm */
-
-+ /* add sharename in opts string as unc= parm */
- while ((c = getopt_long (argc, argv, "afFhilL:no:O:rsSU:vVwt:",
- longopts, NULL)) != -1) {
- switch (c) {
-@@ -1266,6 +1382,22 @@ int main(int argc, char ** argv)
- exit(EX_USAGE);
- }
-
-+ /* make sure mountpoint is legit */
-+ rc = check_mountpoint(thisprogram, mountpoint);
-+ if (rc)
-+ goto mount_exit;
-+
-+ /* sanity check for unprivileged mounts */
-+ if (getuid()) {
-+ rc = check_fstab(thisprogram, mountpoint, dev_name,
-+ &orgoptions);
-+ if (rc)
-+ goto mount_exit;
-+
-+ /* enable any default user mount flags */
-+ flags |= CIFS_SETUID_FLAGS;
-+ }
-+
- if (getenv("PASSWD")) {
- if(mountpassword == NULL)
- mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
-@@ -1283,6 +1415,27 @@ int main(int argc, char ** argv)
- rc = EX_USAGE;
- goto mount_exit;
- }
-+
-+ if (getuid()) {
-+#if !CIFS_LEGACY_SETUID_CHECK
-+ if (!(flags & (MS_USERS|MS_USER))) {
-+ fprintf(stderr, "%s: permission denied\n", thisprogram);
-+ rc = EX_USAGE;
-+ goto mount_exit;
-+ }
-+#endif /* !CIFS_LEGACY_SETUID_CHECK */
-+
-+ if (geteuid()) {
-+ fprintf(stderr, "%s: not installed setuid - \"user\" "
-+ "CIFS mounts not supported.",
-+ thisprogram);
-+ rc = EX_FAIL;
-+ goto mount_exit;
-+ }
-+ }
-+
-+ flags &= ~(MS_USERS|MS_USER);
-+
- addrhead = addr = parse_server(&share_name);
- if((addrhead == NULL) && (got_ip == 0)) {
- printf("No ip address specified and hostname not found\n");
-@@ -1299,37 +1452,6 @@ int main(int argc, char ** argv)
- mountpoint = resolved_path;
- }
- }
-- if(chdir(mountpoint)) {
-- printf("mount error: can not change directory into mount target %s\n",mountpoint);
-- rc = EX_USAGE;
-- goto mount_exit;
-- }
--
-- if(stat (".", &statbuf)) {
-- printf("mount error: mount point %s does not exist\n",mountpoint);
-- rc = EX_USAGE;
-- goto mount_exit;
-- }
--
-- if (S_ISDIR(statbuf.st_mode) == 0) {
-- printf("mount error: mount point %s is not a directory\n",mountpoint);
-- rc = EX_USAGE;
-- goto mount_exit;
-- }
--
-- if((getuid() != 0) && (geteuid() == 0)) {
-- if((statbuf.st_uid == getuid()) && (S_IRWXU == (statbuf.st_mode & S_IRWXU))) {
--#ifndef CIFS_ALLOW_USR_SUID
-- /* Do not allow user mounts to control suid flag
-- for mount unless explicitly built that way */
-- flags |= MS_NOSUID | MS_NODEV;
--#endif
-- } else {
-- printf("mount error: permission denied or not superuser and mount.cifs not installed SUID\n");
-- exit(EX_USAGE);
-- }
-- }
--
- if(got_user == 0) {
- /* Note that the password will not be retrieved from the
- USER env variable (ie user%password form) as there is
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/e171c09c3bae678db68c3ded5765d602c8438e25 new/patches/samba.org/e171c09c3bae678db68c3ded5765d602c8438e25
--- old/patches/samba.org/e171c09c3bae678db68c3ded5765d602c8438e25 2010-02-24 14:38:39.000000000 +0100
+++ new/patches/samba.org/e171c09c3bae678db68c3ded5765d602c8438e25 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-commit e171c09c3bae678db68c3ded5765d602c8438e25
-Author: Bo Yang
-Date: Thu Dec 10 17:20:03 2009 +0800
-
- s3: Fix build on non-linux platform.
-
- Signed-off-by: Bo Yang
- (cherry picked from commit b386c3311d8c05ccbd075ab86be2ddace335b73b)
-
-Index: nsswitch/pam_winbind.c
-===================================================================
---- nsswitch/pam_winbind.c.orig
-+++ nsswitch/pam_winbind.c
-@@ -803,6 +803,8 @@ static int wbc_auth_error_to_pam_error(s
- return pam_winbind_request_log(ctx, ret, username, fn);
- }
-
-+/* PAM_RADIO_TYPE is linux-only. */
-+#ifdef LINUX
- static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
- {
- struct pam_message msg, *pmsg;
-@@ -833,6 +835,12 @@ static bool _pam_winbind_change_pwd(stru
- _pam_drop_reply(resp, 1);
- return retval;
- }
-+#else
-+static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
-+{
-+ return false;
-+}
-+#endif
-
-
- /**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series
--- old/patches/series 2010-02-24 14:53:07.000000000 +0100
+++ new/patches/series 2010-02-19 17:22:13.000000000 +0100
@@ -5,11 +5,6 @@
# allows quilt to work in the usual way (= outside of our RPM spec file).
# Samba patches from upstream, svnanon.Samba.org
-samba.org/2300ec3006098536c1a615820b4774d625f82c05 -p0 # bnc 546162, bso 6872. Backported from 3.5.x(master).
-samba.org/2d063d077aed01f020352e859b766415fe094fa5 -p0 # FATE 302414. Backported from 3.5.x(master).
-samba.org/e171c09c3bae678db68c3ded5765d602c8438e25 -p0 # FATE 302414. Backported from 3.5.x(master).
-samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66 -p0 # FATE 302414. Backported from 3.5.x(master).
-samba.org/cc7b62269e4a90859dd93b8d6896390857ba17d7 -p0 # mount.cifs check req by bnc 550002
samba.org/3ae5dac462c4ed0fb2cd94553583c56fce2f9d80 -p0 # bnc 550002
samba.org/a065c177dfc8f968775593ba00dffafeebb2e054 -p0 # brc 562156, bnc 577925
samba.org/a0c31ec1c8d1220a5884e40d9ba6b191a04a24d5 -p0 # bnc 550002
@@ -28,7 +23,6 @@
suse/net-kdc-lookup.diff -p0 # perform dns-only lookup for kdcs
suse/configure.diff -p0 # Work around bad use of autoconf interna
suse/testsuite_libsmbclient_src_Makefile.diff -p0 # use new source3 dir name
-suse/libtevent-ac.diff -p0 # merge OBS sr 31575
# this one should always live at the end and should be redone
# diabled cf. 280452
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/Makefile.in-libwbclient_static.diff new/patches/suse/Makefile.in-libwbclient_static.diff
--- old/patches/suse/Makefile.in-libwbclient_static.diff 2010-02-24 14:38:39.000000000 +0100
+++ new/patches/suse/Makefile.in-libwbclient_static.diff 2010-02-19 17:23:30.000000000 +0100
@@ -8,7 +8,7 @@
===================================================================
--- source3/Makefile.in.orig
+++ source3/Makefile.in
-@@ -1905,6 +1905,7 @@ installlibwbclient:: installdirs libwbcl
+@@ -2061,6 +2061,7 @@ installlibwbclient:: installdirs libwbcl
ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` ; \
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/get_printing_ticket.diff new/patches/suse/get_printing_ticket.diff
--- old/patches/suse/get_printing_ticket.diff 2010-02-24 14:38:39.000000000 +0100
+++ new/patches/suse/get_printing_ticket.diff 2010-02-19 17:23:25.000000000 +0100
@@ -6,18 +6,18 @@
===================================================================
--- source3/Makefile.in.orig
+++ source3/Makefile.in
-@@ -199,7 +199,8 @@ SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@E
- ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
+@@ -211,7 +211,8 @@ SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@E
+ ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ @CIFSUMOUNT_PROGS@
BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \
- bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@
+ bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@ \
+ bin/get_printing_ticket@EXEEXT@
- BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ bin/tdbbackup@EXEEXT@ \
- bin/nmblookup@EXEEXT@ bin/pdbedit@EXEEXT@ bin/tdbdump@EXEEXT@ \
- bin/tdbtool@EXEEXT@
-@@ -1457,6 +1458,10 @@ bin/smbspool@EXEEXT@: $(BINARY_PREREQS)
- @$(CC) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
+ BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ $(TDBBACKUP) \
+ bin/nmblookup@EXEEXT@ bin/pdbedit@EXEEXT@ $(TDBDUMP) \
+ $(TDBTOOL)
+@@ -1599,6 +1600,10 @@ bin/smbspool@EXEEXT@: $(BINARY_PREREQS)
+ @LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
$(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS)
+bin/get_printing_ticket@EXEEXT@: client/get_printing_ticket.o
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/libtevent-ac.diff new/patches/suse/libtevent-ac.diff
--- old/patches/suse/libtevent-ac.diff 2010-02-24 14:38:39.000000000 +0100
+++ new/patches/suse/libtevent-ac.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,110 +0,0 @@
-Authot: Ralf Haferkamp <rhafer at suse dot de>
-Subject: build libldb and libtevent subpackages
-
-This patch contains some autoconf related fixes to be able to build and
-link libtevent as a separate library (backported from 3.5.0rc2)
-
-Index: lib/replace/getpass.m4
-===================================================================
---- lib/replace/getpass.m4.orig
-+++ lib/replace/getpass.m4
-@@ -3,7 +3,7 @@ AC_CHECK_FUNC(getpassphrase, libreplace_
- if test x"$libreplace_cv_HAVE_GETPASS" = x"yes" -a x"$libreplace_cv_HAVE_GETPASSPHRASE" = x"yes"; then
- AC_DEFINE(REPLACE_GETPASS_BY_GETPASSPHRASE, 1, [getpass returns <9 chars where getpassphrase returns <265 chars])
- AC_DEFINE(REPLACE_GETPASS,1,[Whether getpass should be replaced])
-- LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
- else
-
- AC_CACHE_CHECK([whether getpass should be replaced],libreplace_cv_REPLACE_GETPASS,[
-@@ -18,7 +18,7 @@ CPPFLAGS="$SAVE_CPPFLAGS"
- ])
- if test x"$libreplace_cv_REPLACE_GETPASS" = x"yes"; then
- AC_DEFINE(REPLACE_GETPASS,1,[Whether getpass should be replaced])
-- LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
-+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
- fi
-
- fi
-Index: lib/replace/libreplace.m4
-===================================================================
---- lib/replace/libreplace.m4.orig
-+++ lib/replace/libreplace.m4
-@@ -16,7 +16,7 @@ done
- if test x"$libreplacedir" = "x"; then
- AC_MSG_ERROR([cannot find libreplace in $libreplacepaths])
- fi
--LIBREPLACEOBJ="replace.o"
-+LIBREPLACEOBJ="$libreplacedir/replace.o"
- AC_SUBST(LIBREPLACEOBJ)
-
- AC_CANONICAL_BUILD
-@@ -46,10 +46,10 @@ if test x"$libreplacedir" = "x"; then
- AC_MSG_ERROR([cannot find libreplace in $libreplacepaths])
- fi
-
--LIBREPLACEOBJ="replace.o"
-+LIBREPLACEOBJ="$libreplacedir/replace.o"
- AC_SUBST(LIBREPLACEOBJ)
-
--LIBREPLACEOBJ="${LIBREPLACEOBJ} snprintf.o"
-+LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
-
- AC_TYPE_SIGNAL
- AC_TYPE_UID_T
-Index: lib/replace/libreplace_ld.m4
-===================================================================
---- lib/replace/libreplace_ld.m4.orig
-+++ lib/replace/libreplace_ld.m4
-@@ -317,3 +317,19 @@ AC_DEFUN([AC_LIBREPLACE_RUNTIME_LIB_PATH
-
- AC_SUBST(LIB_PATH_VAR)
- ])
-+
-+AC_DEFUN([AC_LD_VERSIONSCRIPT],
-+[
-+ AC_SUBST(VERSIONSCRIPT)
-+ VERSIONSCRIPT=""
-+ case "$host_os" in
-+ *linux*|*gnu*)
-+ VERSIONSCRIPT="-Wl,--version-script"
-+ ;;
-+ *solaris*)
-+ if test "${GCC}" = "yes"; then
-+ VERSIONSCRIPT="-Wl,--version-script"
-+ fi
-+ ;;
-+ esac
-+])
-Index: lib/replace/samba.m4
-===================================================================
---- lib/replace/samba.m4.orig
-+++ lib/replace/samba.m4
-@@ -17,10 +17,7 @@ LIBREPLACE_DIR=`echo ${libreplacedir} |s
- # build directory.
- LIBREPLACE_DIR=`echo ${LIBREPLACE_DIR} | sed -e "s|^$srcdir/||g"`
-
--LIBREPLACE_OBJS=""
--for obj in ${LIBREPLACEOBJ}; do
-- LIBREPLACE_OBJS="${LIBREPLACE_OBJS} ${LIBREPLACE_DIR}/${obj}"
--done
-+LIBREPLACE_OBJS=${LIBREPLACEOBJ}
-
- SMB_SUBSYSTEM(LIBREPLACE,
- [${LIBREPLACE_OBJS}],
-Index: source3/configure.in
-===================================================================
---- source3/configure.in.orig
-+++ source3/configure.in
-@@ -680,10 +680,7 @@ CPPFLAGS="${SAVE_CPPFLAGS}"
-
- LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
-
--LIBREPLACE_OBJS=""
--for obj in ${LIBREPLACEOBJ}; do
-- LIBREPLACE_OBJS="${LIBREPLACE_OBJS} ${LIBREPLACE_DIR}/${obj}"
--done
-+LIBREPLACE_OBJS=${LIBREPLACEOBJ}
- AC_SUBST(LIBREPLACE_OBJS)
-
- # add -ldl to the global LIBS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/net-kdc-lookup.diff new/patches/suse/net-kdc-lookup.diff
--- old/patches/suse/net-kdc-lookup.diff 2010-02-24 14:38:39.000000000 +0100
+++ new/patches/suse/net-kdc-lookup.diff 2010-01-26 23:19:23.000000000 +0100
@@ -6,7 +6,7 @@
===================================================================
--- source3/utils/net_lookup.c.orig
+++ source3/utils/net_lookup.c
-@@ -264,6 +264,89 @@ static int net_lookup_master(struct net_
+@@ -265,6 +265,89 @@ static int net_lookup_master(struct net_
return 0;
}
@@ -96,7 +96,7 @@
static int net_lookup_kdc(struct net_context *c, int argc, const char **argv)
{
#ifdef HAVE_KRB5
-@@ -426,6 +509,7 @@ int net_lookup(struct net_context *c, in
+@@ -433,6 +516,7 @@ int net_lookup(struct net_context *c, in
{"DC", net_lookup_dc},
{"PDC", net_lookup_pdc},
{"MASTER", net_lookup_master},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/passdb_backend_defaults_smbpasswd.diff new/patches/suse/passdb_backend_defaults_smbpasswd.diff
--- old/patches/suse/passdb_backend_defaults_smbpasswd.diff 2010-02-24 14:38:39.000000000 +0100
+++ new/patches/suse/passdb_backend_defaults_smbpasswd.diff 2010-02-19 17:23:13.000000000 +0100
@@ -8,7 +8,7 @@
===================================================================
--- source3/param/loadparm.c.orig
+++ source3/param/loadparm.c
-@@ -5006,7 +5006,7 @@ static void init_globals(bool first_time
+@@ -5093,7 +5093,7 @@ static void init_globals(bool first_time
a large number of sites (tridge) */
Globals.bHostnameLookups = False;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/smb_child_crash.patch new/patches/suse/smb_child_crash.patch
--- old/patches/suse/smb_child_crash.patch 2010-02-24 14:38:39.000000000 +0100
+++ new/patches/suse/smb_child_crash.patch 2009-11-26 19:40:18.000000000 +0100
@@ -5,7 +5,7 @@
===================================================================
--- source3/passdb/lookup_sid.c.orig
+++ source3/passdb/lookup_sid.c
-@@ -423,9 +423,17 @@ static bool wb_lookup_rids(TALLOC_CTX *m
+@@ -435,9 +435,17 @@ static bool wb_lookup_rids(TALLOC_CTX *m
if (!winbind_lookup_rids(tmp_ctx, domain_sid, num_rids, rids,
domain_name, &my_names, &my_types)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/testsuite_libsmbclient.diff new/patches/suse/testsuite_libsmbclient.diff
--- old/patches/suse/testsuite_libsmbclient.diff 2010-02-24 14:38:39.000000000 +0100
+++ new/patches/suse/testsuite_libsmbclient.diff 2010-01-28 00:49:14.000000000 +0100
@@ -11,7 +11,7 @@
CFLAGS = -Wall -W -O2 -g -I../../../source/include
LFLAGS = -L../../../source/bin
--LIBS= -L/usr/lib -lsmbclient
+-LIBS= -L/usr/lib -lsmbclient -ltalloc
+LIBS= -L/usr/lib -lsmbclient -ltalloc -ltdb -lwbclient
INCPATH= -I. -I/usr/include -I./include
BIN_DIR=bin
++++++ samba-3.4.6.tar.bz2 -> samba-3.5.0.tar.bz2 ++++++
samba/samba-3.4.6.tar.bz2 /mounts/work_src_done/STABLE/samba/samba-3.5.0.tar.bz2 differ: char 11, line 1
++++++ vendor-files.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data
--- old/vendor-files/tools/package-data 2010-02-24 15:42:59.000000000 +0100
+++ new/vendor-files/tools/package-data 2010-03-01 17:12:25.000000000 +0100
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="2314"
+SAMBA_PACKAGE_SVN_VERSION="2315"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org