Hello community,
here is the log from the commit of package samba for openSUSE:Factory
checked in at Fri Jan 9 01:56:04 CET 2009.
--------
--- samba/samba.changes 2008-12-04 18:16:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/samba/samba.changes 2009-01-05 13:30:08.000000000 +0100
@@ -1,0 +2,141 @@
+Mon Jan 5 13:27:03 CET 2009 - lmuelle@suse.de
+
+- Update to 3.2.7.
+ + Samba 3.2.0 to 3.2.6 can potentially give root filesystem access
+ to older versions of smbclient; CVE-2009-0022; (bnc#460764).
+
+-------------------------------------------------------------------
+Sat Dec 27 13:27:24 CET 2008 - jmcdonough@suse.de
+
+- Samba 3.2.0 to 3.2.6 can potentially give root filesystem access
+ to older versions of smbclient; CVE-2009-0022; (bnc#460764).
+
+-------------------------------------------------------------------
+Thu Dec 25 07:59:49 CET 2008 - boyang@suse.de
+
+- Fix nmbstatus dipslay when workgroup parameter is given; (bnc#459785).
+
+-------------------------------------------------------------------
+Thu Dec 25 07:36:24 CET 2008 - boyang@suse.de
+
+- Fix Mounting failure when there is white spaces in service; (bnc#460793).
+
+-------------------------------------------------------------------
+Fri Dec 12 17:49:48 CET 2008 - lmuelle@suse.de
+
+- Fix all remaining conditional macro calls; (bnc#456469).
+
+-------------------------------------------------------------------
+Fri Dec 12 15:50:33 CET 2008 - anschneider@suse.de
+
+- Add IPv6 support for mount.cifs.
+
+-------------------------------------------------------------------
+Wed Dec 10 23:14:12 CET 2008 - lmuelle@suse.de
+
+- Update to 3.2.6.
+ + Fix potential segfault in vfs_tsmsm.
+ + Don't list the domain twice when expanding internal aliases.
+ + Fix the output of "getent group" when "winbind use default domain = yes"
+ with "security = ads".
+ + Add domain prefix to username in lookup_groupmem().
+ + Prevent negative GM/ cache entries due to broken connections.
+ + Fix crash in sync_eventlog_params().
+ + Fix timeouts when calling 'getgrent'.
+ + BUG 1254: Fix "write list" in setups using "security = share".
+ + BUG 5080: Fix access to cups-printers with cups 1.3.4.
+ + BUG 5737: Fix Winbind crash in an unusual failure mode.
+ + BUG 5783: Fix FindFirst where search pattern equals the mangled filename.
+ + BUG 5790: Fix returning of STATUS_OBJECT_NAME_NOT_FOUND on set file
+ disposition.
+ + BUG 5797: Fix moving of readonly files.
+ + BUG 5814: Fix Winbind crash bug while doing "rescan_trusted_domain".
+ + BUG 5818: Sort ACEs in smbcacl output properly and honor inheritance.
+ + BUG 5825: Fix account locking with LDAP backend.
+ + BUG 5826: Fix truncated filenames when accessing old servers.
+ + BUG 5889: Fix "delete veto files = no".
+ + BUG 5891: Fix smbd crash when viewing the eventlog exported by "eventlog
+ list".
+ + BUG 5900: Fix vfs_readonly.
+ + BUG 5903: Fix vfs_streams_xattr breaking contents of files.
+ + BUG 5904: Fix libnss_wins causing SIGABRT while servicing getaddrinfo()
+ request.
+ + BUG 5914: Fix build failure: redefinition of struct name_list.
+ + BUG 5937: Fix filenames with "*" char hiding other files.
+ + BUG 5953: Fix smbclient crashes.
+ + Fix rename_open_files.
+ + Restructure VFS SMB traffic analyzer VFS module.
+ + Correctly fix smbclient to terminate on eof from server.
+ + Unify access checks for lsa server functions.
+ + Remove the requirement for ldap call made as root.
+ + Cope with MAXIMUM_ALLOWED_ACCESS requests when opening handles.
+ + Fix net rpc vampire, based on an *amazing* piece of debugging work by
+ "Cooper S. Blake" .
+ + Fix Coverity IDs 456, 574, 592, 606 and 607.
+ + Fix net rpc vampire.
+ + Use the same prerequisite for DDNS update as Windows XP.
+ + Make "lwinet ads dns register" honor the "interfaces" parameter.
+ + Fix extended DN parse error when AD object does not have a SID.
+ + BUG 5888: Fix PNP_GetHwProfInfo().
+ + BUG 5957: Do not abort rename process on valid rename script.
+ + BUG 5898: Fix 'net rpc shutdown'.
+ + Fix duplicate installation of cifs.upcall.
+ + Fix _srvsvc_NetShareAdd segfault.
+ + Ensure consistency when reporting password complexity.
+ + Fix _lsa_GetUserName.
+ + Fix access check in _samr_QuerySecurity().
+ + _samr_DeleteUser needs to wipe out the user_handle on success.
+ + NetGroupEnum_r needs to handle servers with no groups.
+ + Search for gpfs functions in both libgpfs_gpl.so an libgpfs.so.
+ + BUG 5908: Fix internal change notify on shared directory.
+ + BUG 5135 and 5446: Prevent calling POSIX ACL vfs methods on zfs share.
+ + BUG 5929: Fix building of vfs_prealloc with option --with-cluster-support
+ and GPFS.
+ + Add new VFS module to analyze SMB traffic
+ + BUG 5928: Fix 'testparm --version'.
+ + Have uppercase_string return success on NULL pointer in mount.cifs.
+ + Make mount.cifs return codes match the return codes for /bin/mount.
+ + Use lock/unlock_mtab scheme from util-linux-ng mount prog in mount.cifs.
+ + BUG 5778: Check if strlcpy and strlcat are already defined.
+ + BUG 5840: Fix segfault in "rpcclient lsaaddacctrights".
+ + BUG 5860: Fix nasty error message for overlong strings in safe_strcpy.
+ + Fix a potential NULL deref in found by the IBM Checker.
+ + Fix an uninitialized variable found by the IBM Checker.
+ + Fix an unlikely memleak found by the IBM Checker.
+ + Fix some missing error handlings.
+ + Add workaround for domain joins using a netbios name which is different
+ from the hostname.
+ + Fix crash bug when freeing a non-malloc'ed buffer if the client sends a
+ non-encrypted packet with the crypto state set.
+ + Fix trans2findfirst for the large directory optimization.
+ + Fix checking for presence of cups-devel and correct cups-devel test for
+ HAVE_IPRINT.
+ + BUG 5805: Don't close stdout when calling setup_logging multiple times.
+ + Fix setting of trust password using 'net rpc trustdom add'.
+ + Fix several issues in vfs_streams_xattr and vfs_stream_depot.
+ + Return an error instead of crashing when no realm is given (trigerred by
+ "net ads info -S 127.8.7.6" (where 127.8.7.6 doesn't exist) and
+ "disable netbios = yes").
+ + Fix the new vfs_smb_traffic_analyzer build for static links.
+ + BUG 5901: Fix default for streams_depot location.
+ + Fix several build warnings.
+ + Delete the krb5 ccname variable from the PAM environment if set.
+ + Fix circular dependency error with autoconf 2.6.3.
+ + Add @CIFSUPCALL_PROGS@ to "all" target so cifs.upcall gets built at
+ compile time rather than install time.
+ + BUG 5906: Fix Winbind crash when calling 'getent group'.
+ + Fix logging to syslog.
+ + Allow SYSLOG_FACILITY to be modified with a new configure option called
+ --with-syslog-facility.
+ + BUG 5909: Fix MS-DFS on Vista clients.
+ + BUG 5944: Fix starting of nmbd with "socket address" set to "".
+ + Fix segfault on startup with trusted domains.
+ + Re-add "winbind:ignore domains" parameter.
+ + Avoid freeing fsp twice when opening new_file fails (Debian #431696).
+
+-------------------------------------------------------------------
+Wed Dec 10 19:24:29 CET 2008 - anschneider@suse.de
+
+- Fix the conditional macro to start smbfs by default; (bnc#456469).
+
+-------------------------------------------------------------------
@@ -6,0 +148,6 @@
+Wed Dec 3 12:17:40 CET 2008 - anschneider@suse.de
+
+- Use %__install macro to install files with the right permissions
+ instead of cp.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
samba-3.2.5.tar.bz2
New:
----
samba-3.2.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba-doc.spec ++++++
--- /var/tmp/diff_new_pack.K26368/_old 2009-01-09 01:55:34.000000000 +0100
+++ /var/tmp/diff_new_pack.K26368/_new 2009-01-09 01:55:34.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package samba-doc (Version 3.2.5)
+# spec file for package samba-doc (Version 3.2.7)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,12 +20,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.5
+%define samba_ver 3.2.7
%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.5
+Version: 3.2.7
Release: 1
Summary: Samba Documentation
Group: Documentation/Other
@@ -96,7 +96,7 @@
sed -e "s/VENDOR/%{VENDOR}/g" "${file}" >"${file}.new" && \
mv "${file}.new" "${file}"
done
-cp -p vendor-files/tools/get_printing_ticket.c source/client/
+%__install -m 0644 vendor-files/tools/get_printing_ticket.c source/client/get_printing_ticket.c
# Create and add vendor suffix
test -f vendor-files/tools/package-data && \
. vendor-files/tools/package-data
@@ -207,9 +207,9 @@
${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System
# utility scripts
scripts="creategroup mksmbpasswd.sh"
-mkdir -p examples/scripts
+%__install -d -m 0755 examples/scripts
for i in $scripts; do
- cp -p "source/script/${i}" examples/scripts
+ %__install -m 0755 "source/script/${i}" examples/scripts/${i}
done
# configuration files
pushd vendor-files
@@ -218,10 +218,10 @@
echo "# samba-doc package is installed." >>config/smb.conf
echo "# Date: $( date -I)" >>config/smb.conf
grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf
-cp -p config/smb.conf.vendor ../examples/smb.conf.%{VENDOR}
+%__install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR}
# SuSEhelp files
-cp -p docu/Samba.desktop ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System
-cp -p docu/manpages.html ../docs/htmldocs
+%__install -m 0644 docu/Samba.desktop ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop
+%__install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html
popd
for file in Samba3-ByExample Samba3-Developers-Guide Samba3-HOWTO; do
touch "${RPM_BUILD_ROOT}/%{SWATDIR}/help/${file}"
@@ -229,7 +229,10 @@
cp -a swat/help/welcome.html "${RPM_BUILD_ROOT}/%{SWATDIR}/help"
# pam_smbpass is missing
cp -a source/pam_smbpass/samples examples/pam_smbpass
-cp -p source/pam_smbpass/{CHANGELOG,INSTALL,README,TODO} examples/pam_smbpass/
+%__install -m 0644 source/pam_smbpass/CHANGELOG examples/pam_smbpass/CHANGELOG
+%__install -m 0644 source/pam_smbpass/INSTALL examples/pam_smbpass/INSTALL
+%__install -m 0644 source/pam_smbpass/README examples/pam_smbpass/README
+%__install -m 0644 source/pam_smbpass/TODO examples/pam_smbpass/TODO
mv COPYING Manifest README Read-Manifest-Now Roadmap WHATSNEW.txt ${RPM_BUILD_ROOT}/%{DOCDIR}/
# this is empty
rm -rf docs/yodldocs
@@ -316,8 +319,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%changelog
* Thu Jan 24 2008 lmuelle@suse.de
++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.K26368/_old 2009-01-09 01:55:34.000000000 +0100
+++ /var/tmp/diff_new_pack.K26368/_new 2009-01-09 01:55:34.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package samba (Version 3.2.5)
+# spec file for package samba (Version 3.2.7)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -41,7 +41,7 @@
%if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version}
BuildRequires: krb5-devel openldap-devel
%endif
-%define samba_ver 3.2.5
+%define samba_ver 3.2.7
%define samba_ver_suffix %nil
%define samba_ver_full %{samba_ver}%{samba_ver_suffix}
%define vscan_ver 0.3.6b
@@ -50,7 +50,7 @@
Group: Productivity/Networking/Samba
Url: http://www.samba.org/
AutoReqProv: on
-Version: 3.2.5
+Version: 3.2.7
Release: 1
Requires: samba-client >= %{version}
%if 0%{?suse_version} > 1030
@@ -128,8 +128,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%package client
License: GPL v3 or later
@@ -165,8 +165,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@@ -186,8 +186,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%endif
%if 0%{?suse_version} && 0%{?suse_version} < 1001
@@ -216,8 +216,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%endif
@@ -243,8 +243,8 @@
--------
Jeremy Allison <jra at samba dot org>
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%if %{make_utils}
@@ -289,8 +289,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -324,8 +324,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%else
@@ -338,8 +338,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%endif
This package includes the smbclient library.
@@ -372,8 +372,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%package -n libnetapi0
License: GPL v3 or later
@@ -391,8 +391,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%package -n libnetapi-devel
License: GPL v3 or later
@@ -411,8 +411,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -438,8 +438,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%else
@@ -452,8 +452,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%endif
This package includes the smbsharemodes library.
@@ -483,8 +483,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%if %{make_ldapsmb}
@@ -504,8 +504,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%package -n libtalloc-devel
License: LGPL v3 or later
@@ -524,8 +524,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%package -n libtdb1
License: LGPL v3 or later
@@ -543,8 +543,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%package -n libtdb-devel
License: LGPL v3 or later
@@ -563,8 +563,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%package -n libwbclient0
License: GPL v3 or later
@@ -582,8 +582,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%package -n libwbclient-devel
License: GPL v3 or later
@@ -602,8 +602,8 @@
--------
The Samba Team
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%package -n ldapsmb
License: GPL v2 or later
@@ -611,7 +611,7 @@
Group: Productivity/Networking/Samba
AutoReqProv: on
Version: 1.34b
-Release: 245
+Release: 246
Requires: perl-ldap
%description -n ldapsmb
@@ -624,8 +624,8 @@
--------
Guenther Deschner <guenther at deschner dot de>
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 920
@@ -648,8 +648,8 @@
--------
Steve French <sfrench at Samba dot org>
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%endif
%if %{make_vscan}
@@ -660,7 +660,7 @@
Group: Productivity/Networking/Samba
AutoReqProv: on
Version: 0.3.6b
-Release: 249
+Release: 250
Provides: samba3-vscan = 0.3.6b
Obsoletes: samba3-vscan
Requires: samba = %{samba_ver}
@@ -678,8 +678,8 @@
--------
Rainer Link
-Source Timestamp: 2022
-Branch : 3.2.5
+Source Timestamp: 2042
+Branch : 3.2.7
%endif
@@ -715,7 +715,7 @@
sed -e "s/VENDOR/%{VENDOR}/g" "${file}" >"${file}.new" && \
mv "${file}.new" "${file}"
done
-cp -p vendor-files/tools/get_printing_ticket.c source/client/
+%__install -m 0644 vendor-files/tools/get_printing_ticket.c source/client/get_printing_ticket.c
# Create and add vendor suffix
test -f vendor-files/tools/package-data && \
. vendor-files/tools/package-data
@@ -857,7 +857,7 @@
%if %{make_devel}
export NO_BRP_STRIP_DEBUG="true"
%endif
-mkdir -p \
+%__install -d -m 0755 -p \
${RPM_BUILD_ROOT}/%{_sysconfdir}/{pam.d,xinetd.d,logrotate.d} \
${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema \
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/{if-{down,up}.d,scripts} \
@@ -893,9 +893,9 @@
LIBDIR=%{_libdir}/samba
# utility scripts
scripts="creategroup mksmbpasswd.sh"
-mkdir -p examples/scripts
+%__install -d -m 0755 examples/scripts
for i in $scripts; do
- cp -p "source/script/${i}" examples/scripts
+ %__install -m 0755 "source/script/${i}" examples/scripts/${i}
done
# configuration files
pushd vendor-files
@@ -904,9 +904,9 @@
echo "# samba-doc package is installed." >>config/smb.conf
echo "# Date: $( date -I)" >>config/smb.conf
grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf
-cp -p config/smb.conf.vendor ../examples/smb.conf.%{VENDOR}
+%__install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR}
for file in smb.conf lmhosts smbusers smbpasswd smbfstab smbusers; do
- cp -p "config/${file}" ${RPM_BUILD_ROOT}/%{CONFIGDIR}/
+ %__install -m 0644 "config/${file}" ${RPM_BUILD_ROOT}/%{CONFIGDIR}/${file}
done
section_names=$( sed -ne 's/^\[\(.*\)\]$/\1/p' config/smb.conf)
for section in $section_names; do
@@ -926,7 +926,7 @@
%endif
startScripts="smb nmb smbfs winbind"
for script in ${startScripts}; do
- cp -p "init/${script}${scriptSuffix}" \
+ %__install -m 0755 "init/${script}${scriptSuffix}" \
"${RPM_BUILD_ROOT}/%{INITDIR}/${script}"
ln -s "%{INITDIR}/${script}" "${RPM_BUILD_ROOT}/%{_sbindir}/rc${script}"
done
@@ -938,22 +938,22 @@
init/template.xml \
>"${RPM_BUILD_ROOT}/%{_datadir}/omc/svcinfo.d/${script}.xml"
done
-cp -p tools/nmbstatus ${RPM_BUILD_ROOT}/%{_bindir}/
+%__install -m 0755 tools/nmbstatus ${RPM_BUILD_ROOT}/%{_bindir}/nmbstatus
pod2man tools/nmbstatus >${RPM_BUILD_ROOT}/%{_mandir}/man1/nmbstatus.1
# PDF generator
-cp -p tools/smbprngenpdf ${RPM_BUILD_ROOT}/%{_bindir}/
+%__install -p -m 0755 tools/smbprngenpdf ${RPM_BUILD_ROOT}/%{_bindir}/smbprngenpdf
touch ${RPM_BUILD_ROOT}/var/lock/subsys/smbfs
-cp -p config/swat.xinetd ${RPM_BUILD_ROOT}/%{_sysconfdir}/xinetd.d/swat
-cp -p config/samba.reg ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d/
+%__install -m 0644 config/swat.xinetd ${RPM_BUILD_ROOT}/%{_sysconfdir}/xinetd.d/swat
+%__install -m 0644 config/samba.reg ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d/samba.reg
%if 0%{?suse_version} && 0%{?suse_version} < 921
- cp -p config/samba.pamd ${RPM_BUILD_ROOT}/%{_sysconfdir}/pam.d/samba
+ %__install -m 0644 config/samba.pamd ${RPM_BUILD_ROOT}/%{_sysconfdir}/pam.d/samba
%else
- cp -p config/samba.pamd-common ${RPM_BUILD_ROOT}/%{_sysconfdir}/pam.d/samba
+ %__install -m 0644 config/samba.pamd-common ${RPM_BUILD_ROOT}/%{_sysconfdir}/pam.d/samba
%endif
-cp -p config/dhcp.conf ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf
-cp -p config/sysconfig.dhcp-samba-client ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/
+%__install -m 0644 config/dhcp.conf ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf
+%__install -m 0644 config/sysconfig.dhcp-samba-client ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client
for script in dhcpcd-hook-samba samba-winbindd smbfs; do
- cp -p "tools/${script}" "${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/"
+ %__install -m 0755 "tools/${script}" "${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/${script}"
done
# Create ghosts for the symlinks
for script in 21-dhcpcd-hook-samba 21-smbfs 55-samba-winbindd; do
@@ -961,9 +961,9 @@
done
# Install SuSEfirewall2 config files
%if 0%{?suse_version} && 0%{?suse_version} > 1020
-install -m 0644 -p config/sysconfig.firewall.netbios-server \
+%__install -m 0644 -p config/sysconfig.firewall.netbios-server \
%{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/netbios-server
-install -m 0644 -p config/sysconfig.firewall.samba-server \
+%__install -m 0644 -p config/sysconfig.firewall.samba-server \
%{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-server
%endif
# Add logrotate settings for nmbd and smbd only on systems newer than 8.1.
@@ -975,58 +975,61 @@
LOGROTATE_FILES="samba samba-winbind"
%endif
for file in ${LOGROTATE_FILES}; do
- cp -p logrotate/${file} ${RPM_BUILD_ROOT}/%{_sysconfdir}/logrotate.d/${file}
+ %__install -m 0644 logrotate/${file} ${RPM_BUILD_ROOT}/%{_sysconfdir}/logrotate.d/${file}
rm -f "${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file}"
touch "${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file}"
echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file}
done
-cp -p docu/README.vendor ${RPM_BUILD_ROOT}/%{DOCDIR}/README.%{VENDOR}
+%__install -m 0644 docu/README.vendor ${RPM_BUILD_ROOT}/%{DOCDIR}/README.%{VENDOR}
# Install mkinitrd scripts for boot process
%if 0%{?suse_version} > 1100
-%__install -d %{buildroot}/lib/mkinitrd/scripts
-%__install -m 755 mkinitrd/mkinitrd-boot.sh %{buildroot}/lib/mkinitrd/scripts/boot-cifs.sh
-%__install -m 755 mkinitrd/mkinitrd-setup.sh %{buildroot}/lib/mkinitrd/scripts/setup-cifs.sh
+%__install -d -m 0755 %{buildroot}/lib/mkinitrd/scripts
+%__install -m 0755 mkinitrd/mkinitrd-boot.sh %{buildroot}/lib/mkinitrd/scripts/boot-cifs.sh
+%__install -m 0755 mkinitrd/mkinitrd-setup.sh %{buildroot}/lib/mkinitrd/scripts/setup-cifs.sh
%endif
# SuSEhelp files
-cp -p docu/Samba.desktop ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System
-cp -p docu/manpages.html ../docs/htmldocs
+%__install -m 0644 docu/Samba.desktop ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop
+%__install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html
popd
-cp -p packaging/Debian/debian-unstable/samba-common.dhcp ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba-functions
+%__install -m 0755 packaging/Debian/debian-unstable/samba-common.dhcp ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba-functions
# libnss_wins.so
-install -m 0755 source/nsswitch/libnss_wins.so ${RPM_BUILD_ROOT}/%{_lib}/libnss_wins.so.2
+%__install -m 0755 source/nsswitch/libnss_wins.so ${RPM_BUILD_ROOT}/%{_lib}/libnss_wins.so.2
# winbind stuff
-install -m 0644 examples/pam_winbind/pam_winbind.conf ${RPM_BUILD_ROOT}/%{_sysconfdir}/security/
-install -m 0755 source/nsswitch/libnss_winbind.so ${RPM_BUILD_ROOT}/%{_lib}/libnss_winbind.so.2
+%__install -m 0644 examples/pam_winbind/pam_winbind.conf ${RPM_BUILD_ROOT}/%{_sysconfdir}/security/pam_winbind.conf
+%__install -m 0755 source/nsswitch/libnss_winbind.so ${RPM_BUILD_ROOT}/%{_lib}/libnss_winbind.so.2
# smbfilter
-cp -p source/bin/smbfilter ${RPM_BUILD_ROOT}/%{_bindir}/
+%__install -m 0755 source/bin/smbfilter ${RPM_BUILD_ROOT}/%{_bindir}/smbfilter
# smbget
-cp -p source/bin/smbget ${RPM_BUILD_ROOT}/%{_bindir}/
+%__install -m 0755 source/bin/smbget ${RPM_BUILD_ROOT}/%{_bindir}/smbget
# workaround for the common libs and modules destdir; fixed already upstream
for file in libnetapi libsmbclient libsmbsharemodes libtalloc libtdb libwbclient; do
mv ${RPM_BUILD_ROOT}/%{_libdir}/samba/${file}* \
${RPM_BUILD_ROOT}/%{_libdir}/
done
# install nsswitch-headers (for squid, etc. #FIXME)
-mkdir -p \
+%__install -d -m 0755 \
${RPM_BUILD_ROOT}/%{_includedir}/samba/nsswitch \
${RPM_BUILD_ROOT}/%{_includedir}/samba/winbindd
for file in winbind_client.h winbind_nss_config.h winbind_nss_linux.h; do
- cp -p "source/nsswitch/${file}" ${RPM_BUILD_ROOT}/%{_includedir}/samba/nsswitch/
+ %__install -m 0644 "source/nsswitch/${file}" ${RPM_BUILD_ROOT}/%{_includedir}/samba/nsswitch/${file}
done
for file in winbindd.h winbindd_proto.h; do
- cp -p "source/winbindd/${file}" ${RPM_BUILD_ROOT}/%{_includedir}/samba/winbindd/
+ %__install -m 0644 "source/winbindd/${file}" ${RPM_BUILD_ROOT}/%{_includedir}/samba/winbindd/${file}
done
# install smbtorture and other test-programs
%if %{make_utils}
-install -m 0755 source/bin/debug2html ${RPM_BUILD_ROOT}/%{_bindir}/
-install -m 0755 source/bin/log2pcap ${RPM_BUILD_ROOT}/%{_bindir}/
-install -m 0755 source/bin/smbtorture ${RPM_BUILD_ROOT}/%{_bindir}/
-install -m 0755 source/bin/talloctort ${RPM_BUILD_ROOT}/%{_bindir}/
-install -m 0755 source/bin/{msgtest,masktest,locktest*} ${RPM_BUILD_ROOT}/%{_bindir}/
-install -m 0755 source/bin/nsstest ${RPM_BUILD_ROOT}/%{_bindir}/
-install -m 0755 source/bin/vfstest ${RPM_BUILD_ROOT}/%{_bindir}/
+%__install -m 0755 source/bin/debug2html ${RPM_BUILD_ROOT}/%{_bindir}/debug2html
+%__install -m 0755 source/bin/log2pcap ${RPM_BUILD_ROOT}/%{_bindir}/log2pcap
+%__install -m 0755 source/bin/smbtorture ${RPM_BUILD_ROOT}/%{_bindir}/smbtorture
+%__install -m 0755 source/bin/talloctort ${RPM_BUILD_ROOT}/%{_bindir}/talloctort
+%__install -m 0755 source/bin/msgtest ${RPM_BUILD_ROOT}/%{_bindir}/msgtest
+%__install -m 0755 source/bin/maketest ${RPM_BUILD_ROOT}/%{_bindir}/maketest
+%__install -m 0755 source/bin/locktest ${RPM_BUILD_ROOT}/%{_bindir}/locktest
+%__install -m 0755 source/bin/nsstest ${RPM_BUILD_ROOT}/%{_bindir}/nsstest
+%__install -m 0755 source/bin/vfstest ${RPM_BUILD_ROOT}/%{_bindir}/vfstest
# install tdb tools
-#install -m 0755 source/tdb/{tdbtest,tdbtorture} ${RPM_BUILD_ROOT}/%{_bindir}/
+#%__install -m 0755 source/tdb/tdbtest ${RPM_BUILD_ROOT}/%{_bindir}/tdbtest
+#%__install -m 0755 source/tdb/tdbtorture ${RPM_BUILD_ROOT}/%{_bindir}/tdbtorture
%endif
%if %{make_vscan}
# install VSCAN-vfs-modules
@@ -1035,7 +1038,7 @@
LIBDIR=%{_libdir}/samba
%endif
%if %{make_ldapsmb}
-install -m 0700 ldapsmb-%{ldapsmb_ver}/ldapsmb ${RPM_BUILD_ROOT}/%{_sbindir}/
+%__install -m 0700 ldapsmb-%{ldapsmb_ver}/ldapsmb ${RPM_BUILD_ROOT}/%{_sbindir}/
cp -a ldapsmb-%{ldapsmb_ver}/ldapsmb.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5
%endif
# cups SMB support
@@ -1052,7 +1055,10 @@
%endif
# pam_smbpass is missing
cp -a source/pam_smbpass/samples examples/pam_smbpass
-cp -p source/pam_smbpass/{CHANGELOG,INSTALL,README,TODO} examples/pam_smbpass/
+%__install -m 0644 source/pam_smbpass/CHANGELOG examples/pam_smbpass/CHANGELOG
+%__install -m 0644 source/pam_smbpass/INSTALL examples/pam_smbpass/INSTALL
+%__install -m 0644 source/pam_smbpass/README examples/pam_smbpass/README
+%__install -m 0644 source/pam_smbpass/TODO examples/pam_smbpass/TODO
mv COPYING Manifest README Read-Manifest-Now Roadmap WHATSNEW.txt ${RPM_BUILD_ROOT}/%{DOCDIR}/
# this is empty
rm -rf docs/yodldocs
@@ -1103,8 +1109,8 @@
echo "${file#${RPM_BUILD_ROOT}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba
done
# copy the schema
-cp -p examples/LDAP/samba.schema ${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema/samba3.schema
-cp -p examples/LDAP/samba-nds.schema ${RPM_BUILD_ROOT}/%{_datadir}/samba/LDAP
+%__install -m 0644 examples/LDAP/samba.schema ${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema/samba3.schema
+%__install -m 0644 examples/LDAP/samba-nds.schema ${RPM_BUILD_ROOT}/%{_datadir}/samba/LDAP/samba-nds.schema
# Clean up installed doc if we have a noarch doc package
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000
while read file; do
@@ -1131,20 +1137,20 @@
/usr/sbin/groupadd -g 71 -o -r ntadmin 2>/dev/null || :
%preun
-%{?stop_on_removal smb nmb}
+%{?stop_on_removal:%{stop_on_removal smb nmb}}
%postun
-%{?restart_on_update nmb smb}
-%{?insserv_cleanup}
+%{?restart_on_update:%{restart_on_update nmb smb}}
+%{?insserv_cleanup:%{insserv_cleanup}}
%preun client
-%{?stop_on_removal smbfs}
+%{?stop_on_removal:%{stop_on_removal smbfs}}
%post client
/sbin/ldconfig
if [ ${1:-0} -eq 1 ]; then
# Only insserv smbfs if we're not in update mode.
-%{?fillup_and_insserv -fy smbfs}
+%{?fillup_and_insserv:%{fillup_and_insserv -fy smbfs}}
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-dhcpcd-hook-samba
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/smbfs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-smbfs
@@ -1164,11 +1170,11 @@
if ! test -e %{_bindir}/get_printing_ticket; then
ln -fs %{_bindir}/smbspool %{_libdir}/cups/backend/smb
fi
-%{?fillup_only -nsd dhcp samba-client network}
+%{?fillup_only:%{fillup_only -nsd dhcp samba-client network}}
%postun client
/sbin/ldconfig
-%{?insserv_cleanup}
+%{?insserv_cleanup:%{insserv_cleanup}}
%post -n libnetapi0
/sbin/ldconfig
@@ -1213,7 +1219,7 @@
if test ${1:-0} -eq 1 -a -d %{_libdir}/cups/backend; then
ln -fs %{_bindir}/get_printing_ticket %{_libdir}/cups/backend/smb
fi
-%run_permissions
+%{?run_permissions:%{run_permissions}}
%postun krb-printing
if test -e %{_bindir}/smbspool -a -d %{_libdir}/cups/backend; then
@@ -1239,12 +1245,12 @@
fi
%preun winbind
-%{?stop_on_removal winbind}
+%{?stop_on_removal:%{stop_on_removal winbind}}
%postun winbind
/sbin/ldconfig
-%{?restart_on_update nscd winbind}
-%{?insserv_cleanup}
+%{?restart_on_update:%{restart_on_update nscd winbind}}
+%{?insserv_cleanup:%{insserv_cleanup}}
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 920
%post -n cifs-mount
@@ -1355,6 +1361,7 @@
%doc %{_mandir}/man8/vfs_readahead.8.*
%doc %{_mandir}/man8/vfs_readonly.8.*
%doc %{_mandir}/man8/vfs_recycle.8.*
+%doc %{_mandir}/man8/vfs_smb_traffic_analyzer.8.*
%doc %{_mandir}/man8/vfs_shadow_copy.8.*
%doc %{_mandir}/man8/vfs_streams_xattr.8.*
%doc %{_mandir}/man8/vfs_xattr_tdb.8.*
++++++ build-source-timestamp ++++++
--- /var/tmp/diff_new_pack.K26368/_old 2009-01-09 01:55:34.000000000 +0100
+++ /var/tmp/diff_new_pack.K26368/_new 2009-01-09 01:55:34.000000000 +0100
@@ -1,2 +1,2 @@
-2022
-Branch : 3.2.5
+2042
+Branch : 3.2.7
++++++ patches.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/0a0426650e596453b4b8aa6536f4fe8b1d890451 new/patches/samba.org/0a0426650e596453b4b8aa6536f4fe8b1d890451
--- old/patches/samba.org/0a0426650e596453b4b8aa6536f4fe8b1d890451 2008-12-03 16:05:46.000000000 +0100
+++ new/patches/samba.org/0a0426650e596453b4b8aa6536f4fe8b1d890451 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-commit 0a0426650e596453b4b8aa6536f4fe8b1d890451
-Author: Jeremy Allison
-Date: Tue Sep 23 16:38:04 2008 -0700
-
- Fix winbindd crash in an unusual failure mode. Bug #5737. Based on original patch from shargagan@novell.com
- Jeremy.
-
-Index: source/winbindd/winbindd_dual.c
-===================================================================
---- source/winbindd/winbindd_dual.c.orig 2008-09-25 14:41:18.000000000 +0530
-+++ source/winbindd/winbindd_dual.c 2008-09-25 14:41:33.000000000 +0530
-@@ -196,10 +196,12 @@
-
- TALLOC_FREE(state->reply_timeout_event);
-
-- SMB_ASSERT(state->child_pid != (pid_t)0);
-+ /* If child exists and is not already reaped,
-+ send kill signal to child. */
-
-- /* If not already reaped, send kill signal to child. */
-- if (state->child->pid == state->child_pid) {
-+ if ((state->child->pid != (pid_t)0) &&
-+ (state->child->pid != (pid_t)-1) &&
-+ (state->child->pid == state->child_pid)) {
- kill(state->child_pid, SIGTERM);
-
- /*
-@@ -295,12 +297,14 @@
- }
-
- if ((child->pid == 0) && (!fork_domain_child(child))) {
-- /* Cancel all outstanding requests */
-+ /* fork_domain_child failed.
-+ Cancel all outstanding requests */
-
- while (request != NULL) {
- /* request might be free'd in the continuation */
- struct winbindd_async_request *next = request->next;
-- request->continuation(request->private_data, False);
-+
-+ async_request_fail(request);
- request = next;
- }
- return;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/9af716f5fb144a047f1fc9fe02f24bcc59a0bc97 new/patches/samba.org/9af716f5fb144a047f1fc9fe02f24bcc59a0bc97
--- old/patches/samba.org/9af716f5fb144a047f1fc9fe02f24bcc59a0bc97 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/9af716f5fb144a047f1fc9fe02f24bcc59a0bc97 2009-01-05 13:11:19.000000000 +0100
@@ -0,0 +1,376 @@
+commit 9af716f5fb144a047f1fc9fe02f24bcc59a0bc97
+Author: Jeff Layton
+Date: Fri Dec 12 07:08:30 2008 -0500
+
+ mount.cifs: allow mounts to ipv6 capable servers
+
+ The current name resolution scheme in mount.cifs is IPv4 only. Expand
+ it to be protocol-independent. Also take advantage of the fact that
+ getaddrinfo() returns a list of addresses and have mount.cifs try each
+ in turn until it hits one that's reachable and allows the socket to
+ connect.
+
+ Signed-off-by: Jeff Layton
+
+Index: source/client/mount.cifs.c
+===================================================================
+--- source/client/mount.cifs.c.orig
++++ source/client/mount.cifs.c
+@@ -80,6 +80,9 @@
+ #define MOUNT_PASSWD_SIZE 64
+ #define DOMAIN_SIZE 64
+
++/* currently maximum length of IPv6 address string */
++#define MAX_ADDRESS_LEN INET6_ADDRSTRLEN
++
+ const char *thisprogram;
+ int verboseflag = 0;
+ static int got_password = 0;
+@@ -189,12 +192,6 @@ static char * getusername(void) {
+ return username;
+ }
+
+-static char * parse_cifs_url(char * unc_name)
+-{
+- printf("\nMounting cifs URL not implemented yet. Attempt to mount %s\n",unc_name);
+- return NULL;
+-}
+-
+ static int open_cred_file(char * file_name)
+ {
+ char * line_buf;
+@@ -493,7 +490,7 @@ static int parse_options(char ** options
+ } else if (strncmp(data, "ip", 2) == 0) {
+ if (!value || !*value) {
+ printf("target ip address argument missing");
+- } else if (strnlen(value, 35) < 35) {
++ } else if (strnlen(value, MAX_ADDRESS_LEN) <= MAX_ADDRESS_LEN) {
+ if(verboseflag)
+ printf("ip address %s override specified\n",value);
+ got_ip = 1;
+@@ -878,23 +875,23 @@ static void replace_char(char *string, c
+ }
+
+ /* Note that caller frees the returned buffer if necessary */
+-static char * parse_server(char ** punc_name)
++static struct addrinfo *
++parse_server(char ** punc_name)
+ {
+ char * unc_name = *punc_name;
+ int length = strnlen(unc_name, MAX_UNC_LEN);
+ char * share;
+- char * ipaddress_string = NULL;
+- struct hostent * host_entry = NULL;
+- struct in_addr server_ipaddr;
++ struct addrinfo *addrlist;
++ int rc;
+
+ if(length > (MAX_UNC_LEN - 1)) {
+ printf("mount error: UNC name too long");
+ return NULL;
+ }
+- if (strncasecmp("cifs://",unc_name,7) == 0)
+- return parse_cifs_url(unc_name+7);
+- if (strncasecmp("smb://",unc_name,6) == 0) {
+- return parse_cifs_url(unc_name+6);
++ if ((strncasecmp("cifs://", unc_name, 7) == 0) ||
++ (strncasecmp("smb://", unc_name, 6) == 0)) {
++ printf("\nMounting cifs URL not implemented yet. Attempt to mount %s\n", unc_name);
++ return NULL;
+ }
+
+ if(length < 3) {
+@@ -935,7 +932,12 @@ continue_unc_parsing:
+ *share = 0; /* temporarily terminate the string */
+ share += 1;
+ if(got_ip == 0) {
+- host_entry = gethostbyname(unc_name);
++ rc = getaddrinfo(unc_name, NULL, NULL, &addrlist);
++ if (rc != 0) {
++ printf("mount error: could not resolve address for %s: %s\n",
++ unc_name, gai_strerror(rc));
++ addrlist = NULL;
++ }
+ }
+ *(share - 1) = '/'; /* put delimiter back */
+
+@@ -950,23 +952,9 @@ continue_unc_parsing:
+ printf("ip address specified explicitly\n");
+ return NULL;
+ }
+- if(host_entry == NULL) {
+- printf("mount error: could not find target server. TCP name %s not found\n", unc_name);
+- return NULL;
+- } else {
+- /* BB should we pass an alternate version of the share name as Unicode */
+- /* BB what about ipv6? BB */
+- /* BB add retries with alternate servers in list */
+-
+- memcpy(&server_ipaddr.s_addr, host_entry->h_addr, 4);
+-
+- ipaddress_string = inet_ntoa(server_ipaddr);
+- if(ipaddress_string == NULL) {
+- printf("mount error: could not get valid ip address for target server\n");
+- return NULL;
+- }
+- return ipaddress_string;
+- }
++ /* BB should we pass an alternate version of the share name as Unicode */
++
++ return addrlist;
+ } else {
+ /* BB add code to find DFS root (send null path on get DFS Referral to specified server here */
+ printf("Mounting the DFS root for a particular server not implemented yet\n");
+@@ -1030,10 +1018,11 @@ int main(int argc, char ** argv)
+ int flags = MS_MANDLOCK; /* no need to set legacy MS_MGC_VAL */
+ char * orgoptions = NULL;
+ char * share_name = NULL;
+- char * ipaddr = NULL;
++ const char * ipaddr = NULL;
+ char * uuid = NULL;
+ char * mountpoint = NULL;
+ char * options = NULL;
++ char * optionstail;
+ char * resolved_path = NULL;
+ char * temp;
+ char * dev_name;
+@@ -1046,10 +1035,14 @@ int main(int argc, char ** argv)
+ int optlen = 0;
+ int orgoptlen = 0;
+ size_t options_size = 0;
++ 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;
++ struct sockaddr_in6 *addr6;
+ FILE * pmntfile;
+
+ /* setlocale(LC_ALL, "");
+@@ -1241,8 +1234,8 @@ int main(int argc, char ** argv)
+ rc = EX_USAGE;
+ goto mount_exit;
+ }
+- ipaddr = parse_server(&share_name);
+- if((ipaddr == NULL) && (got_ip == 0)) {
++ addrhead = addr = parse_server(&share_name);
++ if((addrhead == NULL) && (got_ip == 0)) {
+ printf("No ip address specified and hostname not found\n");
+ rc = EX_USAGE;
+ goto mount_exit;
+@@ -1306,7 +1299,6 @@ int main(int argc, char ** argv)
+ }
+ /* FIXME launch daemon (handles dfs name resolution and credential change)
+ remember to clear parms and overwrite password field before launching */
+-mount_retry:
+ if(orgoptions) {
+ optlen = strlen(orgoptions);
+ orgoptlen = optlen;
+@@ -1321,10 +1313,10 @@ mount_retry:
+ }
+ if(user_name)
+ optlen += strlen(user_name) + 6;
+- if(ipaddr)
+- optlen += strlen(ipaddr) + 4;
++ optlen += MAX_ADDRESS_LEN + 4;
+ if(mountpassword)
+ optlen += strlen(mountpassword) + 6;
++mount_retry:
+ SAFE_FREE(options);
+ options_size = optlen + 10 + DOMAIN_SIZE;
+ options = (char *)malloc(options_size /* space for commas in password */ + 8 /* space for domain= , domain name itself was counted as part of the length username string above */);
+@@ -1334,18 +1326,12 @@ mount_retry:
+ exit(EX_SYSERR);
+ }
+
+- options[0] = 0;
+- strlcpy(options,"unc=",options_size);
++ strlcpy(options, "unc=", options_size);
+ strlcat(options,share_name,options_size);
+ /* scan backwards and reverse direction of slash */
+ temp = strrchr(options, '/');
+ if(temp > options + 6)
+ *temp = '\\';
+- if(ipaddr) {
+- strlcat(options,",ip=",options_size);
+- strlcat(options,ipaddr,options_size);
+- }
+-
+ if(user_name) {
+ /* check for syntax like user=domain\user */
+ if(got_domain == 0)
+@@ -1387,11 +1373,42 @@ mount_retry:
+ /* convert all '\\' to '/' in share portion so that /proc/mounts looks pretty */
+ replace_char(dev_name, '\\', '/', strlen(share_name));
+
+- if(mount(dev_name, mountpoint, "cifs", flags, options)) {
+- /* remember to kill daemon on error */
++ if (!got_ip && addr) {
++ strlcat(options, ",ip=", options_size);
++ current_len = strnlen(options, options_size);
++ optionstail = options + current_len;
++ switch (addr->ai_addr->sa_family) {
++ case AF_INET6:
++ addr6 = (struct sockaddr_in6 *) addr->ai_addr;
++ ipaddr = inet_ntop(AF_INET6, &addr6->sin6_addr, optionstail,
++ options_size - current_len);
++ break;
++ case AF_INET:
++ addr4 = (struct sockaddr_in *) addr->ai_addr;
++ ipaddr = inet_ntop(AF_INET, &addr4->sin_addr, optionstail,
++ options_size - current_len);
++ break;
++ }
++
++ /* if the address looks bogus, try the next one */
++ if (!ipaddr) {
++ addr = addr->ai_next;
++ if (addr)
++ goto mount_retry;
++ rc = EX_SYSERR;
++ goto mount_exit;
++ }
++ }
++
++ if (mount(dev_name, mountpoint, "cifs", flags, options)) {
+ switch (errno) {
+- case 0:
+- printf("mount failed but no error number set\n");
++ case ECONNREFUSED:
++ case EHOSTUNREACH:
++ if (addr) {
++ addr = addr->ai_next;
++ if (addr)
++ goto mount_retry;
++ }
+ break;
+ case ENODEV:
+ printf("mount error: cifs filesystem not supported by the system\n");
+@@ -1406,64 +1423,64 @@ mount_retry:
+ goto mount_retry;
+ }
+ }
+- default:
+- printf("mount error %d = %s\n",errno,strerror(errno));
+ }
++ printf("mount error(%d): %s\n", errno, strerror(errno));
+ printf("Refer to the mount.cifs(8) manual page (e.g.man mount.cifs)\n");
+ rc = EX_FAIL;
+- } else {
+- atexit(unlock_mtab);
+- rc = lock_mtab();
+- if (rc) {
+- printf("cannot lock mtab");
+- goto mount_exit;
+- }
+- pmntfile = setmntent(MOUNTED, "a+");
+- if (!pmntfile) {
+- printf("could not update mount table\n");
+- unlock_mtab();
+- rc = EX_FILEIO;
+- goto mount_exit;
+- }
+- mountent.mnt_fsname = dev_name;
+- mountent.mnt_dir = mountpoint;
+- mountent.mnt_type = CONST_DISCARD(char *,"cifs");
+- mountent.mnt_opts = (char *)malloc(220);
+- if(mountent.mnt_opts) {
+- char * mount_user = getusername();
+- memset(mountent.mnt_opts,0,200);
+- if(flags & MS_RDONLY)
+- strlcat(mountent.mnt_opts,"ro",220);
+- else
+- strlcat(mountent.mnt_opts,"rw",220);
+- if(flags & MS_MANDLOCK)
+- strlcat(mountent.mnt_opts,",mand",220);
+- if(flags & MS_NOEXEC)
+- strlcat(mountent.mnt_opts,",noexec",220);
+- if(flags & MS_NOSUID)
+- strlcat(mountent.mnt_opts,",nosuid",220);
+- if(flags & MS_NODEV)
+- strlcat(mountent.mnt_opts,",nodev",220);
+- if(flags & MS_SYNCHRONOUS)
+- strlcat(mountent.mnt_opts,",sync",220);
+- if(mount_user) {
+- if(getuid() != 0) {
+- strlcat(mountent.mnt_opts,
+- ",user=", 220);
+- strlcat(mountent.mnt_opts,
+- mount_user, 220);
+- }
++ goto mount_exit;
++ }
++
++ atexit(unlock_mtab);
++ rc = lock_mtab();
++ if (rc) {
++ printf("cannot lock mtab");
++ goto mount_exit;
++ }
++ pmntfile = setmntent(MOUNTED, "a+");
++ if (!pmntfile) {
++ printf("could not update mount table\n");
++ unlock_mtab();
++ rc = EX_FILEIO;
++ goto mount_exit;
++ }
++ mountent.mnt_fsname = dev_name;
++ mountent.mnt_dir = mountpoint;
++ mountent.mnt_type = CONST_DISCARD(char *,"cifs");
++ mountent.mnt_opts = (char *)malloc(220);
++ if(mountent.mnt_opts) {
++ char * mount_user = getusername();
++ memset(mountent.mnt_opts,0,200);
++ if(flags & MS_RDONLY)
++ strlcat(mountent.mnt_opts,"ro",220);
++ else
++ strlcat(mountent.mnt_opts,"rw",220);
++ if(flags & MS_MANDLOCK)
++ strlcat(mountent.mnt_opts,",mand",220);
++ if(flags & MS_NOEXEC)
++ strlcat(mountent.mnt_opts,",noexec",220);
++ if(flags & MS_NOSUID)
++ strlcat(mountent.mnt_opts,",nosuid",220);
++ if(flags & MS_NODEV)
++ strlcat(mountent.mnt_opts,",nodev",220);
++ if(flags & MS_SYNCHRONOUS)
++ strlcat(mountent.mnt_opts,",sync",220);
++ if(mount_user) {
++ if(getuid() != 0) {
++ strlcat(mountent.mnt_opts,
++ ",user=", 220);
++ strlcat(mountent.mnt_opts,
++ mount_user, 220);
+ }
+ }
+- mountent.mnt_freq = 0;
+- mountent.mnt_passno = 0;
+- rc = addmntent(pmntfile,&mountent);
+- endmntent(pmntfile);
+- unlock_mtab();
+- SAFE_FREE(mountent.mnt_opts);
+- if (rc)
+- rc = EX_FILEIO;
+ }
++ mountent.mnt_freq = 0;
++ mountent.mnt_passno = 0;
++ rc = addmntent(pmntfile,&mountent);
++ endmntent(pmntfile);
++ unlock_mtab();
++ SAFE_FREE(mountent.mnt_opts);
++ if (rc)
++ rc = EX_FILEIO;
+ mount_exit:
+ if(mountpassword) {
+ int len = strlen(mountpassword);
+@@ -1471,6 +1488,8 @@ mount_exit:
+ SAFE_FREE(mountpassword);
+ }
+
++ if (addrhead)
++ freeaddrinfo(addrhead);
+ SAFE_FREE(options);
+ SAFE_FREE(orgoptions);
+ SAFE_FREE(resolved_path);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/ca172884bb9f64980d46d3e2cecd6189075cc983 new/patches/samba.org/ca172884bb9f64980d46d3e2cecd6189075cc983
--- old/patches/samba.org/ca172884bb9f64980d46d3e2cecd6189075cc983 2008-12-03 16:05:46.000000000 +0100
+++ new/patches/samba.org/ca172884bb9f64980d46d3e2cecd6189075cc983 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-commit ca172884bb9f64980d46d3e2cecd6189075cc983
-Author: Andreas Schneider
-Date: Wed Nov 26 13:19:03 2008 -0800
-
- Fix circular dependency error with autoconf 2.6.3.
-
- Signed-off-by: Andreas Schneider
-
-Index: source/lib/replace/autoconf-2.60.m4
-===================================================================
---- source/lib/replace/autoconf-2.60.m4.orig
-+++ source/lib/replace/autoconf-2.60.m4
-@@ -179,6 +179,7 @@ AC_DEFUN([AC_PROG_CC_C99],
- # ------------------------
- # Enable extensions on systems that normally disable them,
- # typically due to standards-conformance issues.
-+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
- AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
- [
- AC_BEFORE([$0], [AC_COMPILE_IFELSE])
-@@ -208,3 +209,4 @@ AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
- AC_DEFINE([__EXTENSIONS__])
- AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
- ])
-+])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/e7b0d1c984a37600a234c1f4c95b06e9b5898f30 new/patches/samba.org/e7b0d1c984a37600a234c1f4c95b06e9b5898f30
--- old/patches/samba.org/e7b0d1c984a37600a234c1f4c95b06e9b5898f30 2008-12-03 16:05:46.000000000 +0100
+++ new/patches/samba.org/e7b0d1c984a37600a234c1f4c95b06e9b5898f30 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-commit e7b0d1c984a37600a234c1f4c95b06e9b5898f30
-Author: Andreas Schneider
-Date: Mon Oct 20 17:35:42 2008 +0200
-
- Delete the krb5 ccname variable from the PAM environment if set.
-
- If winbind sets the KRB5CCNAME variable it should unset it when
- the cache gets destroyed.
-
-Index: source/nsswitch/pam_winbind.c
-===================================================================
---- source/nsswitch/pam_winbind.c.orig
-+++ source/nsswitch/pam_winbind.c
-@@ -2358,6 +2358,13 @@ int pam_sm_close_session(pam_handle_t *p
- }
-
- out:
-+ /*
-+ * Delete the krb5 ccname variable from the PAM environment
-+ * if it was set by winbind.
-+ */
-+ if (ctx->ctrl & WINBIND_KRB5_AUTH) {
-+ pam_putenv(pamh, "KRB5CCNAME");
-+ }
-
- _PAM_LOG_FUNCTION_LEAVE("pam_sm_close_session", ctx, retval);
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/f3b0e219f1a7660ff275db701935eecbe053fa25 new/patches/samba.org/f3b0e219f1a7660ff275db701935eecbe053fa25
--- old/patches/samba.org/f3b0e219f1a7660ff275db701935eecbe053fa25 2008-12-03 16:05:46.000000000 +0100
+++ new/patches/samba.org/f3b0e219f1a7660ff275db701935eecbe053fa25 1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-commit f3b0e219f1a7660ff275db701935eecbe053fa25
-Author: Jeremy Allison
-Date: Thu Oct 16 11:57:51 2008 -0700
-
- Fix bug 5826 - Directory/Filenames get truncated when 3.2.0 client acesses old server.
- Karolin this is a show-stopper for 3.2.5.
- There was some code in pull_ucs2_base_talloc() to cope with this case which
- hadn't been added to pull_ascii_base_talloc(). The older Samba returns non
- unicode names which is why you are seeing this codepath being executed.
- Jeremy.
- (cherry picked from commit 09fa53d927436310ae3c17096d42e2fa4de1dd2e)
-
-Index: source/lib/charcnv.c
-===================================================================
---- source/lib/charcnv.c.orig
-+++ source/lib/charcnv.c
-@@ -1209,7 +1209,21 @@ static size_t pull_ascii_base_talloc(TAL
- if (dest_len && dest) {
- /* Did we already process the terminating zero ? */
- if (dest[dest_len-1] != 0) {
-- dest[dest_len-1] = 0;
-+ size_t size = talloc_get_size(dest);
-+ /* Have we got space to append the '\0' ? */
-+ if (size <= dest_len) {
-+ /* No, realloc. */
-+ dest = TALLOC_REALLOC_ARRAY(ctx, dest, char,
-+ dest_len+1);
-+ if (!dest) {
-+ /* talloc fail. */
-+ dest_len = (size_t)-1;
-+ return 0;
-+ }
-+ }
-+ /* Yay - space ! */
-+ dest[dest_len] = '\0';
-+ dest_len++;
- }
- } else if (dest) {
- dest[0] = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/series new/patches/series
--- old/patches/series 2008-12-03 16:05:46.000000000 +0100
+++ new/patches/series 2009-01-05 13:24:52.000000000 +0100
@@ -5,10 +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/0a0426650e596453b4b8aa6536f4fe8b1d890451 -p0 # bnc 416598
-samba.org/e7b0d1c984a37600a234c1f4c95b06e9b5898f30 -p0
-samba.org/f3b0e219f1a7660ff275db701935eecbe053fa25 -p0 # bnc 423471
-samba.org/ca172884bb9f64980d46d3e2cecd6189075cc983 -p0 # Fix circular dependency error with autoconf 2.6.3.
+samba.org/9af716f5fb144a047f1fc9fe02f24bcc59a0bc97 -p0 # mount.cifs IPv6 support
# SuSE specific changes
# disabled -> WIP lmuelle
@@ -23,7 +20,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/Makefile.in-cifs.upcall.diff -p0 # links against nscd libs
-suse/Makefile.in-install_cifs.upcall_once.diff -p0 # install cifs.upcall only once
# 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 2008-12-03 16:05:46.000000000 +0100
+++ new/patches/suse/configure.diff 2009-01-05 13:11:19.000000000 +0100
@@ -3,11 +3,13 @@
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,
+Index: source/lib/replace/autoconf-2.60.m4
+===================================================================
+--- source/lib/replace/autoconf-2.60.m4.orig
++++ source/lib/replace/autoconf-2.60.m4
+@@ -181,32 +181,56 @@ AC_DEFUN([AC_PROG_CC_C99],
# typically due to standards-conformance issues.
+ m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
-[
- AC_BEFORE([$0], [AC_COMPILE_IFELSE])
@@ -74,3 +76,4 @@
-])
+ 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-12-03 16:05:46.000000000 +0100
+++ new/patches/suse/get_printing_ticket.diff 2009-01-05 13:11:19.000000000 +0100
@@ -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@
-@@ -1311,6 +1312,10 @@ bin/smbspool@EXEEXT@: $(BINARY_PREREQS)
+@@ -1315,6 +1316,10 @@ bin/smbspool@EXEEXT@: $(BINARY_PREREQS)
@$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
$(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/suse/Makefile.in-install_cifs.upcall_once.diff new/patches/suse/Makefile.in-install_cifs.upcall_once.diff
--- old/patches/suse/Makefile.in-install_cifs.upcall_once.diff 2008-12-03 16:05:46.000000000 +0100
+++ new/patches/suse/Makefile.in-install_cifs.upcall_once.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-Author: Lars Mueller <lmuelle at suse dot de>
-Subject: Install cifs.upcall only onece; else we get cifs.upcall.old too
-Fixed upstream: no
-Reported upstream: no
-
-Index: source/Makefile.in
-===================================================================
---- source/Makefile.in.orig
-+++ source/Makefile.in
-@@ -175,7 +175,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_P
-
- # Note that all executable programs now provide for an optional executable suffix.
-
--SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@ @CIFSUPCALL_PROGS@
-+SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
-
- ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
-
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-12-03 16:05:46.000000000 +0100
+++ new/patches/suse/Makefile.in-libwbclient_static.diff 2009-01-05 13:11:19.000000000 +0100
@@ -7,7 +7,7 @@
===================================================================
--- source/Makefile.in.orig
+++ source/Makefile.in
-@@ -1724,6 +1724,7 @@ installlibwbclient:: installdirs libwbcl
+@@ -1728,6 +1728,7 @@ installlibwbclient:: installdirs libwbcl
ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` ; \
fi
++++++ samba-3.2.5.tar.bz2 -> samba-3.2.7.tar.bz2 ++++++
samba/samba-3.2.5.tar.bz2 /mounts/work_src_done/STABLE/samba/samba-3.2.7.tar.bz2 differ: byte 11, line 1
++++++ vendor-files.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/init/smbfs new/vendor-files/init/smbfs
--- old/vendor-files/init/smbfs 2008-12-03 16:05:46.000000000 +0100
+++ new/vendor-files/init/smbfs 2009-01-05 13:11:19.000000000 +0100
@@ -112,7 +112,7 @@
printdot=""
while [ "${JOBS}" ] && [ ${timer} -gt 0 ]; do
if [ -z "${printdot}" ]; then
- mount -t "${vfstype}" -o ${options} ${service} ${mountpoint} >/dev/null &
+ mount -t "${vfstype}" -o ${options} "${service}" "${mountpoint}" >/dev/null &
PID=$!
fi
test -e /proc/$PID || JOBS=""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/init/smbfs-1010 new/vendor-files/init/smbfs-1010
--- old/vendor-files/init/smbfs-1010 2008-12-03 16:05:46.000000000 +0100
+++ new/vendor-files/init/smbfs-1010 2009-01-05 13:11:19.000000000 +0100
@@ -111,7 +111,7 @@
printdot=""
while [ "${JOBS}" ] && [ ${timer} -gt 0 ]; do
if [ -z "${printdot}" ]; then
- mount -t "${vfstype}" -o ${options} ${service} ${mountpoint} >/dev/null &
+ mount -t "${vfstype}" -o ${options} "${service}" "${mountpoint}" >/dev/null &
PID=$!
fi
test -e /proc/$PID || JOBS=""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/init/smbfs-900 new/vendor-files/init/smbfs-900
--- old/vendor-files/init/smbfs-900 2008-12-03 16:05:46.000000000 +0100
+++ new/vendor-files/init/smbfs-900 2009-01-05 13:11:19.000000000 +0100
@@ -111,7 +111,7 @@
printdot=""
while [ "${JOBS}" ] && [ ${timer} -gt 0 ]; do
if [ -z "${printdot}" ]; then
- mount -t "${vfstype}" -o ${options} ${service} ${mountpoint} >/dev/null &
+ mount -t "${vfstype}" -o ${options} "${service}" "${mountpoint}" >/dev/null &
PID=$!
fi
test -e /proc/$PID || JOBS=""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/tools/nmbstatus new/vendor-files/tools/nmbstatus
--- old/vendor-files/tools/nmbstatus 2008-12-03 16:05:46.000000000 +0100
+++ new/vendor-files/tools/nmbstatus 2009-01-05 13:11:19.000000000 +0100
@@ -195,7 +195,7 @@
# show all data we found or only one workgroup
my @displayWorkgroups = ();
-if ( $quiet) {
+if ( $quiet || defined($workgroup)) {
@displayWorkgroups = $workgroup;
} else {
@displayWorkgroups = keys %workGroups;
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-12-04 18:16:46.000000000 +0100
+++ new/vendor-files/tools/package-data 2009-01-05 15:40:16.000000000 +0100
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="2022"
+SAMBA_PACKAGE_SVN_VERSION="2042"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org