Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at Fri Jan 8 17:32:55 CET 2010. -------- --- samba/samba.changes 2009-12-03 12:40:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/samba/samba.changes 2010-01-07 12:54:32.000000000 +0100 @@ -1,0 +2,80 @@ +Thu Jan 7 11:21:35 UTC 2010 - lmuelle@suse.de + +- Update to 3.4.4. + + Fix interdomain trust relationships with Win2008R2 (bug #6697). + + Fix Winbind crashes when queried from nss (bug #6889). + + Fix Winbind crash when retrieving empty group members (bug #7014). + + Fix "UID range full" error in Winbind (bug #6901). + + Fix multiple LDAP servers in "idmap backend" and "idmap alloc + backend" (bug #6910). + + + BUG 4832: Fix iconv checks. + + BUG 6338: Do not always display "none" in 'net rpc trustdom list'. + + BUG 6851: Add pdbedit --kickoff-time/-K to set the user's kickoff time. + + BUG 6828: Fix infinite timeout when byte lock held outside of samba. + + BUG 6837: Fix "Too many open files" message when trying to access a large + number of files with Windows 7. + + BUG 6841: Fix "map acl inherit = yes". + + BUG 6850: Fix shadow copy display on Windows 7. + + BUG 6867: Fix listing of directories with a lot of files. + + BUG 6868: Support building with Heimdal we well as with MIT. + + BUG 6875: Fix DOS attributes on OS/2 clients. + + BUG 6880: Fix listing of workgroup servers in libsmbclient. + + BUG 6898: Samba duplicates file content on appending. + + BUG 6918: Fix krb5 build problem on Ubuntu karmic. + + BUG 6929: Fix build with recent heimdal. + + BUG 6939: Fix long filenames with "mangling method = hash". + + BUG 6967: Fix 'net ads join' with OU. + + BUG 6981: Fix paged search with DirX LDAP server. + + BUG 6982: Remove erroneous out of memory error path in lookup_sid. + + BUG 6997: Fix _samr_GetAliasMembership for results with 0 rids. + + BUG 7005: Fix "mangle method = hash" truncates files with dot "." + character. + + + Fix the build of the winbind krb5 locator plugin. + + Fix enumprinter key client and server. + +------------------------------------------------------------------- +Fri Jan 1 20:04:09 UTC 2010 - lars@samba.org + +- Add BuildRequires to fam-devel; (bnc#564260). + +------------------------------------------------------------------- +Wed Dec 30 22:04:19 CET 2009 - jmcdonough@suse.de + +- Prevent winbind crash; (bso#7014); (bnc#566119). + +------------------------------------------------------------------- +Mon Dec 21 20:16:21 CET 2009 - sjayaraman@suse.de + +- Fix processing of open modes in POSIX open; (bnc#530683). + +------------------------------------------------------------------- +Wed Dec 9 20:44:21 UTC 2009 - lmuelle@suse.de + +- Store the smbfs service state if enabled and restore it for cifs while + upgrade on post-11.2 systems. + +------------------------------------------------------------------- +Wed Dec 9 16:43:45 UTC 2009 - lmuelle@suse.de + +- Prevent cifstab from being overwritten while upgrade on post-11.2 systems. + +------------------------------------------------------------------- +Wed Dec 9 07:44:59 CET 2009 - boyang@suse.de + +- Give the user a chance to change password when password will expire soon; + (FATE#302414). + +------------------------------------------------------------------- +Tue Dec 8 18:19:33 UTC 2009 - lmuelle@suse.de + +- Rename smbfs init script to cifs for post-11.2 systems. + +------------------------------------------------------------------- +Fri Dec 4 18:59:22 CET 2009 - jmcdonough@suse.de + +- Error on joining windows domain (invalid pointer); (bso#6967); + (bnc#553622). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- samba-3.4.3.tar.bz2 New: ---- samba-3.4.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.fplUsw/_old 2010-01-08 17:32:34.000000000 +0100 +++ /var/tmp/diff_new_pack.fplUsw/_new 2010-01-08 17:32:34.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package samba-doc (Version 3.4.3) +# spec file for package samba-doc (Version 3.4.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,7 +19,7 @@ Name: samba-doc -BuildRequires: cups-devel e2fsprogs-devel libacl-devel pam-devel popt-devel python-devel readline-devel +BuildRequires: cups-devel e2fsprogs-devel fam-devel libacl-devel pam-devel popt-devel python-devel readline-devel %if 0%{?suse_version} BuildRequires: cracklib-devel openldap2-devel %endif @@ -50,15 +50,15 @@ %if 0%{?suse_version} > 1110 BuildRequires: fdupes %endif -%define samba_ver 3.4.3 +%define samba_ver 3.4.4 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 %endif Url: http://www.samba.org/ -Version: 3.4.3 -Release: 3 +Version: 3.4.4 +Release: 1 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -88,6 +88,11 @@ %else %define make_cifsupcall 0 %endif +%if 0%{?suse_version} < 1121 +%define cifs_init_script smbfs +%else +%define cifs_init_script cifs +%endif %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define link_static_libs 1 %else @@ -364,10 +369,10 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.fplUsw/_old 2010-01-08 17:32:34.000000000 +0100 +++ /var/tmp/diff_new_pack.fplUsw/_new 2010-01-08 17:32:34.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package samba (Version 3.4.3) +# spec file for package samba (Version 3.4.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,7 +19,7 @@ Name: samba -BuildRequires: cups-devel e2fsprogs-devel libacl-devel pam-devel popt-devel python-devel readline-devel +BuildRequires: cups-devel e2fsprogs-devel fam-devel libacl-devel pam-devel popt-devel python-devel readline-devel %if 0%{?suse_version} BuildRequires: cracklib-devel openldap2-devel %endif @@ -50,7 +50,7 @@ %if 0%{?suse_version} > 1110 BuildRequires: fdupes %endif -%define samba_ver 3.4.3 +%define samba_ver 3.4.4 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -62,8 +62,8 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on -Version: 3.4.3 -Release: 3 +Version: 3.4.4 +Release: 1 %ifarch ppc64 Obsoletes: samba-64bit %endif @@ -96,6 +96,11 @@ %else %define make_cifsupcall 0 %endif +%if 0%{?suse_version} < 1121 +%define cifs_init_script smbfs +%else +%define cifs_init_script cifs +%endif %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define link_static_libs 1 %else @@ -152,11 +157,11 @@ The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %package client License: GPLv3+ @@ -168,7 +173,7 @@ %ifarch ppc64 Obsoletes: samba-client-64bit %endif -PreReq: %{?insserv_prereq} %{?fillup_prereq} coreutils /sbin/ldconfig +PreReq: %{?insserv_prereq} %{?fillup_prereq} coreutils /sbin/chkconfig /sbin/ldconfig %if 0%{?suse_version} == 0 || 0%{?suse_version} > 920 Requires: cifs-mount %endif @@ -195,11 +200,11 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -223,11 +228,11 @@ The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 @@ -254,11 +259,11 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %endif @@ -284,11 +289,11 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %if %{make_utils} @@ -336,11 +341,11 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -363,11 +368,11 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %else @@ -408,11 +413,11 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %package -n libnetapi0 License: GPLv3+ @@ -430,11 +435,11 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %package -n libnetapi-devel License: GPLv3+ @@ -453,11 +458,11 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -475,11 +480,11 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %else @@ -512,11 +517,11 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %if %{make_ldapsmb} @@ -536,11 +541,11 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %package -n libtalloc-devel License: LGPLv3+ @@ -559,11 +564,11 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %package -n libtdb1 License: LGPLv3+ @@ -581,11 +586,11 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %package -n libtdb-devel License: LGPLv3+ @@ -604,11 +609,11 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %package -n libwbclient0 License: GPLv3+ @@ -626,11 +631,11 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %package -n libwbclient-devel License: GPLv3+ @@ -649,11 +654,11 @@ -------- The Samba Team <samba@samba.org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %package -n ldapsmb License: GPLv2+ @@ -661,7 +666,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 273 +Release: 274 Requires: perl-ldap %description -n ldapsmb @@ -674,11 +679,11 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 920 @@ -700,11 +705,11 @@ -------- Steve French <sfrench at Samba dot org> -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 -Source Timestamp: 2248 -Branch : 3.4.3.SLE11_SP1 +Source Timestamp: 2267 +Branch : 3.4.4 %endif %if %{make_vscan} @@ -963,9 +968,12 @@ echo "# Date: $( date -I)" >>config/smb.conf grep -v "(^#|^;|^$)" config/smb.conf.vendor >>config/smb.conf %__install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR} -for file in smb.conf lmhosts smbusers smbpasswd smbfstab smbusers; do +for file in smb.conf lmhosts smbusers smbpasswd cifstab smbusers; do %__install -m 0644 "config/${file}" ${RPM_BUILD_ROOT}/%{CONFIGDIR}/${file} done +%if 0%{?suse_version} < 1121 + mv ${RPM_BUILD_ROOT}/%{CONFIGDIR}/cifstab ${RPM_BUILD_ROOT}/%{CONFIGDIR}/smbfstab +%endif section_names=$( sed -ne 's/^[(.*)]$/\1/p' config/smb.conf) for section in $section_names; do ../source3/bin/testparm -s --section-name "${section}" config/smb.conf >"${RPM_BUILD_ROOT}/%{_datadir}/samba/templates/default-${section}" || : @@ -982,7 +990,7 @@ scriptSuffix="-1010" fi %endif -startScripts="smb nmb smbfs winbind" +startScripts="smb nmb winbind %{cifs_init_script}" for script in ${startScripts}; do %__install -m 0755 "init/${script}${scriptSuffix}" \ "${RPM_BUILD_ROOT}/%{INITDIR}/${script}" @@ -1000,7 +1008,7 @@ pod2man tools/nmbstatus >${RPM_BUILD_ROOT}/%{_mandir}/man1/nmbstatus.1 # PDF generator %__install -p -m 0755 tools/smbprngenpdf ${RPM_BUILD_ROOT}/%{_bindir}/smbprngenpdf -touch ${RPM_BUILD_ROOT}/var/lock/subsys/smbfs +touch ${RPM_BUILD_ROOT}/var/lock/subsys/%{cifs_init_script} %__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 @@ -1010,11 +1018,11 @@ %endif %__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 dhcpcd-hook-samba-functions samba-winbindd smbfs; do +for script in dhcpcd-hook-samba dhcpcd-hook-samba-functions samba-winbindd %{cifs_init_script}; do %__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 +for script in 21-dhcpcd-hook-samba 21-%{cifs_init_script} 55-samba-winbindd; do touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} done # Install SuSEfirewall2 config files @@ -1201,30 +1209,49 @@ %{?restart_on_update:%{restart_on_update nmb smb}} %{?insserv_cleanup:%{insserv_cleanup}} +%pre client +# non SUSE + 11.3 an newer, update, no cifstab, but smbfstab +if [ ! 0%{?suse_version} -lt 1121 -a \ + ${1:-0} -gt 1 -a \ + ! -e /etc/samba/cifstab -a \ + -f /etc/samba/smbfstab ]; then + cp -a /etc/samba/smbfstab /var/adm/backup/etc_samba_smbfstab-move + chkconfig -c smbfs && >/var/adm/backup/etc_samba_smbfs-enabled || : +fi + %preun client -%{?stop_on_removal:%{stop_on_removal smbfs}} +%{?stop_on_removal:%{stop_on_removal %cifs_init_script}} %post client /sbin/ldconfig if [ ${1:-0} -eq 1 ]; then -# Only insserv smbfs if we're not in update mode. -%{?fillup_and_insserv:%{fillup_and_insserv -fy smbfs}} +# Only insserv cifs if we're not in update mode. +%{?fillup_and_insserv:%{fillup_and_insserv -fy %cifs_init_script}} 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 - ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/smbfs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-smbfs + ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-%{cifs_init_script} + ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-%{cifs_init_script} else for if_case in if-down.d if-up.d; do test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/dhcpcd-hook-samba || \ continue rm -f %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/dhcpcd-hook-samba ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/21-dhcpcd-hook-samba - test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/smbfs || \ + test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/%{cifs_init_script} || \ continue - rm -f %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/smbfs - ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/smbfs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/21-smbfs + rm -f %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/%{cifs_init_script} + ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/21-%{cifs_init_script} done fi +if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then + test -f /etc/samba/cifstab && \ + mv /etc/samba/cifstab /etc/samba/cifstab.rpmnew + mv /var/adm/backup/etc_samba_smbfstab-move /etc/samba/cifstab + if [ -f /var/adm/backup/etc_samba_smbfs-enabled ]; then + chkconfig -a cifs >/dev/null + rm /var/adm/backup/etc_samba_smbfs-enabled + fi +fi if ! test -e %{_bindir}/get_printing_ticket; then ln -fs %{_bindir}/smbspool %{_libdir}/cups/backend/smb fi @@ -1454,11 +1481,11 @@ %files client %defattr(-,root,root) -%attr(0754,root,root) %config %{INITDIR}/smbfs +%attr(0754,root,root) %config %{INITDIR}/%{cifs_init_script} %dir %{CONFIGDIR} %config(noreplace) %{CONFIGDIR}/lmhosts %config(noreplace) %{CONFIGDIR}/smb.conf -%attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/smbfstab +%attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/%{cifs_init_script}tab %dir %{_sysconfdir}/openldap %dir %{_sysconfdir}/openldap/schema %attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/samba3.schema @@ -1466,9 +1493,9 @@ %ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba-functions -%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-smbfs -%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-smbfs -%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/smbfs +%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-%{cifs_init_script} +%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-%{cifs_init_script} +%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %if 0%{?suse_version} && 0%{?suse_version} > 1100 %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-client %endif @@ -1502,7 +1529,7 @@ %{_bindir}/tdbdump %{_bindir}/tdbtool %{_bindir}/testparm -%{_sbindir}/rcsmbfs +%{_sbindir}/rc%{cifs_init_script} /%{_lib}/libnss_wins.so.2 %dir %{_libdir}/cups %dir %{_libdir}/cups/backend @@ -1548,7 +1575,7 @@ %dir %{_datadir}/omc %dir %{_datadir}/omc/svcinfo.d %endif -%attr(0644,root,root) %{_datadir}/omc/svcinfo.d/smbfs.xml +%attr(0644,root,root) %{_datadir}/omc/svcinfo.d/%{cifs_init_script}.xml %dir %{_datadir}/samba %dir %{_datadir}/samba/LDAP %config %{_datadir}/samba/LDAP/samba-nds.schema @@ -1557,7 +1584,7 @@ %doc %{DOCDIR}/README.%{VENDOR} %{_var}/adm/fillup-templates/samba-client-dhcp.conf %{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client -%ghost %{_var}/lock/subsys/smbfs +%ghost %{_var}/lock/subsys/%{cifs_init_script} %dir %{LOCKDIR} %attr(0750,root,root) %dir %{LOGDIR} %dir %{PIDDIR} ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.fplUsw/_old 2010-01-08 17:32:34.000000000 +0100 +++ /var/tmp/diff_new_pack.fplUsw/_new 2010-01-08 17:32:34.000000000 +0100 @@ -1,2 +1,2 @@ -2248 -Branch : 3.4.3.SLE11_SP1 +2267 +Branch : 3.4.4 ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/2300ec3006098536c1a615820b4774d625f82c05 new/patches/samba.org/2300ec3006098536c1a615820b4774d625f82c05 --- old/patches/samba.org/2300ec3006098536c1a615820b4774d625f82c05 2009-11-26 19:29:28.000000000 +0100 +++ new/patches/samba.org/2300ec3006098536c1a615820b4774d625f82c05 2010-01-07 12:49:30.000000000 +0100 @@ -13,7 +13,7 @@ =================================================================== --- source3/winbindd/winbindd_pam.c.orig +++ source3/winbindd/winbindd_pam.c -@@ -999,7 +999,9 @@ NTSTATUS winbindd_dual_pam_auth_cached(s +@@ -1001,7 +1001,9 @@ NTSTATUS winbindd_dual_pam_auth_cached(s #ifdef HAVE_KRB5 if ((state->request.flags & WBFLAG_PAM_KRB5) && ((tdc_domain = wcache_tdc_fetch_domain(state->mem_ctx, name_domain)) != NULL) && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/2d063d077aed01f020352e859b766415fe094fa5 new/patches/samba.org/2d063d077aed01f020352e859b766415fe094fa5 --- old/patches/samba.org/2d063d077aed01f020352e859b766415fe094fa5 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/2d063d077aed01f020352e859b766415fe094fa5 2010-01-07 12:49:30.000000000 +0100 @@ -0,0 +1,219 @@ +commit 2d063d077aed01f020352e859b766415fe094fa5 +Author: Bo Yang <boyang@samba.org> +Date: Thu Dec 10 14:30:13 2009 +0800 + + s3: Give the user a chance to change password when password will expire soon. + + Signed-off-by: Bo Yang <boyang@samba.org> + (cherry picked from commit f7723293a07d1b7a4f3476939590fa8db6080d06) + +Index: nsswitch/pam_winbind.c +=================================================================== +--- nsswitch/pam_winbind.c.orig ++++ nsswitch/pam_winbind.c +@@ -803,6 +803,37 @@ static int wbc_auth_error_to_pam_error(s + return pam_winbind_request_log(ctx, ret, username, fn); + } + ++static bool _pam_winbind_change_pwd(struct pwb_context *ctx) ++{ ++ struct pam_message msg, *pmsg; ++ struct pam_response *resp = NULL; ++ const char *prompt; ++ int ret; ++ bool retval = false; ++ prompt = _("Do you want to change your password now?"); ++ pmsg = &msg; ++ msg.msg_style = PAM_RADIO_TYPE; ++ msg.msg = prompt; ++ ret = converse(ctx->pamh, 1, &pmsg, &resp); ++ if (resp == NULL) { ++ if (ret == PAM_SUCCESS) { ++ _pam_log(ctx, LOG_CRIT, "pam_winbind: system error!\n"); ++ return false; ++ } ++ } ++ if (ret != PAM_SUCCESS) { ++ return false; ++ } ++ _pam_log(ctx, LOG_CRIT, "Received [%s] reply from application.\n", resp->resp); ++ ++ if (strcasecmp(resp->resp, "yes") == 0) { ++ retval = true; ++ } ++ ++ _pam_drop_reply(resp, 1); ++ return retval; ++} ++ + + /** + * send a password expiry message if required +@@ -819,15 +850,22 @@ static bool _pam_send_password_expiry_me + time_t next_change, + time_t now, + int warn_pwd_expire, +- bool *already_expired) ++ bool *already_expired, ++ bool *change_pwd) + { + int days = 0; + struct tm tm_now, tm_next_change; ++ bool retval = false; ++ int ret; + + if (already_expired) { + *already_expired = false; + } + ++ if (change_pwd) { ++ *change_pwd = false; ++ } ++ + if (next_change <= now) { + PAM_WB_REMARK_DIRECT(ctx, "NT_STATUS_PASSWORD_EXPIRED"); + if (already_expired) { +@@ -850,15 +888,61 @@ static bool _pam_send_password_expiry_me + (tm_now.tm_yday+tm_now.tm_year*365); + + if (days == 0) { +- _make_remark(ctx, PAM_TEXT_INFO, +- _("Your password expires today")); ++ ret = _make_remark(ctx, PAM_TEXT_INFO, ++ _("Your password expires today.\n")); ++ ++ /* ++ * If change_pwd and already_expired is null. ++ * We are just sending a notification message. ++ * We don't expect any response in this case. ++ */ ++ ++ if (!change_pwd && !already_expired) { ++ return true; ++ } ++ ++ /* ++ * successfully sent the warning message. ++ * Give the user a chance to change pwd. ++ */ ++ if (ret == PAM_SUCCESS) { ++ if (change_pwd) { ++ retval = _pam_winbind_change_pwd(ctx); ++ if (retval) { ++ *change_pwd = true; ++ } ++ } ++ } + return true; + } + + if (days > 0 && days < warn_pwd_expire) { +- _make_remark_format(ctx, PAM_TEXT_INFO, +- _("Your password will expire in %d %s"), +- days, (days > 1) ? _("days"):_("day")); ++ ++ ret = _make_remark_format(ctx, PAM_TEXT_INFO, ++ _("Your password will expire in %d %s.\n"), ++ days, (days > 1) ? _("days"):_("day")); ++ /* ++ * If change_pwd and already_expired is null. ++ * We are just sending a notification message. ++ * We don't expect any response in this case. ++ */ ++ ++ if (!change_pwd && !already_expired) { ++ return true; ++ } ++ ++ /* ++ * successfully sent the warning message. ++ * Give the user a chance to change pwd. ++ */ ++ if (ret == PAM_SUCCESS) { ++ if (change_pwd) { ++ retval = _pam_winbind_change_pwd(ctx); ++ if (retval) { ++ *change_pwd = true; ++ } ++ } ++ } + return true; + } + +@@ -879,7 +963,8 @@ static void _pam_warn_password_expiry(st + const struct wbcAuthUserInfo *info, + const struct wbcUserPasswordPolicyInfo *policy, + int warn_pwd_expire, +- bool *already_expired) ++ bool *already_expired, ++ bool *change_pwd) + { + time_t now = time(NULL); + time_t next_change = 0; +@@ -892,6 +977,10 @@ static void _pam_warn_password_expiry(st + *already_expired = false; + } + ++ if (change_pwd) { ++ *change_pwd = false; ++ } ++ + /* accounts with WBC_ACB_PWNOEXP set never receive a warning */ + if (info->acct_flags & WBC_ACB_PWNOEXP) { + return; +@@ -907,7 +996,8 @@ static void _pam_warn_password_expiry(st + + if (_pam_send_password_expiry_message(ctx, next_change, now, + warn_pwd_expire, +- already_expired)) { ++ already_expired, ++ change_pwd)) { + return; + } + +@@ -923,7 +1013,8 @@ static void _pam_warn_password_expiry(st + + if (_pam_send_password_expiry_message(ctx, next_change, now, + warn_pwd_expire, +- already_expired)) { ++ already_expired, ++ change_pwd)) { + return; + } + +@@ -1740,11 +1831,13 @@ static int winbind_auth_request(struct p + if ((ret == PAM_SUCCESS) && user_info && policy && info) { + + bool already_expired = false; ++ bool change_pwd = false; + + /* warn a user if the password is about to expire soon */ + _pam_warn_password_expiry(ctx, user_info, policy, + warn_pwd_expire, +- &already_expired); ++ &already_expired, ++ &change_pwd); + + if (already_expired == true) { + +@@ -1763,6 +1856,11 @@ static int winbind_auth_request(struct p + return PAM_AUTHTOK_EXPIRED; + } + ++ if (change_pwd) { ++ ret = PAM_NEW_AUTHTOK_REQD; ++ goto done; ++ } ++ + /* inform about logon type */ + _pam_warn_logon_type(ctx, user, user_info->user_flags); + +@@ -3120,7 +3218,7 @@ int pam_sm_chauthtok(pam_handle_t * pamh + * expire soon */ + _pam_warn_password_expiry(ctx, user_info, policy, + warn_pwd_expire, +- NULL); ++ NULL, NULL); + + /* set some info3 info for other modules in the + * stack */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66 new/patches/samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66 --- old/patches/samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66 2010-01-07 12:49:30.000000000 +0100 @@ -0,0 +1,75 @@ +commit 3d72c96d125a9dd048cc9c358b01aa354a5afa66 +Author: Bo Yang <boyang@samba.org> +Date: Thu Dec 10 19:29:24 2009 +0800 + + s3: check for PAM_RADIO_TYPE. + + Signed-off-by: Bo Yang <boyang@samba.org> + (cherry picked from commit c7e3a2dc319cc6504356be7fa7970917404a69b5) + +Index: nsswitch/pam_winbind.c +=================================================================== +--- nsswitch/pam_winbind.c.orig ++++ nsswitch/pam_winbind.c +@@ -803,8 +803,7 @@ static int wbc_auth_error_to_pam_error(s + return pam_winbind_request_log(ctx, ret, username, fn); + } + +-/* PAM_RADIO_TYPE is linux-only. */ +-#ifdef LINUX ++#if defined(HAVE_PAM_RADIO_TYPE) + static bool _pam_winbind_change_pwd(struct pwb_context *ctx) + { + struct pam_message msg, *pmsg; +@@ -842,7 +841,6 @@ static bool _pam_winbind_change_pwd(stru + } + #endif + +- + /** + * send a password expiry message if required + * +Index: source3/configure.in +=================================================================== +--- source3/configure.in.orig ++++ source3/configure.in +@@ -4208,6 +4208,39 @@ if test x"${try_pam}" != x"no";then + fi # try_pam != no + + ################################################# ++# check for PAM_RADIO_TYPE ++AC_TRY_COMPILE([ ++#if (!defined(LINUX)) ++ ++#define PAM_EXTERN extern ++#if defined(HAVE_SECURITY_PAM_APPL_H) ++#include <security/pam_appl.h> ++#elif defined(HAVE_PAM_PAM_APPL_H) ++#include <pam/pam_appl.h> ++#endif ++ ++#endif ++ ++#if defined(HAVE_SECURITY_PAM_MODULES_H) ++#include <security/pam_modules.h> ++#elif defined(HAVE_PAM_PAM_MODULES_H) ++#include <pam/pam_modules.h> ++#endif ++ ++#if defined(HAVE_SECURITY__PAM_MACROS_H) ++#include <security/_pam_macros.h> ++#elif defined(HAVE_PAM__PAM_MACROS_H) ++#include <pam/_pam_macros.h> ++#endif ++ ++#ifdef HAVE_SECURITY_PAM_EXT_H ++#include <security/pam_ext.h> ++#endif ++], ++[int i; i = PAM_RADIO_TYPE; ], ++AC_DEFINE(HAVE_PAM_RADIO_TYPE, 1, [Define to 1 if PAM_RADIO_TYPE is available]),[]) ++ ++################################################# + # check for pam_smbpass support + PAM_MODULES="" + INSTALL_PAM_MODULES="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/e171c09c3bae678db68c3ded5765d602c8438e25 new/patches/samba.org/e171c09c3bae678db68c3ded5765d602c8438e25 --- old/patches/samba.org/e171c09c3bae678db68c3ded5765d602c8438e25 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/e171c09c3bae678db68c3ded5765d602c8438e25 2010-01-07 12:49:30.000000000 +0100 @@ -0,0 +1,35 @@ +commit e171c09c3bae678db68c3ded5765d602c8438e25 +Author: Bo Yang <boyang@samba.org> +Date: Thu Dec 10 17:20:03 2009 +0800 + + s3: Fix build on non-linux platform. + + Signed-off-by: Bo Yang <boyang@samba.org> + (cherry picked from commit b386c3311d8c05ccbd075ab86be2ddace335b73b) + +Index: nsswitch/pam_winbind.c +=================================================================== +--- nsswitch/pam_winbind.c.orig ++++ nsswitch/pam_winbind.c +@@ -803,6 +803,8 @@ static int wbc_auth_error_to_pam_error(s + return pam_winbind_request_log(ctx, ret, username, fn); + } + ++/* PAM_RADIO_TYPE is linux-only. */ ++#ifdef LINUX + static bool _pam_winbind_change_pwd(struct pwb_context *ctx) + { + struct pam_message msg, *pmsg; +@@ -833,6 +835,12 @@ static bool _pam_winbind_change_pwd(stru + _pam_drop_reply(resp, 1); + return retval; + } ++#else ++static bool _pam_winbind_change_pwd(struct pwb_context *ctx) ++{ ++ return false; ++} ++#endif + + + /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2009-11-26 19:29:28.000000000 +0100 +++ new/patches/series 2010-01-07 12:49:30.000000000 +0100 @@ -6,6 +6,9 @@ # Samba patches from upstream, svnanon.Samba.org samba.org/2300ec3006098536c1a615820b4774d625f82c05 -p0 # bnc 546162, bso 6872. Backported from 3.5.x(master). +samba.org/2d063d077aed01f020352e859b766415fe094fa5 -p0 # FATE 302414. Backported from 3.5.x(master). +samba.org/e171c09c3bae678db68c3ded5765d602c8438e25 -p0 # FATE 302414. Backported from 3.5.x(master). +samba.org/3d72c96d125a9dd048cc9c358b01aa354a5afa66 -p0 # FATE 302414. Backported from 3.5.x(master). # SuSE specific changes # disabled -> WIP lmuelle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/passdb_backend_defaults_smbpasswd.diff new/patches/suse/passdb_backend_defaults_smbpasswd.diff --- old/patches/suse/passdb_backend_defaults_smbpasswd.diff 2009-11-26 19:29:28.000000000 +0100 +++ new/patches/suse/passdb_backend_defaults_smbpasswd.diff 2010-01-07 12:49:30.000000000 +0100 @@ -8,7 +8,7 @@ =================================================================== --- source3/param/loadparm.c.orig +++ source3/param/loadparm.c -@@ -4990,7 +4990,7 @@ static void init_globals(bool first_time +@@ -5006,7 +5006,7 @@ static void init_globals(bool first_time a large number of sites (tridge) */ Globals.bHostnameLookups = False; ++++++ samba-3.4.3.tar.bz2 -> samba-3.4.4.tar.bz2 ++++++ samba/samba-3.4.3.tar.bz2 /mounts/work_src_done/STABLE/samba/samba-3.4.4.tar.bz2 differ: char 11, line 1 ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/config/cifstab new/vendor-files/config/cifstab --- old/vendor-files/config/cifstab 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/config/cifstab 2010-01-07 12:49:30.000000000 +0100 @@ -0,0 +1,10 @@ +# This file allows you to mount SMB/ CIFS shares during system boot while +# hiding passwords to other people than root. Use /etc/fstab for public +# available services. You have to specify at least a service name and a mount +# point. Current default vfstype is cifs. +# +# The options are explained in the manual page of mount.cifs. +# +# service moint-point vfstype options + +;//fjall/test /data/test cifs username=tridge,password=foobar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/config/smbfstab new/vendor-files/config/smbfstab --- old/vendor-files/config/smbfstab 2009-11-26 19:29:27.000000000 +0100 +++ new/vendor-files/config/smbfstab 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -# This file allows you to mount SMB/ CIFS shares during system boot while -# hiding passwords to other people than root. Use /etc/fstab for public -# available services. You have to specify at least a service name and a mount -# point. Current default vfstype is smbfs. -# -# Possible vfstypes are smbfs and cifs. -# -# The options are explained in the manual page of smbmount and mount.cifs. -# -# service moint-point vfstype options - -;//fjall/test /data/test cifs username=tridge,password=foobar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/cifs new/vendor-files/init/cifs --- old/vendor-files/init/cifs 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/init/cifs 2010-01-07 12:49:30.000000000 +0100 @@ -0,0 +1,222 @@ +#! /bin/sh +# Copyright (c) 1999-2009 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# Author: Thomas Fehr, 1999-2001 +# Lars Mueller <lmuelle@suse.de>, 2002-2009 +# Bjoern Jacke <bjacke@SerNet.de> 2004 +# +# /etc/init.d/cifs +# and its symbolic link +# /usr/sbin/rccifs +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +### BEGIN INIT INFO +# Provides: cifs +# Required-Start: $network $syslog +# Should-Start: nmb +# Required-Stop: $network $syslog +# Should-Stop: nmb +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Import remote SMB/ CIFS (MS Windows) file systems +# Description: Import remote SMB/ CIFS (MS Windows) file systems +### END INIT INFO + +# To access SMB/ CIFS servers beyond the network broadcast domain it may be +# necessary to also activate the nmb service. Also see section 'cifs and nmb +# service' in /usr/share/doc/packages/samba/README.SUSE + +. /etc/rc.status +rc_reset + +LC_ALL=en_US +CIFSTAB="/etc/samba/cifstab" +SMB_CONF="/etc/samba/smb.conf" +CIFS_STATE_FILE="/var/lock/subsys/cifs" +SLEEP=1 +TIMEOUT=10 + +grep -q " cifs " /proc/mounts +test $? -eq 0 && cifs_used=yes || cifs_used=no + +case "$1" in + start) + grep -q '^[[:space:]]*[^#].*[[:space:]]cifs[[:space:]]' /etc/fstab + rc=$? + if [ ! -f ${CIFSTAB} -a ${rc} -ne 0 ]; then + echo -n >&2 "No ${CIFSTAB} found and no type cifs active in /etc/fstab. " + rc_status -s + exit 6 + fi + echo -n "Mount CIFS File Systems " + service_used="no" + if [ ${rc} -eq 0 ]; then + service_used="yes" + timer=${TIMEOUT} + JOBS="none" + printdot="" + while [ "${JOBS}" ] && [ ${timer} -gt 0 ]; do + if [ -z "${printdot}" ]; then + echo + echo -n "from /etc/fstab " + mount -at cifs >/dev/null & + PID=$! + fi + test -e /proc/$PID || JOBS="" + if [ "${JOBS}" ]; then + timer=$[${timer}-1] + echo -n "." + sleep ${SLEEP} + printdot="yes" + fi + done + test "${printdot}" && echo -n " " + if [ "${JOBS}" -a ${timer} -eq 0 ]; then + echo -n >&2 " Error: timeout while mount. " + rc_failed + fi + rc_status -v + fi + timer=-1 + test -e ${CIFSTAB} && \ + while read service mountpoint vfstype options; do + case "${service}" in + ""|#*|;*) continue ;; + esac + # Set default vfstype which is also a hack for old + # cifstab formated files without a vfstype set. + if [ "${vfstype}" != "cifs" -a -z "${options}" ]; then + options="${vfstype}" + vfstype="cifs" + fi + # If no options are set use an empty password. + if [ -z "${options}" ]; then + options="password=" + fi + if [ ${timer} -eq -1 ]; then + echo -en "from ${CIFSTAB} \n" + timer=0 + fi + # Remove /s at the end of a mount point. + mountpoint=$( echo "$mountpoint"|sed "s//*$//") + if grep -q "[[:space:]]$mountpoint[[:space:]]" /proc/mounts; then + echo -n "$mountpoint: mount point already in use. " + rc_status -s + continue + fi + service_used="yes" + echo -n "${service} on ${mountpoint} type ${vfstype} " + rc_reset + timer=${TIMEOUT} + JOBS="none" + printdot="" + while [ "${JOBS}" ] && [ ${timer} -gt 0 ]; do + if [ -z "${printdot}" ]; then + mount -t "${vfstype}" -o ${options} "${service}" "${mountpoint}" >/dev/null & + PID=$! + fi + test -e /proc/$PID || JOBS="" + if [ "${JOBS}" ]; then + timer=$[${timer}-1] + echo -n "." + sleep ${SLEEP} + printdot="yes" + fi + done + test "${printdot}" && echo -n " " + if [ "${JOBS}" -a ${timer} -eq 0 ]; then + echo -n >&2 " Error: timeout while mount. " + rc_failed + fi + rc_status -v + done < ${CIFSTAB} + test "${service_used}" = "no" && rc_status -u + touch ${CIFS_STATE_FILE} + ;; + stop) + echo -n "Umount CIFS File Systems " + if [ "${cifs_used}" = "yes" ]; then + # + # Unmount in background due to possible long timeouts + # + timer=${TIMEOUT} + JOBS="none" + printdot="" + while [ "${JOBS}" ] && [ ${timer} -gt 0 ]; do + if [ -z "${printdot}" ]; then + umount -at cifs & + PID=$! + fi + test -e /proc/$PID || JOBS="" + if [ "${JOBS}" ]; then + timer=$[${timer}-1] + echo -n "." + sleep ${SLEEP} + printdot="yes" + fi + done + test "${printdot}" && echo -n " " + if [ "${JOBS}" -a ${timer} -eq 0 ]; then + echo -n >&2 " Error: timeout while umount. " + rc_failed + fi + fi + rc_status -v + ;; + try-restart|condrestart) + if test "$1" = "condrestart"; then + echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" + fi + $0 status + if test $? = 0; then + $0 restart + else + rc_reset + fi + rc_status + ;; + force-reload|restart) + $0 stop + $0 start + rc_status + ;; + reload) + echo -n "Reload mounted CIFS File Systems " + rc_failed 3 + rc_status -v + ;; + status) + echo -n "Checking for mounted CIFS File Systems " + if [ "${cifs_used}" = "yes" ]; then + mount -t cifs | while read service on mountpoint type vfstype rest; do + echo + echo -n "${service} on ${mountpoint} type ${vfstype} " + done + else + rc_failed 3 + fi + rc_status -v + ;; + probe) + test ${CIFSTAB} -nt ${CIFS_STATE_FILE} -o \ + ${SMB_CONF} -nt ${CIFS_STATE_FILE} && echo restart + ;; + *) + echo "Usage: $0 {start|stop|status|force-reload|reload|restart|reload|probe}" + exit 1 + ;; +esac +rc_exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/cifs new/vendor-files/tools/cifs --- old/vendor-files/tools/cifs 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/tools/cifs 2010-01-07 12:49:30.000000000 +0100 @@ -0,0 +1,77 @@ +#! /bin/bash +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Andreas Schneider <anschneider@suse.de> + +# cifs +# +# Script to restart cifs + +unset ${!LC_*} LANGUAGE +export LANG="POSIX" +export PATH="/sbin:/usr/sbin:/bin/:/usr/bin" + +numArgs=$# +configname="$1" +shift +interface="$1" +if [ $interface = "lo" ]; then + exit 0 +fi +shift +# And shift away the '-o'. +shift +options="$@" + +# Log functions +function log_dbg() +{ + case "${options}" in + *debug*) + logger -t $0 -p daemon.debug "$1" + ;; + esac +} +function log_err() +{ + logger -t $0 -p daemon.err "$1" + exit 1 +} + +source /etc/rc.status + +# Main case switch +case "$0" in + *if-up.d*) + if rc_active nmb; then + log_msg=$( rcnmb start 2>&1) + log_dbg "${log_msg}" + fi + if rc_active cifs; then + log_msg=$( rccifs restart 2>&1) + log_dbg "${log_msg}" + fi + ;; + *if-down.d*) + if rc_active cifs; then + log_msg=$( rccifs stop 2>&1) + log_dbg "${log_msg}" + fi + ;; + *) + log_err "Don't know what to do. This script used to be called from dir if-{up,down}.d/." + ;; +esac 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 2009-12-03 12:37:48.000000000 +0100 +++ new/vendor-files/tools/package-data 2010-01-07 12:52:12.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2248" +SAMBA_PACKAGE_SVN_VERSION="2267" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org