Cleanup the FIXME in the spec file.
This commit is contained in:
Andreas Schneider
parent
8c7871ae7b
commit
71176a8409
|
|
@ -1,2 +0,0 @@
|
|||
d /var/run/samba 755 root root
|
||||
d /var/run/winbindd 755 root root
|
||||
15
samba.spec
15
samba.spec
|
|
@ -57,11 +57,8 @@ Source2: samba.xinetd
|
|||
Source3: swat.desktop
|
||||
Source4: smb.conf.default
|
||||
Source5: pam_winbind.conf
|
||||
Source6: samba.conf.tmp
|
||||
Source7: winbind.networkmanager
|
||||
|
||||
Source100: smbprint
|
||||
|
||||
Source200: README.dc
|
||||
Source201: README.downgrade
|
||||
|
||||
|
|
@ -523,18 +520,11 @@ rm -rf %{buildroot}/%{_datadir}/perl5
|
|||
# Install PIDL.
|
||||
( cd pidl && make install PERL_INSTALL_ROOT=%{buildroot} )
|
||||
|
||||
# FIXME should be removed with rc4
|
||||
ln -s %{_libdir}/libnss_winbind.so.2 %{buildroot}%{_libdir}/libnss_winbind.so
|
||||
ln -s %{_libdir}/libnss_wins.so.2 %{buildroot}%{_libdir}/libnss_wins.so
|
||||
|
||||
# Install other stuff
|
||||
install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/samba
|
||||
install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/samba/smb.conf
|
||||
install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/security/pam_winbind.conf
|
||||
|
||||
# FIXME use packaging/smbprint
|
||||
install -m 0744 %{SOURCE100} %{buildroot}%{_bindir}/smbprint
|
||||
|
||||
echo 127.0.0.1 localhost > %{buildroot}%{_sysconfdir}/samba/lmhosts
|
||||
|
||||
install -d -m 0755 %{buildroot}%{_sysconfdir}/openldap/schema
|
||||
|
|
@ -543,9 +533,10 @@ install -m644 examples/LDAP/samba.schema %{buildroot}%{_sysconfdir}/openldap/sch
|
|||
install -d -m 0755 %{buildroot}%{_sysconfdir}/xinetd.d
|
||||
install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/swat
|
||||
|
||||
# FIXME use packaging/systemd/samba.conf.tmp
|
||||
install -m 0744 packaging/printing/smbprint %{buildroot}%{_bindir}/smbprint
|
||||
|
||||
install -d -m 0755 %{buildroot}%{_sysconfdir}/tmpfiles.d/
|
||||
install -m644 %{SOURCE6} %{buildroot}%{_sysconfdir}/tmpfiles.d/samba.conf
|
||||
install -m644 packaging/systemd/samba.conf.tmp %{buildroot}%{_sysconfdir}/tmpfiles.d/samba.conf
|
||||
|
||||
install -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
|
||||
install -m 0644 packaging/systemd/samba.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/samba
|
||||
|
|
|
|||
84
smbprint
84
smbprint
|
|
@ -1,84 +0,0 @@
|
|||
#!/bin/sh
|
||||
# This script is an input filter for printcap printing on a unix machine. It
|
||||
# uses the smbclient program to print the file to the specified smb-based
|
||||
# server and service.
|
||||
# For example you could have a printcap entry like this
|
||||
#
|
||||
# smb:lp=/dev/null:sd=/usr/spool/smb:sh:if=/usr/local/samba/smbprint
|
||||
#
|
||||
# which would create a unix printer called "smb" that will print via this
|
||||
# script. You will need to create the spool directory /usr/spool/smb with
|
||||
# appropriate permissions and ownerships for your system.
|
||||
|
||||
# Set these to the server and service you wish to print to
|
||||
# In this example I have a WfWg PC called "lapland" that has a printer
|
||||
# exported called "printer" with no password.
|
||||
|
||||
#
|
||||
# Script further altered by hamiltom@ecnz.co.nz (Michael Hamilton)
|
||||
# so that the server, service, and password can be read from
|
||||
# a /usr/var/spool/lpd/PRINTNAME/.config file.
|
||||
#
|
||||
# In order for this to work the /etc/printcap entry must include an
|
||||
# accounting file (af=...):
|
||||
#
|
||||
# cdcolour:\
|
||||
# :cm=CD IBM Colorjet on 6th:\
|
||||
# :sd=/var/spool/lpd/cdcolour:\
|
||||
# :af=/var/spool/lpd/cdcolour/acct:\
|
||||
# :if=/usr/local/etc/smbprint:\
|
||||
# :mx=0:\
|
||||
# :lp=/dev/null:
|
||||
#
|
||||
# The /usr/var/spool/lpd/PRINTNAME/.config file should contain:
|
||||
# share=PC_SERVER
|
||||
# user="user"
|
||||
# password="password"
|
||||
#
|
||||
# Please, do not modify the order in the file.
|
||||
# Example:
|
||||
# share=\\server\deskjet
|
||||
# user="fred"
|
||||
# password=""
|
||||
|
||||
#
|
||||
# The last parameter to the filter is the accounting file name.
|
||||
# Extract the directory name from the file name.
|
||||
# Concat this with /.config to get the config file.
|
||||
#
|
||||
eval acct_file=\${$#}
|
||||
spool_dir=`dirname $acct_file`
|
||||
config_file=$spool_dir/.config
|
||||
|
||||
# Should read the following variables set in the config file:
|
||||
# share
|
||||
# hostip
|
||||
# user
|
||||
# password
|
||||
|
||||
eval `cat $config_file`
|
||||
|
||||
share=`echo $share | sed "s/[\]/\//g"`
|
||||
|
||||
if [ "$user" != "" ]; then
|
||||
usercmd="-U"
|
||||
else
|
||||
usercmd=""
|
||||
fi
|
||||
|
||||
if [ "$workgroup" != "" ]; then
|
||||
workgroupcmd="-W"
|
||||
else
|
||||
workgroupcmd=""
|
||||
fi
|
||||
|
||||
if [ "$translate" = "yes" ]; then
|
||||
command="translate ; print -"
|
||||
else
|
||||
command="print -"
|
||||
fi
|
||||
#echo $share $password $translate $x_command > /tmp/smbprint.log
|
||||
|
||||
cat | /usr/bin/smbclient "$share" "$password" -E ${hostip:+-I} \
|
||||
$hostip -N -P $usercmd "$user" $workgroupcmd "$workgroup" \
|
||||
-c "$command" 2>/dev/null
|
||||
Loading…
Reference in New Issue