Hello community,
here is the log from the commit of package samba
checked in at Fri Jul 11 23:15:16 CEST 2008.
--------
--- samba/samba.changes 2008-05-30 19:20:17.000000000 +0200
+++ samba/samba.changes 2008-07-03 14:31:51.000000000 +0200
@@ -1,0 +2,133 @@
+Wed Jul 2 21:31:38 CEST 2008 - lmuelle@suse.de
+
+- Call the libsmbclient testsuite from the %check instead of the %build
+ script.
+
+-------------------------------------------------------------------
+Wed Jul 2 10:44:21 CEST 2008 - boyang@suse.de
+
+- Use machine account and machine password from our domain when
+ contacting trusted domains; [bnc#404667].
+
+-------------------------------------------------------------------
+Tue Jul 1 22:02:31 CEST 2008 - anschneider@suse.de
+
+- Add a %check section move the test of the PAM modules to this section
+ and add more tests.
+
+-------------------------------------------------------------------
+Tue Jul 1 14:51:04 CEST 2008 - anschneider@suse.de
+
+- Add a recommendation to the samba and samba-winbind package to install
+ cron for openSUSE 11.0 and later.
+
+-------------------------------------------------------------------
+Tue Jul 1 14:06:17 CEST 2008 - anschneider@suse.de
+
+- Use a variable for syslog and add missing $remote_fs dependency for
+ Require-Start in the init information of the init scripts.
+
+-------------------------------------------------------------------
+Tue Jul 1 11:34:57 CEST 2008 - lmuelle@suse.de
+
+- Update to 3.2.0.
+ + Support for establishing interdomain trust relationships with Windows
+ 2008.
+ + All changes from the pre and rc releases as noted in here earlier.
+
+-------------------------------------------------------------------
+Tue Jul 1 11:28:40 CEST 2008 - lmuelle@suse.de
+
+- Move header files from the devel sub package to lib*-devel.
+
+-------------------------------------------------------------------
+Mon Jun 30 16:53:35 CEST 2008 - schwab@suse.de
+
+- Work around bad use of autoconf interna.
+
+-------------------------------------------------------------------
+Mon Jun 30 14:41:41 CEST 2008 - anschneider@suse.de
+
+- Build Samba with debug symbols to get working debuginfo packages.
+
+-------------------------------------------------------------------
+Thu Jun 26 21:08:35 CEST 2008 - lmuelle@suse.de
+
+- Add /etc/openldap to the file list and not only the schema directory.
+
+-------------------------------------------------------------------
+Wed Jun 25 10:34:09 CEST 2008 - anschneider@suse.de
+
+- Improve samba-winbindd and dhcpcd-hook-samba interface scripts for faster
+ booting; [fate#304967], [fate#304965].
+
+-------------------------------------------------------------------
+Wed Jun 18 15:21:38 CEST 2008 - anschneider@suse.de
+
+- Move sysconfig variable DHCLIENT_MODIFY_SMB_CONF from Other to
+ 'Network/DHCP/DHCP client'; [bnc#400467].
+
+-------------------------------------------------------------------
+Wed Jun 11 11:39:46 CEST 2008 - boyang@suse.de
+
+- pam_winbind: Update cached creds during password change; [bnc#395578].
+
+-------------------------------------------------------------------
+Tue Jun 10 12:14:47 CEST 2008 - lmuelle@suse.de
+
+- Update to 3.2.0rc2.
+ + BUG 5504: Fix behaviour of winbindd children receiving a SIGTERM.
+ + BUG 5489: Split the winbindd_passdb backend into a 'builtin' and a 'sam'.
+ + Make sure we take account of the large read/write SMB headers as well as
+ the buffer space when allocating cli buffers for large read/write.
+ + Fix tag as a goto target we were not reinitializing the array counts.
+ + BUG 5451: Fix for using the correct machine domain when looking up trust
+ credentials in our tdb.
+ + Fix spnego SPN when contacting trusted domains.
+ + BUG 5285: Fix libcap header mismatch.
+ + Fix pam_sm_chauthtok for storing modified cached creds.
+ + Fix joining issue in setups with "config backend = registry".
+ + BUG 4544: Add new parameter 'ldap connection timeout' to prevent waiting
+ for TCP connection timeouts if no LDAP server is available.
+ + BUG 5502: Fix security=server.
+ + Fix coverity IDs 552, 553, 570, 571, 572.
+ + Shrink ldbtools.
+ + Fix reset of password last set time just because the expired flag is set
+ to 0.
+ + Remove support for symbol versioning in shared libraries.
+ + Fix autogen for autoconf 2.62.
+ + BUG 5515: Fix empty input fields in SWAT.
+ + BUG 5516: Fix saving of the config file in SWAT.
+ + Fix winbindd trusted domain child not keeping primary domain online status
+ up to date.
+
+-------------------------------------------------------------------
+Tue Jun 10 10:21:57 CEST 2008 - boyang@suse.de
+
+- pam_winbind: fix pam_sm_chauthtok for storing modified cached creds;
+ [bnc#395578].
+
+-------------------------------------------------------------------
+Mon Jun 9 21:08:17 CEST 2008 - jmcdonough@suse.de
+
+- Don't reset "password last set time" when unlocking an autolocked
+ account; [bnc#382111].
+
+-------------------------------------------------------------------
+Fri Jun 6 22:40:38 CEST 2008 - jmcdonough@suse.de
+
+- Fix winbind sigterm handling and make init script send sighup to
+ all child winbind processes; [bnc#382027].
+
+-------------------------------------------------------------------
+Thu Jun 5 12:01:51 CEST 2008 - boyang@suse.de
+
+- Fix bug with winbindd trusted domain child not keeping primary domain
+ online status up to date, merge to trunk from reversion 1801; [bnc#373560].
+
+-------------------------------------------------------------------
+Fri May 30 22:38:05 CEST 2008 - jmcdonough@suse.de
+
+- Make winbind children reopen logs on SIGHUP; [bnc#382027].
+
+-------------------------------------------------------------------
@@ -400,0 +534,6 @@
+Tue Jan 8 10:26:31 CET 2008 - anschneider@suse.de
+
+- Prevent winbindd from segfaulting due to corrupted cache tdb on flushing
+ caches; [#340332].
+
+-------------------------------------------------------------------
Old:
----
samba-3.2.0rc1.tar.bz2
New:
----
samba-3.2.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba-doc.spec ++++++
--- /var/tmp/diff_new_pack.S16722/_old 2008-07-11 23:11:56.000000000 +0200
+++ /var/tmp/diff_new_pack.S16722/_new 2008-07-11 23:11:56.000000000 +0200
@@ -14,12 +14,12 @@
Name: samba-doc
BuildRequires: ccache cracklib-devel cups-devel e2fsprogs-devel gdbm-devel krb5-devel libacl-devel libiniparser-devel libnscd-devel openldap2-devel pam-devel popt-devel pwdutils python-devel readline-devel
%define samba_ver 3.2.0
-%define samba_ver_suffix rc1
+%define samba_ver_suffix %nil
%define samba_ver_full %{samba_ver}%{samba_ver_suffix}
License: GPL v3 or later
Url: http://www.samba.org/
Version: 3.2.0
-Release: 19
+Release: 25
Summary: Samba Documentation
Group: Documentation/Other
AutoReqProv: on
@@ -126,7 +126,7 @@
unset OPTIMIZATION
%endif
export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS"
-%if %{make_devel}
+%if 0%{?suse_version} > 1000
# debugging symbols
export CFLAGS="${CFLAGS} -g"
%endif
@@ -299,7 +299,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%changelog
++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.S16722/_old 2008-07-11 23:11:56.000000000 +0200
+++ /var/tmp/diff_new_pack.S16722/_new 2008-07-11 23:11:56.000000000 +0200
@@ -35,7 +35,7 @@
BuildRequires: krb5-devel openldap-devel
%endif
%define samba_ver 3.2.0
-%define samba_ver_suffix rc1
+%define samba_ver_suffix %nil
%define samba_ver_full %{samba_ver}%{samba_ver_suffix}
%define vscan_ver 0.3.6b
%define ldapsmb_ver 1.34b
@@ -44,8 +44,11 @@
Url: http://www.samba.org/
AutoReqProv: on
Version: 3.2.0
-Release: 19
+Release: 25
Requires: samba-client >= %{version}
+%if 0%{?suse_version} > 1030
+Recommends: cron
+%endif
PreReq: /bin/cp /bin/mkdir /bin/mv /bin/rm /bin/touch /usr/bin/dirname /usr/bin/grep /usr/sbin/groupadd /usr/bin/tr
Summary: A SMB/CIFS File, Print, and Authentication Server
Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.bz2
@@ -108,7 +111,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%package client
@@ -145,7 +148,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@@ -166,7 +169,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%endif
@@ -196,7 +199,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%endif
@@ -222,7 +225,7 @@
--------
Jeremy Allison <jra at samba dot org>
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%if %{make_utils}
@@ -254,6 +257,9 @@
Provides: samba3-winbind = %{version}-%{release} samba-client:/usr/sbin/winbindd
Obsoletes: samba3-winbind
Requires: samba-client >= %{version}
+%if 0%{?suse_version} > 1030
+Recommends: cron
+%endif
PreReq: /bin/ln /sbin/ldconfig /sbin/insserv /bin/rm
%description winbind
@@ -265,7 +271,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -300,7 +306,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%else
@@ -314,7 +320,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%endif
@@ -348,7 +354,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%package -n libnetapi0
@@ -367,13 +373,13 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%package -n libnetapi-devel
License: GPL v3 or later
Summary: Libraries and Header Files to Develop Programs with netapi Support
-Group: Productivity/Networking/Samba
+Group: Development/Libraries/C and C++
AutoReqProv: on
Requires: libnetapi0 = %{version}
@@ -387,7 +393,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -414,7 +420,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%else
@@ -428,7 +434,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%endif
@@ -440,7 +446,7 @@
%package -n libsmbsharemodes-devel
License: GPL v3 or later
Summary: Samba smbsharemodes Library
-Group: System/Libraries
+Group: Development/Libraries/C and C++
AutoReqProv: on
%if 0%{?suse_version} && 0%{?suse_version} < 1031
Requires: libsmbsharemodes = %{version}
@@ -459,7 +465,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%if %{make_ldapsmb}
@@ -480,13 +486,13 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%package -n libtalloc-devel
License: GPL v3 or later
Summary: Libraries and Header Files to Develop Programs with talloc Support
-Group: Productivity/Networking/Samba
+Group: Development/Libraries/C and C++
AutoReqProv: on
Requires: libtalloc1 = %{version}
@@ -500,7 +506,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%package -n libtdb1
@@ -519,13 +525,13 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%package -n libtdb-devel
License: GPL v3 or later
Summary: Libraries and Header Files to Develop Programs with tdb Support
-Group: Productivity/Networking/Samba
+Group: Development/Libraries/C and C++
AutoReqProv: on
Requires: libtdb1 = %{version}
@@ -539,7 +545,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%package -n libwbclient0
@@ -558,13 +564,13 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%package -n libwbclient-devel
License: GPL v3 or later
Summary: Libraries and Header Files to Develop Programs with wbclient Support
-Group: Productivity/Networking/Samba
+Group: Development/Libraries/C and C++
AutoReqProv: on
Requires: libwbclient0 = %{version}
@@ -578,7 +584,7 @@
--------
The Samba Team
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%package -n ldapsmb
@@ -587,7 +593,7 @@
Group: Productivity/Networking/Samba
AutoReqProv: on
Version: 1.34b
-Release: 192
+Release: 198
Requires: perl-ldap
%description -n ldapsmb
@@ -600,7 +606,7 @@
--------
Guenther Deschner <guenther at deschner dot de>
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%endif
@@ -622,7 +628,7 @@
--------
Steve French <sfrench at Samba dot org>
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%endif
@@ -652,7 +658,7 @@
--------
Rainer Link
-Source Timestamp: 1795
+Source Timestamp: 1842
Branch : trunk
%endif
@@ -736,7 +742,7 @@
unset OPTIMIZATION
%endif
export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS"
-%if %{make_devel}
+%if 0%{?suse_version} > 1000
# debugging symbols
export CFLAGS="${CFLAGS} -g"
%endif
@@ -818,10 +824,16 @@
%{__make} %{?jobs:-j%jobs} all doc
popd
%endif
+
+%check
+pushd source
+make test_shlibs
+make test_nss_modules
make test_pam_modules
-# Run testsuite
-cd ../testsuite/libsmbclient/src
+popd
+pushd testsuite/libsmbclient/src
make
+popd
%install
%if %{make_devel}
@@ -1303,14 +1315,12 @@
%doc %{_mandir}/man8/vfs_xattr_tdb.8.*
%if 0%{?suse_version} && 0%{?suse_version} < 1021
%{_includedir}/samba
-%{_includedir}/*.h
%endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
%files devel
%defattr(-,root,root)
%{_includedir}/samba
-%{_includedir}/*.h
%endif
%files client
@@ -1320,6 +1330,7 @@
%config(noreplace) %{CONFIGDIR}/lmhosts
%config(noreplace) %{CONFIGDIR}/smb.conf
%attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/smbfstab
+%dir %{_sysconfdir}/openldap
%dir %{_sysconfdir}/openldap/schema
%attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/samba3.schema
%ghost %{_sysconfdir}/sysconfig/network/if-down.d/21-dhcpcd-hook-samba
@@ -1512,6 +1523,7 @@
%files -n libnetapi-devel
%defattr(-,root,root)
+%{_includedir}/netapi.h
%{_libdir}/libnetapi.a
%{_libdir}/libnetapi.so
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -1553,6 +1565,7 @@
%files -n libtalloc-devel
%defattr(-,root,root)
+%{_includedir}/talloc.h
%{_libdir}/libtalloc.a
%{_libdir}/libtalloc.so
@@ -1562,6 +1575,7 @@
%files -n libtdb-devel
%defattr(-,root,root)
+%{_includedir}/tdb.h
%{_libdir}/libtdb.a
%{_libdir}/libtdb.so
@@ -1571,6 +1585,7 @@
%files -n libwbclient-devel
%defattr(-,root,root)
+%{_includedir}/wbclient.h
#%{_libdir}/libwbclient.a
%{_libdir}/libwbclient.so
@@ -1594,6 +1609,82 @@
%endif
%changelog
+* Wed Jul 02 2008 lmuelle@suse.de
+- Call the libsmbclient testsuite from the %%check instead of the %%build
+ script.
+* Wed Jul 02 2008 boyang@suse.de
+- Use machine account and machine password from our domain when
+ contacting trusted domains; [bnc#404667].
+* Wed Jul 02 2008 anschneider@suse.de
+- Add a %%check section move the test of the PAM modules to this section
+ and add more tests.
+* Tue Jul 01 2008 anschneider@suse.de
+- Add a recommendation to the samba and samba-winbind package to install
+ cron for openSUSE 11.0 and later.
+* Tue Jul 01 2008 anschneider@suse.de
+- Use a variable for syslog and add missing $remote_fs dependency for
+ Require-Start in the init information of the init scripts.
+* Tue Jul 01 2008 lmuelle@suse.de
+- Update to 3.2.0.
+ + Support for establishing interdomain trust relationships with Windows
+ 2008.
+ + All changes from the pre and rc releases as noted in here earlier.
+* Tue Jul 01 2008 lmuelle@suse.de
+- Move header files from the devel sub package to lib*-devel.
+* Mon Jun 30 2008 schwab@suse.de
+- Work around bad use of autoconf interna.
+* Mon Jun 30 2008 anschneider@suse.de
+- Build Samba with debug symbols to get working debuginfo packages.
+* Thu Jun 26 2008 lmuelle@suse.de
+- Add /etc/openldap to the file list and not only the schema directory.
+* Wed Jun 25 2008 anschneider@suse.de
+- Improve samba-winbindd and dhcpcd-hook-samba interface scripts for faster
+ booting; [fate#304967], [fate#304965].
+* Wed Jun 18 2008 anschneider@suse.de
+- Move sysconfig variable DHCLIENT_MODIFY_SMB_CONF from Other to
+ 'Network/DHCP/DHCP client'; [bnc#400467].
+* Wed Jun 11 2008 boyang@suse.de
+- pam_winbind: Update cached creds during password change; [bnc#395578].
+* Tue Jun 10 2008 lmuelle@suse.de
+- Update to 3.2.0rc2.
+ + BUG 5504: Fix behaviour of winbindd children receiving a SIGTERM.
+ + BUG 5489: Split the winbindd_passdb backend into a 'builtin' and a 'sam'.
+ + Make sure we take account of the large read/write SMB headers as well as
+ the buffer space when allocating cli buffers for large read/write.
+ + Fix tag as a goto target we were not reinitializing the array counts.
+ + BUG 5451: Fix for using the correct machine domain when looking up trust
+ credentials in our tdb.
+ + Fix spnego SPN when contacting trusted domains.
+ + BUG 5285: Fix libcap header mismatch.
+ + Fix pam_sm_chauthtok for storing modified cached creds.
+ + Fix joining issue in setups with "config backend = registry".
+ + BUG 4544: Add new parameter 'ldap connection timeout' to prevent waiting
+ for TCP connection timeouts if no LDAP server is available.
+ + BUG 5502: Fix security=server.
+ + Fix coverity IDs 552, 553, 570, 571, 572.
+ + Shrink ldbtools.
+ + Fix reset of password last set time just because the expired flag is set
+ to 0.
+ + Remove support for symbol versioning in shared libraries.
+ + Fix autogen for autoconf 2.62.
+ + BUG 5515: Fix empty input fields in SWAT.
+ + BUG 5516: Fix saving of the config file in SWAT.
+ + Fix winbindd trusted domain child not keeping primary domain online status
+ up to date.
+* Tue Jun 10 2008 boyang@suse.de
+- pam_winbind: fix pam_sm_chauthtok for storing modified cached creds;
+ [bnc#395578].
+* Mon Jun 09 2008 jmcdonough@suse.de
+- Don't reset "password last set time" when unlocking an autolocked
+ account; [bnc#382111].
+* Sat Jun 07 2008 jmcdonough@suse.de
+- Fix winbind sigterm handling and make init script send sighup to
+ all child winbind processes; [bnc#382027].
+* Thu Jun 05 2008 boyang@suse.de
+- Fix bug with winbindd trusted domain child not keeping primary domain
+ online status up to date, merge to trunk from reversion 1801; [bnc#373560].
+* Sat May 31 2008 jmcdonough@suse.de
+- Make winbind children reopen logs on SIGHUP; [bnc#382027].
* Fri May 30 2008 lmuelle@suse.de
- Set only CONFIGDIR and LIBDIR while make everything and install. No longer
set CONFIGFILE, DRIVERFILE, LMHOSTSFILE, and SMB_PASSWD_FILE; [bnc#395877].
@@ -1864,6 +1955,9 @@
* Wed Jan 09 2008 boyang@novell.com
- Remove duplicate domain name prepend when user SID is in winbindd cache;
[#336854].
+* Tue Jan 08 2008 anschneider@suse.de
+- Prevent winbindd from segfaulting due to corrupted cache tdb on flushing
+ caches; [#340332].
* Thu Dec 20 2007 anschneider@suse.de
- Fix kerberos authentication with Vista; [#350032].
* Wed Dec 12 2007 jmcdonough@suse.de
++++++ build-source-timestamp ++++++
--- samba/build-source-timestamp 2008-05-30 19:23:39.000000000 +0200
+++ samba/build-source-timestamp 2008-07-03 14:36:38.000000000 +0200
@@ -1,2 +1,2 @@
-1795
+1842
Branch : trunk
++++++ patches.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/CVE-2008-1105_3.2.diff new/patches/samba.org/CVE-2008-1105_3.2.diff
--- old/patches/samba.org/CVE-2008-1105_3.2.diff 2008-05-28 12:47:18.000000000 +0200
+++ new/patches/samba.org/CVE-2008-1105_3.2.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,326 +0,0 @@
-diff --git source/client/client.c source/client/client.c
-index e08fa89..d684ba8 100644
---- source/client/client.c
-+++ source/client/client.c
-@@ -4382,7 +4382,7 @@ static void readline_callback(void)
-
- set_smb_read_error(&cli->smb_rw_error, SMB_READ_OK);
-
-- status = receive_smb_raw(cli->fd, cli->inbuf, 0, 0, &len);
-+ status = receive_smb_raw(cli->fd, cli->inbuf, cli->bufsize, 0, 0, &len);
-
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Read from server failed, maybe it closed "
-diff --git source/lib/util_sock.c source/lib/util_sock.c
-index f252377..b2a1ece 100644
---- source/lib/util_sock.c
-+++ source/lib/util_sock.c
-@@ -1151,16 +1151,15 @@ NTSTATUS read_smb_length(int fd, char *inbuf, unsigned int timeout,
- }
-
- /****************************************************************************
-- Read an smb from a fd. Note that the buffer *MUST* be of size
-- BUFFER_SIZE+SAFETY_MARGIN.
-+ Read an smb from a fd.
- The timeout is in milliseconds.
- This function will return on receipt of a session keepalive packet.
- maxlen is the max number of bytes to return, not including the 4 byte
-- length. If zero it means BUFFER_SIZE+SAFETY_MARGIN limit.
-+ length. If zero it means buflen limit.
- Doesn't check the MAC on signed packets.
- ****************************************************************************/
-
--NTSTATUS receive_smb_raw(int fd, char *buffer, unsigned int timeout,
-+NTSTATUS receive_smb_raw(int fd, char *buffer, size_t buflen, unsigned int timeout,
- size_t maxlen, size_t *p_len)
- {
- size_t len;
-@@ -1173,17 +1172,10 @@ NTSTATUS receive_smb_raw(int fd, char *buffer, unsigned int timeout,
- return status;
- }
-
-- /*
-- * A WRITEX with CAP_LARGE_WRITEX can be 64k worth of data plus 65 bytes
-- * of header. Don't print the error if this fits.... JRA.
-- */
--
-- if (len > (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE)) {
-+ if (len > buflen) {
- DEBUG(0,("Invalid packet length! (%lu bytes).\n",
- (unsigned long)len));
-- if (len > BUFFER_SIZE + (SAFETY_MARGIN/2)) {
-- return NT_STATUS_INVALID_PARAMETER;
-- }
-+ return NT_STATUS_INVALID_PARAMETER;
- }
-
- if(len > 0) {
-diff --git source/libsmb/clientgen.c source/libsmb/clientgen.c
-index 6419123..2af4383 100644
---- source/libsmb/clientgen.c
-+++ source/libsmb/clientgen.c
-@@ -57,8 +57,7 @@ int cli_set_port(struct cli_state *cli, int port)
- }
-
- /****************************************************************************
-- Read an smb from a fd ignoring all keepalive packets. Note that the buffer
-- *MUST* be of size BUFFER_SIZE+SAFETY_MARGIN.
-+ Read an smb from a fd ignoring all keepalive packets.
- The timeout is in milliseconds
-
- This is exactly the same as receive_smb except that it never returns
-@@ -76,8 +75,8 @@ static ssize_t client_receive_smb(struct cli_state *cli, size_t maxlen)
-
- set_smb_read_error(&cli->smb_rw_error, SMB_READ_OK);
-
-- status = receive_smb_raw(cli->fd, cli->inbuf, cli->timeout,
-- maxlen, &len);
-+ status = receive_smb_raw(cli->fd, cli->inbuf, cli->bufsize,
-+ cli->timeout, maxlen, &len);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(10,("client_receive_smb failed\n"));
- show_msg(cli->inbuf);
-@@ -225,93 +224,6 @@ ssize_t cli_receive_smb_data(struct cli_state *cli, char *buffer, size_t len)
- return -1;
- }
-
--/****************************************************************************
-- Read a smb readX header.
-- We can only use this if encryption and signing are off.
--****************************************************************************/
--
--bool cli_receive_smb_readX_header(struct cli_state *cli)
--{
-- ssize_t len, offset;
--
-- if (cli->fd == -1)
-- return false;
--
-- again:
--
-- /* Read up to the size of a readX header reply. */
-- len = client_receive_smb(cli, (smb_size - 4) + 24);
--
-- if (len > 0) {
-- /* it might be an oplock break request */
-- if (!(CVAL(cli->inbuf, smb_flg) & FLAG_REPLY) &&
-- CVAL(cli->inbuf,smb_com) == SMBlockingX &&
-- SVAL(cli->inbuf,smb_vwv6) == 0 &&
-- SVAL(cli->inbuf,smb_vwv7) == 0) {
-- ssize_t total_len = smb_len(cli->inbuf);
--
-- if (total_len > CLI_SAMBA_MAX_LARGE_READX_SIZE+SAFETY_MARGIN) {
-- goto read_err;
-- }
--
-- /* Read the rest of the data. */
-- if ((total_len - len > 0) &&
-- !cli_receive_smb_data(cli,cli->inbuf+len,total_len - len)) {
-- goto read_err;
-- }
--
-- if (cli->oplock_handler) {
-- int fnum = SVAL(cli->inbuf,smb_vwv2);
-- unsigned char level = CVAL(cli->inbuf,smb_vwv3+1);
-- if (!cli->oplock_handler(cli, fnum, level)) return false;
-- }
-- /* try to prevent loops */
-- SCVAL(cli->inbuf,smb_com,0xFF);
-- goto again;
-- }
-- }
--
-- /* If it's not the above size it probably was an error packet. */
--
-- if ((len == (smb_size - 4) + 24) && !cli_is_error(cli)) {
-- /* Check it's a non-chained readX reply. */
-- if (!(CVAL(cli->inbuf, smb_flg) & FLAG_REPLY) ||
-- (CVAL(cli->inbuf,smb_vwv0) != 0xFF) ||
-- (CVAL(cli->inbuf,smb_com) != SMBreadX)) {
-- /*
-- * We're not coping here with asnyc replies to
-- * other calls. Punt here - we need async client
-- * libs for this.
-- */
-- goto read_err;
-- }
--
-- /*
-- * We know it's a readX reply - ensure we've read the
-- * padding bytes also.
-- */
--
-- offset = SVAL(cli->inbuf,smb_vwv6);
-- if (offset > len) {
-- ssize_t ret;
-- size_t padbytes = offset - len;
-- ret = cli_receive_smb_data(cli,smb_buf(cli->inbuf),padbytes);
-- if (ret != padbytes) {
-- goto read_err;
-- }
-- }
-- }
--
-- return true;
--
-- read_err:
--
-- cli->smb_rw_error = SMB_READ_ERROR;
-- close(cli->fd);
-- cli->fd = -1;
-- return false;
--}
--
- static ssize_t write_socket(int fd, const char *buf, size_t len)
- {
- ssize_t ret=0;
-diff --git source/libsmb/clireadwrite.c source/libsmb/clireadwrite.c
-index 12ba4b7..487f446 100644
---- source/libsmb/clireadwrite.c
-+++ source/libsmb/clireadwrite.c
-@@ -472,106 +472,6 @@ ssize_t cli_read(struct cli_state *cli, int fnum, char *buf,
- return ret;
- }
-
--#if 0 /* relies on client_receive_smb(), now a static in libsmb/clientgen.c */
--
--/* This call is INCOMPATIBLE with SMB signing. If you remove the #if 0
-- you must fix ensure you don't attempt to sign the packets - data
-- *will* be currupted */
--
--/****************************************************************************
--Issue a single SMBreadraw and don't wait for a reply.
--****************************************************************************/
--
--static bool cli_issue_readraw(struct cli_state *cli, int fnum, off_t offset,
-- size_t size, int i)
--{
--
-- if (!cli->sign_info.use_smb_signing) {
-- DEBUG(0, ("Cannot use readraw and SMB Signing\n"));
-- return False;
-- }
--
-- memset(cli->outbuf,'\0',smb_size);
-- memset(cli->inbuf,'\0',smb_size);
--
-- cli_set_message(cli->outbuf,10,0,True);
--
-- SCVAL(cli->outbuf,smb_com,SMBreadbraw);
-- SSVAL(cli->outbuf,smb_tid,cli->cnum);
-- cli_setup_packet(cli);
--
-- SSVAL(cli->outbuf,smb_vwv0,fnum);
-- SIVAL(cli->outbuf,smb_vwv1,offset);
-- SSVAL(cli->outbuf,smb_vwv2,size);
-- SSVAL(cli->outbuf,smb_vwv3,size);
-- SSVAL(cli->outbuf,smb_mid,cli->mid + i);
--
-- return cli_send_smb(cli);
--}
--
--/****************************************************************************
-- Tester for the readraw call.
--****************************************************************************/
--
--ssize_t cli_readraw(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size)
--{
-- char *p;
-- int size2;
-- size_t readsize;
-- ssize_t total = 0;
--
-- if (size == 0)
-- return 0;
--
-- /*
-- * Set readsize to the maximum size we can handle in one readraw.
-- */
--
-- readsize = 0xFFFF;
--
-- while (total < size) {
-- readsize = MIN(readsize, size-total);
--
-- /* Issue a read and receive a reply */
--
-- if (!cli_issue_readraw(cli, fnum, offset, readsize, 0))
-- return -1;
--
-- if (!client_receive_smb(cli->fd, cli->inbuf, cli->timeout))
-- return -1;
--
-- size2 = smb_len(cli->inbuf);
--
-- if (size2 > readsize) {
-- DEBUG(5,("server returned more than we wanted!\n"));
-- return -1;
-- } else if (size2 < 0) {
-- DEBUG(5,("read return < 0!\n"));
-- return -1;
-- }
--
-- /* Copy data into buffer */
--
-- if (size2) {
-- p = cli->inbuf + 4;
-- memcpy(buf + total, p, size2);
-- }
--
-- total += size2;
-- offset += size2;
--
-- /*
-- * If the server returned less than we asked for we're at EOF.
-- */
--
-- if (size2 < readsize)
-- break;
-- }
--
-- return total;
--}
--#endif
--
- /****************************************************************************
- Issue a single SMBwrite and don't wait for a reply.
- ****************************************************************************/
-diff --git source/smbd/process.c source/smbd/process.c
-index 5946989..ed34e9b 100644
---- source/smbd/process.c
-+++ source/smbd/process.c
-@@ -120,9 +120,7 @@ static bool valid_packet_size(size_t len)
- if (len > (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE)) {
- DEBUG(0,("Invalid packet length! (%lu bytes).\n",
- (unsigned long)len));
-- if (len > BUFFER_SIZE + (SAFETY_MARGIN/2)) {
-- return false;
-- }
-+ return false;
- }
- return true;
- }
-diff --git source/utils/smbfilter.c source/utils/smbfilter.c
-index e128e1c..d274e09 100644
---- source/utils/smbfilter.c
-+++ source/utils/smbfilter.c
-@@ -171,7 +171,8 @@ static void filter_child(int c, struct sockaddr_storage *dest_ss)
- if (c != -1 && FD_ISSET(c, &fds)) {
- size_t len;
- if (!NT_STATUS_IS_OK(receive_smb_raw(
-- c, packet, 0, 0, &len))) {
-+ c, packet, sizeof(packet),
-+ 0, 0, &len))) {
- d_printf("client closed connection\n");
- exit(0);
- }
-@@ -184,7 +185,8 @@ static void filter_child(int c, struct sockaddr_storage *dest_ss)
- if (s != -1 && FD_ISSET(s, &fds)) {
- size_t len;
- if (!NT_STATUS_IS_OK(receive_smb_raw(
-- s, packet, 0, 0, &len))) {
-+ s, packet, sizeof(packet),
-+ 0, 0, &len))) {
- d_printf("server closed connection\n");
- exit(0);
- }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/series new/patches/series
--- old/patches/series 2008-05-28 12:43:35.000000000 +0200
+++ new/patches/series 2008-07-03 12:55:19.000000000 +0200
@@ -5,7 +5,7 @@
# allows quilt to work in the usual way (= outside of our RPM spec file).
# Samba patches from upstream, svnanon.Samba.org
-samba.org/CVE-2008-1105_3.2.diff -p0
+
# SuSE specific changes
# disabled -> WIP lmuelle
@@ -19,7 +19,7 @@
suse/Makefile.in-libwbclient_static.diff -p0 # create static lib too
suse/net-kdc-lookup.diff -p0 # perform dns-only lookup for kdcs
suse/winbindd_cache_doname_twice.diff -p0 # Remove duplicate domain name when user SID in cache, bug 336854
-suse/printing_fix_buffer_overflow_warning.patch -p0
+suse/configure.diff -p0 # Work around bad use of autoconf interna
# 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/configure.diff new/patches/suse/configure.diff
--- old/patches/suse/configure.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/suse/configure.diff 2008-07-03 12:54:32.000000000 +0200
@@ -0,0 +1,76 @@
+Author: Andreas Schwab <schwab at suse dot de>
+Subject: Work around bad use of autoconf interna.
+Reported upstream: No
+Fixed upstream: No
+
+--- source/lib/replace/autoconf-2.60.m4 2008/06/30 14:45:07 1.1
++++ source/lib/replace/autoconf-2.60.m4 2008/06/30 14:48:04
+@@ -180,31 +180,55 @@ AC_DEFUN([AC_PROG_CC_C99],
+ # Enable extensions on systems that normally disable them,
+ # typically due to standards-conformance issues.
+ AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
+-[
+- AC_BEFORE([$0], [AC_COMPILE_IFELSE])
+- AC_BEFORE([$0], [AC_RUN_IFELSE])
++[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
++AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
+
+- AC_REQUIRE([AC_GNU_SOURCE])
+- AC_REQUIRE([AC_AIX])
+- AC_REQUIRE([AC_MINIX])
++ AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
++ if test "$MINIX" = yes; then
++ AC_DEFINE([_POSIX_SOURCE], [1],
++ [Define to 1 if you need to in order for `stat' and other
++ things to work.])
++ AC_DEFINE([_POSIX_1_SOURCE], [2],
++ [Define to 2 if the system does not provide POSIX.1 features
++ except with this defined.])
++ AC_DEFINE([_MINIX], [1],
++ [Define to 1 if on MINIX.])
++ fi
+
+ AH_VERBATIM([__EXTENSIONS__],
+-[/* Enable extensions on Solaris. */
+-#ifndef __EXTENSIONS__
+-# undef __EXTENSIONS__
++[/* Enable extensions on AIX 3, Interix. */
++#ifndef _ALL_SOURCE
++# undef _ALL_SOURCE
++#endif
++/* Enable GNU extensions on systems that have them. */
++#ifndef _GNU_SOURCE
++# undef _GNU_SOURCE
+ #endif
++/* Enable threading extensions on Solaris. */
+ #ifndef _POSIX_PTHREAD_SEMANTICS
+ # undef _POSIX_PTHREAD_SEMANTICS
+-#endif])
++#endif
++/* Enable extensions on HP NonStop. */
++#ifndef _TANDEM_SOURCE
++# undef _TANDEM_SOURCE
++#endif
++/* Enable general extensions on Solaris. */
++#ifndef __EXTENSIONS__
++# undef __EXTENSIONS__
++#endif
++])
+ AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
+ [ac_cv_safe_to_define___extensions__],
+ [AC_COMPILE_IFELSE(
+- [AC_LANG_PROGRAM([
++ [AC_LANG_PROGRAM([[
+ # define __EXTENSIONS__ 1
+- AC_INCLUDES_DEFAULT])],
++ ]AC_INCLUDES_DEFAULT])],
+ [ac_cv_safe_to_define___extensions__=yes],
+ [ac_cv_safe_to_define___extensions__=no])])
+ test $ac_cv_safe_to_define___extensions__ = yes &&
+ AC_DEFINE([__EXTENSIONS__])
++ AC_DEFINE([_ALL_SOURCE])
++ AC_DEFINE([_GNU_SOURCE])
+ AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
+-])
++ AC_DEFINE([_TANDEM_SOURCE])
++])# AC_USE_SYSTEM_EXTENSIONS
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 2008-05-23 16:38:32.000000000 +0200
+++ new/patches/suse/get_printing_ticket.diff 2008-07-01 11:51:02.000000000 +0200
@@ -16,7 +16,7 @@
BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ bin/tdbbackup@EXEEXT@ \
bin/nmblookup@EXEEXT@ bin/pdbedit@EXEEXT@ bin/tdbdump@EXEEXT@ \
bin/tdbtool@EXEEXT@
-@@ -1373,6 +1374,10 @@ bin/smbspool@EXEEXT@: $(BINARY_PREREQS)
+@@ -1370,6 +1371,10 @@ bin/smbspool@EXEEXT@: $(BINARY_PREREQS)
@$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
$(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@
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 2008-05-23 16:40:31.000000000 +0200
+++ new/patches/suse/Makefile.in-libwbclient_static.diff 2008-07-01 11:51:13.000000000 +0200
@@ -5,7 +5,7 @@
===================================================================
--- source/Makefile.in.orig
+++ source/Makefile.in
-@@ -2176,6 +2176,7 @@ installlibaddns: installdirs libaddns
+@@ -2168,6 +2168,7 @@ installlibaddns: installdirs libaddns
installlibwbclient: installdirs libwbclient
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) bin/libwbclient.@SHLIBEXT@ $(DESTDIR)$(LIBDIR)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/suse/printing_fix_buffer_overflow_warning.patch new/patches/suse/printing_fix_buffer_overflow_warning.patch
--- old/patches/suse/printing_fix_buffer_overflow_warning.patch 2008-04-21 14:58:40.000000000 +0200
+++ new/patches/suse/printing_fix_buffer_overflow_warning.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,204 +0,0 @@
-Subject: Fix a gcc 4.3 buffer overflow warning
-Author: Andreas Schneider
-Index: source/printing/lpq_parse.c
-===================================================================
---- source/printing/lpq_parse.c.orig
-+++ source/printing/lpq_parse.c
-@@ -845,17 +845,23 @@ static bool parse_lpq_nt(char *line,prin
- #define LPRNT_JOBSIZ 19
- #define LPRNT_IDSIZ 6
- #define LPRNT_SIZSIZ 9
-- typedef struct {
-- char owner[LPRNT_OWNSIZ];
-- char space1;
-- char status[LPRNT_STATSIZ];
-- char space2;
-- char jobname[LPRNT_JOBSIZ];
-- char space3;
-- char jobid[LPRNT_IDSIZ];
-- char space4;
-- char size[LPRNT_SIZSIZ];
-- char terminator;
-+
-+#define LPRNT_LEN LPRNT_OWNSIZ + 1 + LPRNT_STATSIZ + 1 + LPRNT_JOBSIZ + 1 + LPRNT_IDSIZ + 1 + LPRNT_SIZSIZ + 1
-+
-+ typedef union {
-+ char in[LPRNT_LEN];
-+ struct {
-+ char owner[LPRNT_OWNSIZ];
-+ char space1;
-+ char status[LPRNT_STATSIZ];
-+ char space2;
-+ char jobname[LPRNT_JOBSIZ];
-+ char space3;
-+ char jobid[LPRNT_IDSIZ];
-+ char space4;
-+ char size[LPRNT_SIZSIZ];
-+ char terminator;
-+ } out;
- } nt_lpq_line;
-
- nt_lpq_line parse_line;
-@@ -863,46 +869,46 @@ static bool parse_lpq_nt(char *line,prin
- #define LPRNT_WAITING "Waiting"
- #define LPRNT_PAUSED "Paused"
-
-- memset(&parse_line, '\0', sizeof(parse_line));
-- strncpy((char *) &parse_line, line, sizeof(parse_line) -1);
-+ memset(parse_line.in, '\0', LPRNT_LEN);
-+ strncpy(parse_line.in, line, LPRNT_LEN - 1);
-
-- if (strlen((char *) &parse_line) != sizeof(parse_line) - 1) {
-+ if (strlen(parse_line.in) != LPRNT_LEN - 1) {
- return False;
- }
-
- /* Just want the first word in the owner field - the username */
-- if (strchr_m(parse_line.owner, ' ')) {
-- *(strchr_m(parse_line.owner, ' ')) = '\0';
-+ if (strchr_m(parse_line.out.owner, ' ')) {
-+ *(strchr_m(parse_line.out.owner, ' ')) = '\0';
- } else {
-- parse_line.space1 = '\0';
-+ parse_line.out.space1 = '\0';
- }
-
- /* Make sure we have an owner */
-- if (!strlen(parse_line.owner)) {
-+ if (!strlen(parse_line.out.owner)) {
- return False;
- }
-
- /* Make sure the status is valid */
-- parse_line.space2 = '\0';
-- trim_char(parse_line.status, '\0', ' ');
-- if (!strequal(parse_line.status, LPRNT_PRINTING) &&
-- !strequal(parse_line.status, LPRNT_PAUSED) &&
-- !strequal(parse_line.status, LPRNT_WAITING)) {
-+ parse_line.out.space2 = '\0';
-+ trim_char(parse_line.out.status, '\0', ' ');
-+ if (!strequal(parse_line.out.status, LPRNT_PRINTING) &&
-+ !strequal(parse_line.out.status, LPRNT_PAUSED) &&
-+ !strequal(parse_line.out.status, LPRNT_WAITING)) {
- return False;
- }
-
-- parse_line.space3 = '\0';
-- trim_char(parse_line.jobname, '\0', ' ');
-+ parse_line.out.space3 = '\0';
-+ trim_char(parse_line.out.jobname, '\0', ' ');
-
-- buf->job = atoi(parse_line.jobid);
-+ buf->job = atoi(parse_line.out.jobid);
- buf->priority = 0;
-- buf->size = atoi(parse_line.size);
-+ buf->size = atoi(parse_line.out.size);
- buf->time = time(NULL);
-- fstrcpy(buf->fs_user, parse_line.owner);
-- fstrcpy(buf->fs_file, parse_line.jobname);
-- if (strequal(parse_line.status, LPRNT_PRINTING)) {
-+ fstrcpy(buf->fs_user, parse_line.out.owner);
-+ fstrcpy(buf->fs_file, parse_line.out.jobname);
-+ if (strequal(parse_line.out.status, LPRNT_PRINTING)) {
- buf->status = LPQ_PRINTING;
-- } else if (strequal(parse_line.status, LPRNT_PAUSED)) {
-+ } else if (strequal(parse_line.out.status, LPRNT_PAUSED)) {
- buf->status = LPQ_PAUSED;
- } else {
- buf->status = LPQ_QUEUED;
-@@ -928,17 +934,23 @@ static bool parse_lpq_os2(char *line,pri
- #define LPROS2_SIZSIZ 8
- #define LPROS2_STATSIZ 12
- #define LPROS2_OWNSIZ 12
-- typedef struct {
-- char jobid[LPROS2_IDSIZ];
-- char space1[2];
-- char jobname[LPROS2_JOBSIZ];
-- char space2[14];
-- char size[LPROS2_SIZSIZ];
-- char space3[4];
-- char status[LPROS2_STATSIZ];
-- char space4[4];
-- char owner[LPROS2_OWNSIZ];
-- char terminator;
-+
-+#define LPROS2_LEN LPROS2_IDSIZ + 2 + LPROS2_JOBSIZ + 14 + LPROS2_SIZSIZ + 4 + LPROS2_STATSIZ + 4 + LPROS2_OWNSIZ + 1
-+
-+ typedef union {
-+ char in[LPROS2_LEN];
-+ struct {
-+ char jobid[LPROS2_IDSIZ];
-+ char space1[2];
-+ char jobname[LPROS2_JOBSIZ];
-+ char space2[14];
-+ char size[LPROS2_SIZSIZ];
-+ char space3[4];
-+ char status[LPROS2_STATSIZ];
-+ char space4[4];
-+ char owner[LPROS2_OWNSIZ];
-+ char terminator;
-+ } out;
- } os2_lpq_line;
-
- os2_lpq_line parse_line;
-@@ -946,43 +958,43 @@ static bool parse_lpq_os2(char *line,pri
- #define LPROS2_WAITING "Queued"
- #define LPROS2_PAUSED "Paused"
-
-- memset(&parse_line, '\0', sizeof(parse_line));
-- strncpy((char *) &parse_line, line, sizeof(parse_line) -1);
-+ memset(parse_line.in, '\0', LPROS2_LEN);
-+ strncpy(parse_line.in, line, LPROS2_LEN - 1);
-
-- if (strlen((char *) &parse_line) != sizeof(parse_line) - 1) {
-+ if (strlen(parse_line.in) != LPROS2_LEN - 1) {
- return False;
- }
-
- /* Get the jobid */
-- buf->job = atoi(parse_line.jobid);
-+ buf->job = atoi(parse_line.out.jobid);
-
- /* Get the job name */
-- parse_line.space2[0] = '\0';
-- trim_char(parse_line.jobname, '\0', ' ');
-- fstrcpy(buf->fs_file, parse_line.jobname);
-+ parse_line.out.space2[0] = '\0';
-+ trim_char(parse_line.out.jobname, '\0', ' ');
-+ fstrcpy(buf->fs_file, parse_line.out.jobname);
-
- buf->priority = 0;
-- buf->size = atoi(parse_line.size);
-+ buf->size = atoi(parse_line.out.size);
- buf->time = time(NULL);
-
- /* Make sure we have an owner */
-- if (!strlen(parse_line.owner)) {
-+ if (!strlen(parse_line.out.owner)) {
- return False;
- }
-
- /* Make sure we have a valid status */
-- parse_line.space4[0] = '\0';
-- trim_char(parse_line.status, '\0', ' ');
-- if (!strequal(parse_line.status, LPROS2_PRINTING) &&
-- !strequal(parse_line.status, LPROS2_PAUSED) &&
-- !strequal(parse_line.status, LPROS2_WAITING)) {
-+ parse_line.out.space4[0] = '\0';
-+ trim_char(parse_line.out.status, '\0', ' ');
-+ if (!strequal(parse_line.out.status, LPROS2_PRINTING) &&
-+ !strequal(parse_line.out.status, LPROS2_PAUSED) &&
-+ !strequal(parse_line.out.status, LPROS2_WAITING)) {
- return False;
- }
-
-- fstrcpy(buf->fs_user, parse_line.owner);
-- if (strequal(parse_line.status, LPROS2_PRINTING)) {
-+ fstrcpy(buf->fs_user, parse_line.out.owner);
-+ if (strequal(parse_line.out.status, LPROS2_PRINTING)) {
- buf->status = LPQ_PRINTING;
-- } else if (strequal(parse_line.status, LPROS2_PAUSED)) {
-+ } else if (strequal(parse_line.out.status, LPROS2_PAUSED)) {
- buf->status = LPQ_PAUSED;
- } else {
- buf->status = LPQ_QUEUED;
++++++ samba-3.2.0rc1.tar.bz2 -> samba-3.2.0.tar.bz2 ++++++
samba/samba-3.2.0rc1.tar.bz2 samba/samba-3.2.0.tar.bz2 differ: byte 11, line 1
++++++ vendor-files.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/config/sysconfig.dhcp-samba-client new/vendor-files/config/sysconfig.dhcp-samba-client
--- old/vendor-files/config/sysconfig.dhcp-samba-client 2007-09-19 20:17:58.000000000 +0200
+++ new/vendor-files/config/sysconfig.dhcp-samba-client 2008-06-18 22:34:07.000000000 +0200
@@ -1,3 +1,5 @@
+## Path: Network/DHCP/DHCP client
+## Description: DHCP client configuration
## Type: yesno
## Default: yes
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/init/nmb new/vendor-files/init/nmb
--- old/vendor-files/init/nmb 2007-11-13 12:48:16.000000000 +0100
+++ new/vendor-files/init/nmb 2008-07-02 11:35:18.000000000 +0200
@@ -10,7 +10,7 @@
#
### BEGIN INIT INFO
# Provides: nmb
-# Required-Start: $network syslog
+# Required-Start: $network $syslog
# Required-Stop:
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/init/smb new/vendor-files/init/smb
--- old/vendor-files/init/smb 2007-11-13 12:48:16.000000000 +0100
+++ new/vendor-files/init/smb 2008-07-02 11:35:18.000000000 +0200
@@ -10,7 +10,7 @@
#
### BEGIN INIT INFO
# Provides: smb
-# Required-Start: $network $remote_fs syslog
+# Required-Start: $network $remote_fs $syslog
# Should-Start: cupsd winbind nmb
# Required-Stop:
# Default-Start: 3 5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/init/winbind new/vendor-files/init/winbind
--- old/vendor-files/init/winbind 2007-11-13 12:48:16.000000000 +0100
+++ new/vendor-files/init/winbind 2008-07-02 11:35:18.000000000 +0200
@@ -10,7 +10,7 @@
#
### BEGIN INIT INFO
# Provides: winbind
-# Required-Start: $network syslog
+# Required-Start: $network $remote_fs $syslog
# Should-Start: nmb
# Required-Stop:
# Default-Start: 3 5
@@ -89,7 +89,7 @@
echo -n "Reloading Samba ${curr_sam} WINBIND daemon "
checkproc -p ${PID_FILE} ${WINBINDD_BIN} || \
echo -n >&2 " Warning: daemon not running. "
- killproc -p ${PID_FILE} -HUP ${WINBINDD_BIN}
+ killproc -p ${PID_FILE} -g -HUP ${WINBINDD_BIN}
rc_status -v
;;
status)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/tools/dhcpcd-hook-samba new/vendor-files/tools/dhcpcd-hook-samba
--- old/vendor-files/tools/dhcpcd-hook-samba 2007-09-19 20:17:57.000000000 +0200
+++ new/vendor-files/tools/dhcpcd-hook-samba 2008-06-26 20:58:01.000000000 +0200
@@ -37,6 +37,9 @@
configname="$1"
shift
interface="$1"
+if [ $interface = "lo" ]; then
+ exit 0
+fi
shift
# And shift away the '-o'.
shift
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 2008-05-30 19:23:38.000000000 +0200
+++ new/vendor-files/tools/package-data 2008-07-03 14:36:38.000000000 +0200
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="1795"
+SAMBA_PACKAGE_SVN_VERSION="1842"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/tools/samba-winbindd new/vendor-files/tools/samba-winbindd
--- old/vendor-files/tools/samba-winbindd 2007-09-19 20:17:57.000000000 +0200
+++ new/vendor-files/tools/samba-winbindd 2008-06-26 20:58:01.000000000 +0200
@@ -28,6 +28,9 @@
configname="$1"
shift
interface="$1"
+if [ $interface = "lo" ]; then
+ exit 0
+fi
shift
# And shift away the '-o'.
shift
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org