Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2017-07-17 09:00:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba" Mon Jul 17 09:00:05 2017 rev:217 rq:510316 version:4.6.5+git.32.af7a173b7a1 Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2017-06-29 15:12:38.546028894 +0200 +++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2017-07-17 09:00:06.789265468 +0200 @@ -1,0 +2,11 @@ +Thu Jul 13 21:13:21 UTC 2017 - [email protected] + +- Fix ctdb logs to /var/log/log.ctdb instead of /var/log/ctdb; (bsc#1048339). + +------------------------------------------------------------------- +Wed Jul 12 22:30:48 UTC 2017 - [email protected] + +- Fix inconsistent ctdb socket path; (bsc#1048352). +- Fix non-admin cephx authentication; (bsc#1048387). + +------------------------------------------------------------------- Old: ---- samba-4.6.5+git.27.6afd48b1083.tar.bz2 vendor-files-git.b446743.tar.bz2 New: ---- samba-4.6.5+git.32.af7a173b7a1.tar.bz2 vendor-files-git.f8c2b1c.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.JJVqgs/_old 2017-07-17 09:00:10.832696124 +0200 +++ /var/tmp/diff_new_pack.JJVqgs/_new 2017-07-17 09:00:10.836695561 +0200 @@ -26,7 +26,7 @@ %define build_ceph 1 %endif %endif -%define vendor_files_git_vers git.b446743 +%define vendor_files_git_vers git.f8c2b1c Name: samba BuildRequires: autoconf @@ -147,7 +147,7 @@ %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 -Version: 4.6.5+git.27.6afd48b1083 +Version: 4.6.5+git.32.af7a173b7a1 Release: 0 Url: https://www.samba.org/ Obsoletes: samba-32bit < %{version} @@ -1106,6 +1106,7 @@ %endif --enable-fhs \ --with-cluster-support \ + --with-socketpath=%{_localstatedir}/lib/ctdb/ctdb.socket \ %if 0%{?build_ceph} --enable-ceph-reclock \ %endif @@ -1626,6 +1627,9 @@ %if 0%{?suse_version} > 1220 %service_add_pre ctdb.service %endif +if [ -e %{_sysconfdir}/sysconfig/ctdb ] ; then + sed -i s/CTDB_LOGFILE=/CTDB_LOGGING=file:/g %{_sysconfdir}/sysconfig/ctdb +fi %preun -n ctdb %if 0%{?suse_version} > 1220 ++++++ samba-4.6.5+git.27.6afd48b1083.tar.bz2 -> samba-4.6.5+git.32.af7a173b7a1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/samba/samba-4.6.5+git.27.6afd48b1083.tar.bz2 /work/SRC/openSUSE:Factory/.samba.new/samba-4.6.5+git.32.af7a173b7a1.tar.bz2 differ: char 11, line 1 ++++++ vendor-files-git.b446743.tar.bz2 -> vendor-files-git.f8c2b1c.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files-git.b446743/config/sysconfig.ctdb new/vendor-files-git.f8c2b1c/config/sysconfig.ctdb --- old/vendor-files-git.b446743/config/sysconfig.ctdb 2017-05-22 15:15:17.000000000 +0200 +++ new/vendor-files-git.f8c2b1c/config/sysconfig.ctdb 2017-07-14 14:54:18.000000000 +0200 @@ -302,7 +302,7 @@ ## Default: /var/log/ctdb/log.ctdb # where to log messages # the default is /var/log/ctdb/log.ctdb -CTDB_LOGFILE=/var/log/ctdb/log.ctdb +CTDB_LOGGING=file:/var/log/ctdb/log.ctdb ## Description: Ctdb debug level ## Type: integer(0:10) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files-git.b446743/init/nmb-1010 new/vendor-files-git.f8c2b1c/init/nmb-1010 --- old/vendor-files-git.b446743/init/nmb-1010 2017-07-17 09:00:11.000672472 +0200 +++ new/vendor-files-git.f8c2b1c/init/nmb-1010 2017-07-14 14:54:18.000000000 +0200 @@ -1 +1,133 @@ -symbolic link to nmb +#! /bin/sh +# Copyright (c) 2002-2004 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# Author: Lars Mueller <[email protected]> +# +# /etc/init.d/nmb +# and its symbolic link +# /usr/sbin/rcnmb +# +# 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: nmb +# Required-Start: $network $syslog +# Should-Start: $null +# Required-Stop: $network $syslog +# Should-Stop: $null +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Samba NetBIOS naming service over IP +# Description: Samba NetBIOS naming service over IP +### END INIT INFO + +NMBD_BIN="/usr/sbin/nmbd" +NMBD_NAMELIST="/var/lib/samba/namelist.debug" +SMB_CONF="/etc/samba/smb.conf" +PID_FILE="/var/run/samba/nmbd.pid" + +. /etc/rc.status +rc_reset + +# Check for missing binary +if [ ! -x ${NMBD_BIN} ]; then + echo -n >&2 "Samba NMB daemon, ${NMBD_BIN} is not installed. " + rc_status -s + exit 5 +fi + +test -f /etc/sysconfig/samba && \ + . /etc/sysconfig/samba + +for setting in $SAMBA_NMBD_ENV; do + pathcheck="${setting%%:*}" + variable="${setting##*:}" + test "${pathcheck}" != "${variable}" -a ! -e "${pathcheck}" && \ + continue + export eval ${variable} +done + +case "$1" in + start) + echo -n "Starting Samba NMB daemon " + if [ ! -f ${SMB_CONF} ]; then + echo -n >&2 "Samba configuration file, ${SMB_CONF} does not exist. " + rc_status -s + exit 6 + fi + checkproc -p ${PID_FILE} ${NMBD_BIN} + case $? in + 0) echo -n "- Warning: daemon already running. " ;; + 1) echo -n "- Warning: ${PID_FILE} exists. " ;; + esac + test -d "${PID_FILE%/nmbd.pid}" || \ + mkdir -m 0755 -p "${PID_FILE%/nmbd.pid}" + startproc -p ${PID_FILE} -W ${PID_FILE} ${NMBD_BIN} -D -s ${SMB_CONF} + rc_status -v + ;; + stop) + echo -n "Shutting down Samba NMB daemon " + checkproc -p ${PID_FILE} ${NMBD_BIN} || \ + echo -n " Warning: daemon not running. " + killproc -p ${PID_FILE} -t 10 ${NMBD_BIN} + 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 + ;; + restart) + $0 stop + $0 start + rc_status + ;; + force-reload) + $0 try-restart + rc_status + ;; + reload) + echo -n "Reloading Samba NMB daemon " + rc_failed 3 + rc_status -v + ;; + dump-nmbd) + echo -n "Dump Samba NMB daemon namelists to ${NMBD_NAMELIST}. " + checkproc -p ${PID_FILE} ${NMBD_BIN} || \ + echo -n " Warning: daemon not running. " + killproc -p ${PID_FILE} -HUP ${NMBD_BIN} + rc_status -v + ;; + status) + echo -n "Checking for Samba NMB daemon " + checkproc -p ${PID_FILE} ${NMBD_BIN} + rc_status -v + ;; + probe) + test ${SMB_CONF} -nt ${PID_FILE} && echo restart + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe|dump-nmbd}" + exit 1 + ;; +esac +rc_exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files-git.b446743/init/nmb-1130 new/vendor-files-git.f8c2b1c/init/nmb-1130 --- old/vendor-files-git.b446743/init/nmb-1130 2017-07-17 09:00:11.016670219 +0200 +++ new/vendor-files-git.f8c2b1c/init/nmb-1130 2017-07-14 14:54:18.000000000 +0200 @@ -1 +1,133 @@ -symbolic link to nmb +#! /bin/sh +# Copyright (c) 2002-2004 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# Author: Lars Mueller <[email protected]> +# +# /etc/init.d/nmb +# and its symbolic link +# /usr/sbin/rcnmb +# +# 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: nmb +# Required-Start: $network $syslog +# Should-Start: $null +# Required-Stop: $network $syslog +# Should-Stop: $null +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Samba NetBIOS naming service over IP +# Description: Samba NetBIOS naming service over IP +### END INIT INFO + +NMBD_BIN="/usr/sbin/nmbd" +NMBD_NAMELIST="/var/lib/samba/namelist.debug" +SMB_CONF="/etc/samba/smb.conf" +PID_FILE="/var/run/samba/nmbd.pid" + +. /etc/rc.status +rc_reset + +# Check for missing binary +if [ ! -x ${NMBD_BIN} ]; then + echo -n >&2 "Samba NMB daemon, ${NMBD_BIN} is not installed. " + rc_status -s + exit 5 +fi + +test -f /etc/sysconfig/samba && \ + . /etc/sysconfig/samba + +for setting in $SAMBA_NMBD_ENV; do + pathcheck="${setting%%:*}" + variable="${setting##*:}" + test "${pathcheck}" != "${variable}" -a ! -e "${pathcheck}" && \ + continue + export eval ${variable} +done + +case "$1" in + start) + echo -n "Starting Samba NMB daemon " + if [ ! -f ${SMB_CONF} ]; then + echo -n >&2 "Samba configuration file, ${SMB_CONF} does not exist. " + rc_status -s + exit 6 + fi + checkproc -p ${PID_FILE} ${NMBD_BIN} + case $? in + 0) echo -n "- Warning: daemon already running. " ;; + 1) echo -n "- Warning: ${PID_FILE} exists. " ;; + esac + test -d "${PID_FILE%/nmbd.pid}" || \ + mkdir -m 0755 -p "${PID_FILE%/nmbd.pid}" + startproc -p ${PID_FILE} -W ${PID_FILE} ${NMBD_BIN} -D -s ${SMB_CONF} + rc_status -v + ;; + stop) + echo -n "Shutting down Samba NMB daemon " + checkproc -p ${PID_FILE} ${NMBD_BIN} || \ + echo -n " Warning: daemon not running. " + killproc -p ${PID_FILE} -t 10 ${NMBD_BIN} + 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 + ;; + restart) + $0 stop + $0 start + rc_status + ;; + force-reload) + $0 try-restart + rc_status + ;; + reload) + echo -n "Reloading Samba NMB daemon " + rc_failed 3 + rc_status -v + ;; + dump-nmbd) + echo -n "Dump Samba NMB daemon namelists to ${NMBD_NAMELIST}. " + checkproc -p ${PID_FILE} ${NMBD_BIN} || \ + echo -n " Warning: daemon not running. " + killproc -p ${PID_FILE} -HUP ${NMBD_BIN} + rc_status -v + ;; + status) + echo -n "Checking for Samba NMB daemon " + checkproc -p ${PID_FILE} ${NMBD_BIN} + rc_status -v + ;; + probe) + test ${SMB_CONF} -nt ${PID_FILE} && echo restart + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe|dump-nmbd}" + exit 1 + ;; +esac +rc_exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files-git.b446743/init/nmb-900 new/vendor-files-git.f8c2b1c/init/nmb-900 --- old/vendor-files-git.b446743/init/nmb-900 2017-07-17 09:00:10.992673598 +0200 +++ new/vendor-files-git.f8c2b1c/init/nmb-900 2017-07-14 14:54:18.000000000 +0200 @@ -1 +1,133 @@ -symbolic link to nmb +#! /bin/sh +# Copyright (c) 2002-2004 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# Author: Lars Mueller <[email protected]> +# +# /etc/init.d/nmb +# and its symbolic link +# /usr/sbin/rcnmb +# +# 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: nmb +# Required-Start: $network $syslog +# Should-Start: $null +# Required-Stop: $network $syslog +# Should-Stop: $null +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Samba NetBIOS naming service over IP +# Description: Samba NetBIOS naming service over IP +### END INIT INFO + +NMBD_BIN="/usr/sbin/nmbd" +NMBD_NAMELIST="/var/lib/samba/namelist.debug" +SMB_CONF="/etc/samba/smb.conf" +PID_FILE="/var/run/samba/nmbd.pid" + +. /etc/rc.status +rc_reset + +# Check for missing binary +if [ ! -x ${NMBD_BIN} ]; then + echo -n >&2 "Samba NMB daemon, ${NMBD_BIN} is not installed. " + rc_status -s + exit 5 +fi + +test -f /etc/sysconfig/samba && \ + . /etc/sysconfig/samba + +for setting in $SAMBA_NMBD_ENV; do + pathcheck="${setting%%:*}" + variable="${setting##*:}" + test "${pathcheck}" != "${variable}" -a ! -e "${pathcheck}" && \ + continue + export eval ${variable} +done + +case "$1" in + start) + echo -n "Starting Samba NMB daemon " + if [ ! -f ${SMB_CONF} ]; then + echo -n >&2 "Samba configuration file, ${SMB_CONF} does not exist. " + rc_status -s + exit 6 + fi + checkproc -p ${PID_FILE} ${NMBD_BIN} + case $? in + 0) echo -n "- Warning: daemon already running. " ;; + 1) echo -n "- Warning: ${PID_FILE} exists. " ;; + esac + test -d "${PID_FILE%/nmbd.pid}" || \ + mkdir -m 0755 -p "${PID_FILE%/nmbd.pid}" + startproc -p ${PID_FILE} -W ${PID_FILE} ${NMBD_BIN} -D -s ${SMB_CONF} + rc_status -v + ;; + stop) + echo -n "Shutting down Samba NMB daemon " + checkproc -p ${PID_FILE} ${NMBD_BIN} || \ + echo -n " Warning: daemon not running. " + killproc -p ${PID_FILE} -t 10 ${NMBD_BIN} + 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 + ;; + restart) + $0 stop + $0 start + rc_status + ;; + force-reload) + $0 try-restart + rc_status + ;; + reload) + echo -n "Reloading Samba NMB daemon " + rc_failed 3 + rc_status -v + ;; + dump-nmbd) + echo -n "Dump Samba NMB daemon namelists to ${NMBD_NAMELIST}. " + checkproc -p ${PID_FILE} ${NMBD_BIN} || \ + echo -n " Warning: daemon not running. " + killproc -p ${PID_FILE} -HUP ${NMBD_BIN} + rc_status -v + ;; + status) + echo -n "Checking for Samba NMB daemon " + checkproc -p ${PID_FILE} ${NMBD_BIN} + rc_status -v + ;; + probe) + test ${SMB_CONF} -nt ${PID_FILE} && echo restart + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe|dump-nmbd}" + exit 1 + ;; +esac +rc_exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files-git.b446743/init/smb-1010 new/vendor-files-git.f8c2b1c/init/smb-1010 --- old/vendor-files-git.b446743/init/smb-1010 2017-07-17 09:00:11.032667967 +0200 +++ new/vendor-files-git.f8c2b1c/init/smb-1010 2017-07-14 14:54:18.000000000 +0200 @@ -1 +1,137 @@ -symbolic link to smb +#! /bin/sh +# Copyright (c) 1999-2004 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# Author: Lars Mueller <[email protected]> +# +# /etc/init.d/smb +# and its symbolic link +# /usr/sbin/rcsmb +# +# 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: smb +# Required-Start: $network $remote_fs $syslog +# Should-Start: cupsd winbind nmb ldap +# Required-Stop: $network $remote_fs $syslog +# Should-Stop: cupsd winbind nmb ldap +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Samba SMB/CIFS file and print server +# Description: Samba SMB/CIFS file and print server +### END INIT INFO + +SMBD_BIN="/usr/sbin/smbd" +SMB_CONF="/etc/samba/smb.conf" +PID_FILE="/var/run/samba/smbd.pid" + +SMB_APPARMOR_UPDATE="/usr/share/samba/update-apparmor-samba-profile" + +. /etc/rc.status +rc_reset + +# Check for missing binary +if [ ! -x ${SMBD_BIN} ]; then + echo -n >&2 "Samba SMB daemon, ${SMBD_BIN} is not installed. " + rc_status -s + exit 5 +fi + +# be extra carefull cause connection fail if TMPDIR is not writeable +export TMPDIR="/var/tmp" + +test -f /etc/sysconfig/samba && \ + . /etc/sysconfig/samba + +for setting in $SAMBA_SMBD_ENV; do + pathcheck="${setting%%:*}" + variable="${setting##*:}" + test "${pathcheck}" != "${variable}" -a ! -e "${pathcheck}" && \ + continue + export eval ${variable} +done + +case "$1" in + start) + echo -n "Starting Samba SMB daemon " + if [ ! -f ${SMB_CONF} ]; then + echo -n >&2 "Samba configuration file, ${SMB_CONF} does not exist. " + rc_status -s + exit 6 + fi + checkproc -p ${PID_FILE} ${SMBD_BIN} + case $? in + 0) echo -n "- Warning: daemon already running. " ;; + 1) echo -n "- Warning: ${PID_FILE} exists. " ;; + esac + test -d "${PID_FILE%/smbd.pid}" || \ + mkdir -m 0755 -p "${PID_FILE%/smbd.pid}" + test -f /etc/sysconfig/language && \ + . /etc/sysconfig/language + "${SMB_APPARMOR_UPDATE}" + export LC_ALL="$RC_LC_ALL" + export LC_CTYPE="$RC_LC_CTYPE" + export LANG="$RC_LANG" + startproc -p ${PID_FILE} -W ${PID_FILE} ${SMBD_BIN} -D -s ${SMB_CONF} + rc_status -v + unset LC_ALL LC_CTYPE LANG + ;; + stop) + echo -n "Shutting down Samba SMB daemon " + checkproc -p ${PID_FILE} ${SMBD_BIN} || \ + echo -n " Warning: daemon not running. " + killproc -p ${PID_FILE} -t 10 ${SMBD_BIN} + 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 + ;; + restart) + $0 stop + $0 start + rc_status + ;; + force-reload|reload) + echo -n "Reloading Samba SMB daemon " + checkproc -p ${PID_FILE} ${SMBD_BIN} && \ + touch ${PID_FILE} || \ + echo -n >&2 " Warning: daemon not running. " + "${SMB_APPARMOR_UPDATE}" + killproc -p ${PID_FILE} -HUP ${SMBD_BIN} + rc_status -v + ;; + status) + echo -n "Checking for Samba SMB daemon " + checkproc -p ${PID_FILE} ${SMBD_BIN} + rc_status -v + ;; + probe) + test ${SMB_CONF} -nt ${PID_FILE} && echo reload + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" + exit 1 + ;; +esac +rc_exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files-git.b446743/init/smb-1130 new/vendor-files-git.f8c2b1c/init/smb-1130 --- old/vendor-files-git.b446743/init/smb-1130 2017-07-17 09:00:11.004671909 +0200 +++ new/vendor-files-git.f8c2b1c/init/smb-1130 2017-07-14 14:54:18.000000000 +0200 @@ -1 +1,137 @@ -symbolic link to smb +#! /bin/sh +# Copyright (c) 1999-2004 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# Author: Lars Mueller <[email protected]> +# +# /etc/init.d/smb +# and its symbolic link +# /usr/sbin/rcsmb +# +# 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: smb +# Required-Start: $network $remote_fs $syslog +# Should-Start: cupsd winbind nmb ldap +# Required-Stop: $network $remote_fs $syslog +# Should-Stop: cupsd winbind nmb ldap +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Samba SMB/CIFS file and print server +# Description: Samba SMB/CIFS file and print server +### END INIT INFO + +SMBD_BIN="/usr/sbin/smbd" +SMB_CONF="/etc/samba/smb.conf" +PID_FILE="/var/run/samba/smbd.pid" + +SMB_APPARMOR_UPDATE="/usr/share/samba/update-apparmor-samba-profile" + +. /etc/rc.status +rc_reset + +# Check for missing binary +if [ ! -x ${SMBD_BIN} ]; then + echo -n >&2 "Samba SMB daemon, ${SMBD_BIN} is not installed. " + rc_status -s + exit 5 +fi + +# be extra carefull cause connection fail if TMPDIR is not writeable +export TMPDIR="/var/tmp" + +test -f /etc/sysconfig/samba && \ + . /etc/sysconfig/samba + +for setting in $SAMBA_SMBD_ENV; do + pathcheck="${setting%%:*}" + variable="${setting##*:}" + test "${pathcheck}" != "${variable}" -a ! -e "${pathcheck}" && \ + continue + export eval ${variable} +done + +case "$1" in + start) + echo -n "Starting Samba SMB daemon " + if [ ! -f ${SMB_CONF} ]; then + echo -n >&2 "Samba configuration file, ${SMB_CONF} does not exist. " + rc_status -s + exit 6 + fi + checkproc -p ${PID_FILE} ${SMBD_BIN} + case $? in + 0) echo -n "- Warning: daemon already running. " ;; + 1) echo -n "- Warning: ${PID_FILE} exists. " ;; + esac + test -d "${PID_FILE%/smbd.pid}" || \ + mkdir -m 0755 -p "${PID_FILE%/smbd.pid}" + test -f /etc/sysconfig/language && \ + . /etc/sysconfig/language + "${SMB_APPARMOR_UPDATE}" + export LC_ALL="$RC_LC_ALL" + export LC_CTYPE="$RC_LC_CTYPE" + export LANG="$RC_LANG" + startproc -p ${PID_FILE} -W ${PID_FILE} ${SMBD_BIN} -D -s ${SMB_CONF} + rc_status -v + unset LC_ALL LC_CTYPE LANG + ;; + stop) + echo -n "Shutting down Samba SMB daemon " + checkproc -p ${PID_FILE} ${SMBD_BIN} || \ + echo -n " Warning: daemon not running. " + killproc -p ${PID_FILE} -t 10 ${SMBD_BIN} + 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 + ;; + restart) + $0 stop + $0 start + rc_status + ;; + force-reload|reload) + echo -n "Reloading Samba SMB daemon " + checkproc -p ${PID_FILE} ${SMBD_BIN} && \ + touch ${PID_FILE} || \ + echo -n >&2 " Warning: daemon not running. " + "${SMB_APPARMOR_UPDATE}" + killproc -p ${PID_FILE} -HUP ${SMBD_BIN} + rc_status -v + ;; + status) + echo -n "Checking for Samba SMB daemon " + checkproc -p ${PID_FILE} ${SMBD_BIN} + rc_status -v + ;; + probe) + test ${SMB_CONF} -nt ${PID_FILE} && echo reload + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" + exit 1 + ;; +esac +rc_exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files-git.b446743/init/smbfs-1110 new/vendor-files-git.f8c2b1c/init/smbfs-1110 --- old/vendor-files-git.b446743/init/smbfs-1110 2017-07-17 09:00:11.012670782 +0200 +++ new/vendor-files-git.f8c2b1c/init/smbfs-1110 2017-07-14 14:54:18.000000000 +0200 @@ -1 +1,222 @@ -symbolic link to smbfs +#! /bin/sh +# Copyright (c) 1999-2003 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# Author: Thomas Fehr, 1999-2001 +# Lars Mueller <[email protected]>, 2002-2004 +# Bjoern Jacke <[email protected]> 2004 +# +# /etc/init.d/smbfs +# and its symbolic link +# /usr/sbin/rcsmbfs +# +# 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: smbfs +# Required-Start: $network $syslog +# Should-Start: nfs nmb +# Required-Stop: $network $syslog +# Should-Stop: nfs 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 'smbfs and nmb +# service' in /usr/share/doc/packages/samba/README.SUSE + +. /etc/rc.status +rc_reset + +LC_ALL=en_US +SMBFSTAB="/etc/samba/smbfstab" +SMB_CONF="/etc/samba/smb.conf" +SMBFS_STATE_FILE="/var/run/smbfs" +SLEEP=1 +TIMEOUT=10 + +grep -q " cifs " /proc/mounts +test $? -eq 0 && smbfs_used=yes || smbfs_used=no + +case "$1" in + start) + grep -q '^[[:space:]]*[^#].*[[:space:]]cifs[[:space:]]' /etc/fstab + rc=$? + if [ ! -f ${SMBFSTAB} -a ${rc} -ne 0 ]; then + echo -n >&2 "No ${SMBFSTAB} 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 ${SMBFSTAB} && \ + while read service mountpoint vfstype options; do + case "${service}" in + ""|\#*|\;*) continue ;; + esac + # Set default vfstype which is also a hack for old + # smbfstab 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 ${SMBFSTAB} \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 < ${SMBFSTAB} + test "${service_used}" = "no" && rc_status -u + touch ${SMBFS_STATE_FILE} + ;; + stop) + echo -n "Umount SMB/ CIFS File Systems " + if [ "${smbfs_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 SMB/ CIFS File Systems " + rc_failed 3 + rc_status -v + ;; + status) + echo -n "Checking for mounted SMB/ CIFS File Systems " + if [ "${smbfs_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 ${SMBFSTAB} -nt ${SMBFS_STATE_FILE} -o \ + ${SMB_CONF} -nt ${SMBFS_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-git.b446743/init/smbfs-1130 new/vendor-files-git.f8c2b1c/init/smbfs-1130 --- old/vendor-files-git.b446743/init/smbfs-1130 2017-07-17 09:00:11.044666277 +0200 +++ new/vendor-files-git.f8c2b1c/init/smbfs-1130 2017-07-14 14:54:18.000000000 +0200 @@ -1 +1,222 @@ -symbolic link to smbfs +#! /bin/sh +# Copyright (c) 1999-2003 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# Author: Thomas Fehr, 1999-2001 +# Lars Mueller <[email protected]>, 2002-2004 +# Bjoern Jacke <[email protected]> 2004 +# +# /etc/init.d/smbfs +# and its symbolic link +# /usr/sbin/rcsmbfs +# +# 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: smbfs +# Required-Start: $network $syslog +# Should-Start: nfs nmb +# Required-Stop: $network $syslog +# Should-Stop: nfs 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 'smbfs and nmb +# service' in /usr/share/doc/packages/samba/README.SUSE + +. /etc/rc.status +rc_reset + +LC_ALL=en_US +SMBFSTAB="/etc/samba/smbfstab" +SMB_CONF="/etc/samba/smb.conf" +SMBFS_STATE_FILE="/var/run/smbfs" +SLEEP=1 +TIMEOUT=10 + +grep -q " cifs " /proc/mounts +test $? -eq 0 && smbfs_used=yes || smbfs_used=no + +case "$1" in + start) + grep -q '^[[:space:]]*[^#].*[[:space:]]cifs[[:space:]]' /etc/fstab + rc=$? + if [ ! -f ${SMBFSTAB} -a ${rc} -ne 0 ]; then + echo -n >&2 "No ${SMBFSTAB} 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 ${SMBFSTAB} && \ + while read service mountpoint vfstype options; do + case "${service}" in + ""|\#*|\;*) continue ;; + esac + # Set default vfstype which is also a hack for old + # smbfstab 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 ${SMBFSTAB} \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 < ${SMBFSTAB} + test "${service_used}" = "no" && rc_status -u + touch ${SMBFS_STATE_FILE} + ;; + stop) + echo -n "Umount SMB/ CIFS File Systems " + if [ "${smbfs_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 SMB/ CIFS File Systems " + rc_failed 3 + rc_status -v + ;; + status) + echo -n "Checking for mounted SMB/ CIFS File Systems " + if [ "${smbfs_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 ${SMBFSTAB} -nt ${SMBFS_STATE_FILE} -o \ + ${SMB_CONF} -nt ${SMBFS_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-git.b446743/init/winbind-1010 new/vendor-files-git.f8c2b1c/init/winbind-1010 --- old/vendor-files-git.b446743/init/winbind-1010 2017-07-17 09:00:11.028668530 +0200 +++ new/vendor-files-git.f8c2b1c/init/winbind-1010 2017-07-14 14:54:18.000000000 +0200 @@ -1 +1,129 @@ -symbolic link to winbind +#! /bin/sh +# Copyright (c) 2002,2003 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# Author: Lars Mueller <[email protected]> +# +# /etc/init.d/winbind +# and its symbolic link +# /usr/sbin/rcwinbind +# +# 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: winbind +# Required-Start: $network $remote_fs $syslog +# Should-Start: nmb network-remotefs ntp +# Required-Stop: $network $remote_fs $syslog +# Should-Stop: nmb +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: NSS daemon for resolving names from Microsoft Windows servers +# Description: NSS daemon for resolving names from Microsoft Windows servers +### END INIT INFO + +WINBINDD_BIN="/usr/sbin/winbindd" +SMB_CONF="/etc/samba/smb.conf" +TESTPARM_BIN="/usr/bin/testparm" +PID_FILE="/var/run/samba/winbindd.pid" + +. /etc/rc.status +rc_reset + +# Check for missing binary +if [ ! -x ${WINBINDD_BIN} ]; then + echo -n >&2 "Samba WINBIND daemon, ${WINBINDD_BIN} is not installed. " + rc_status -s + exit 5 +fi + +test -f /etc/sysconfig/samba && \ + . /etc/sysconfig/samba + +for setting in $SAMBA_WINBINDD_ENV; do + pathcheck="${setting%%:*}" + variable="${setting##*:}" + test "${pathcheck}" != "${variable}" -a ! -e "${pathcheck}" && \ + continue + export eval ${variable} +done + +case "$1" in + start) + echo -n "Starting Samba WINBIND daemon " + if [ ! -f ${SMB_CONF} ]; then + echo -n >&2 "Samba configuration file, ${SMB_CONF} does not exist. " + rc_status -s + exit 6 + fi + checkproc -p ${PID_FILE} ${WINBINDD_BIN} + case $? in + 0) echo -n "- Warning: daemon already running. " ;; + 1) echo -n "- Warning: ${PID_FILE} exists. " ;; + esac + test -d "${PID_FILE%/winbindd.pid}" || \ + mkdir -m 0755 -p "${PID_FILE%/winbindd.pid}" + startproc -p ${PID_FILE} -W ${PID_FILE} ${WINBINDD_BIN} -s ${SMB_CONF} + rc_status -v + ;; + stop) + echo -n "Shutting down Samba ${curr_sam} WINBIND daemon " + checkproc -p ${PID_FILE} ${WINBINDD_BIN} || \ + echo -n " Warning: daemon not running. " + killproc -p ${PID_FILE} -t 10 ${WINBINDD_BIN} + 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 + ;; + restart) + $0 stop + $0 start + rc_status + ;; + force-reload|reload) + echo -n "Reloading Samba ${curr_sam} WINBIND daemon " + checkproc -p ${PID_FILE} ${WINBINDD_BIN} || \ + echo -n >&2 " Warning: daemon not running. " + killproc -p ${PID_FILE} -g -HUP ${WINBINDD_BIN} + rc_status -v + ;; + status) + echo -n "Checking for Samba ${curr_sam} WINBIND daemon " + checkproc -p ${PID_FILE} ${WINBINDD_BIN} + rc_status -v + ;; + probe) + test ${SMB_CONF} -nt ${PID_FILE} && echo reload + ;; + write-status) + echo -n "Sending SAMBA windbind signal SIGUSR2 to write status log. " + killproc -p ${PID_FILE} -USR2 ${WINBINDD_BIN} + rc_status -v + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe|write-status}" + exit 1 + ;; +esac +rc_exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files-git.b446743/init/winbind-1130 new/vendor-files-git.f8c2b1c/init/winbind-1130 --- old/vendor-files-git.b446743/init/winbind-1130 2017-07-17 09:00:11.020669656 +0200 +++ new/vendor-files-git.f8c2b1c/init/winbind-1130 2017-07-14 14:54:18.000000000 +0200 @@ -1 +1,129 @@ -symbolic link to winbind +#! /bin/sh +# Copyright (c) 2002,2003 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# Author: Lars Mueller <[email protected]> +# +# /etc/init.d/winbind +# and its symbolic link +# /usr/sbin/rcwinbind +# +# 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: winbind +# Required-Start: $network $remote_fs $syslog +# Should-Start: nmb network-remotefs ntp +# Required-Stop: $network $remote_fs $syslog +# Should-Stop: nmb +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: NSS daemon for resolving names from Microsoft Windows servers +# Description: NSS daemon for resolving names from Microsoft Windows servers +### END INIT INFO + +WINBINDD_BIN="/usr/sbin/winbindd" +SMB_CONF="/etc/samba/smb.conf" +TESTPARM_BIN="/usr/bin/testparm" +PID_FILE="/var/run/samba/winbindd.pid" + +. /etc/rc.status +rc_reset + +# Check for missing binary +if [ ! -x ${WINBINDD_BIN} ]; then + echo -n >&2 "Samba WINBIND daemon, ${WINBINDD_BIN} is not installed. " + rc_status -s + exit 5 +fi + +test -f /etc/sysconfig/samba && \ + . /etc/sysconfig/samba + +for setting in $SAMBA_WINBINDD_ENV; do + pathcheck="${setting%%:*}" + variable="${setting##*:}" + test "${pathcheck}" != "${variable}" -a ! -e "${pathcheck}" && \ + continue + export eval ${variable} +done + +case "$1" in + start) + echo -n "Starting Samba WINBIND daemon " + if [ ! -f ${SMB_CONF} ]; then + echo -n >&2 "Samba configuration file, ${SMB_CONF} does not exist. " + rc_status -s + exit 6 + fi + checkproc -p ${PID_FILE} ${WINBINDD_BIN} + case $? in + 0) echo -n "- Warning: daemon already running. " ;; + 1) echo -n "- Warning: ${PID_FILE} exists. " ;; + esac + test -d "${PID_FILE%/winbindd.pid}" || \ + mkdir -m 0755 -p "${PID_FILE%/winbindd.pid}" + startproc -p ${PID_FILE} -W ${PID_FILE} ${WINBINDD_BIN} -s ${SMB_CONF} + rc_status -v + ;; + stop) + echo -n "Shutting down Samba ${curr_sam} WINBIND daemon " + checkproc -p ${PID_FILE} ${WINBINDD_BIN} || \ + echo -n " Warning: daemon not running. " + killproc -p ${PID_FILE} -t 10 ${WINBINDD_BIN} + 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 + ;; + restart) + $0 stop + $0 start + rc_status + ;; + force-reload|reload) + echo -n "Reloading Samba ${curr_sam} WINBIND daemon " + checkproc -p ${PID_FILE} ${WINBINDD_BIN} || \ + echo -n >&2 " Warning: daemon not running. " + killproc -p ${PID_FILE} -g -HUP ${WINBINDD_BIN} + rc_status -v + ;; + status) + echo -n "Checking for Samba ${curr_sam} WINBIND daemon " + checkproc -p ${PID_FILE} ${WINBINDD_BIN} + rc_status -v + ;; + probe) + test ${SMB_CONF} -nt ${PID_FILE} && echo reload + ;; + write-status) + echo -n "Sending SAMBA windbind signal SIGUSR2 to write status log. " + killproc -p ${PID_FILE} -USR2 ${WINBINDD_BIN} + rc_status -v + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe|write-status}" + exit 1 + ;; +esac +rc_exit
