mirror of
https://abf.rosa.ru/djam/samba.git
synced 2025-02-23 17:12:48 +00:00
version update 3.6.9, mageia spec merge with our policy
This commit is contained in:
Alexander Khryukin
parent
f5edf6bfe1
commit
c000da928d
15 changed files with 614 additions and 1167 deletions
9
.abf.yml
9
.abf.yml
|
|
@ -1,8 +1,3 @@
|
|||
sources:
|
||||
"samba-3.5.14.tar.gz": 2dbcfb7e35c6e4169f6a74019d28813563c3fd21
|
||||
"samba-print-pdf.sh.bz2": 2be00043c467032fc381b2a9ba4aeedecfafa6e5
|
||||
"samba-vscan-0.3.6c-beta5.tar.gz": 9e1b37225246ff2f19e37aceb97a680afc82cdda
|
||||
"smb-migrate.bz2": 93db82036fdb8657f7270da11a3f3375be069c1a
|
||||
"swat_16.png.bz2": c3f02d2504d2f6f38121889f5ec80b5c0c5f2333
|
||||
"swat_32.png.bz2": 755b993752d0c040500e786b6863d2febe55b3f2
|
||||
"swat_48.png.bz2": aae908642e9294d606e7c2e8a38585efc89da678
|
||||
"samba-3.6.9.tar.gz": 004b5eba346f18961cf02a0b3471bba02d36ee7d
|
||||
"samba-virusfilter-0.1.3.tar.bz2": 80064106ec56c2ae6f58022823bff9975b69bc5c
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
This rpm was built with default options
|
||||
|
||||
samba-3.5.9-1
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
--- samba-3.0.23/packaging/Mandrake/findsmb.mdk 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Mandrake/findsmb 2006-07-11 13:28:27.000000000 +0200
|
||||
--- samba-3.0.23/packaging/Rosa/findsmb.mdv 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Rosa/findsmb 2006-07-11 13:28:27.000000000 +0200
|
||||
@@ -0,0 +1,141 @@
|
||||
+#!/usr/bin/perl
|
||||
+#
|
||||
|
|
@ -142,8 +142,8 @@
|
|||
+ }
|
||||
+}
|
||||
+
|
||||
--- samba-3.0.23/packaging/Mandrake/samba.log.mdk 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Mandrake/samba.log 2006-07-11 13:28:27.000000000 +0200
|
||||
--- samba-3.0.23/packaging/Rosa/samba.log.mdv 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Rosa/samba.log 2006-07-11 13:28:27.000000000 +0200
|
||||
@@ -0,0 +1,15 @@
|
||||
+/var/log/samba/log.nmb {
|
||||
+ notifempty
|
||||
|
|
@ -160,16 +160,16 @@
|
|||
+ /usr/bin/killall -HUP smbd
|
||||
+ endscript
|
||||
+}
|
||||
--- samba-3.0.23/packaging/Mandrake/samba.pamd.mdk 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Mandrake/samba.pamd 2006-07-11 13:28:27.000000000 +0200
|
||||
--- samba-3.0.23/packaging/Rosa/samba.pamd.mdv 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Rosa/samba.pamd 2006-07-11 13:28:27.000000000 +0200
|
||||
@@ -0,0 +1,5 @@
|
||||
+#%PAM-1.0
|
||||
+auth required /lib/security/pam_nologin.so
|
||||
+auth required /lib/security/pam_stack.so service=system-auth
|
||||
+account required /lib/security/pam_stack.so service=system-auth
|
||||
+session required /lib/security/pam_stack.so service=system-auth
|
||||
--- samba-3.0.23/packaging/Mandrake/samba.xinetd.mdk 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Mandrake/samba.xinetd 2006-07-11 13:28:27.000000000 +0200
|
||||
--- samba-3.0.23/packaging/Rosa/samba.xinetd.mdv 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Rosa/samba.xinetd 2006-07-11 13:28:27.000000000 +0200
|
||||
@@ -0,0 +1,15 @@
|
||||
+# default: on
|
||||
+# description: SWAT is the Samba Web Admin Tool. Use swat \
|
||||
|
|
@ -186,8 +186,8 @@
|
|||
+ log_on_failure += USERID
|
||||
+ disable = no
|
||||
+}
|
||||
--- samba-3.0.23/packaging/Mandrake/smb.conf.mdk 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Mandrake/smb.conf 2006-07-11 13:28:27.000000000 +0200
|
||||
--- samba-3.0.23/packaging/Rosa/smb.conf.mdv 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Rosa/smb.conf 2006-07-11 13:28:27.000000000 +0200
|
||||
@@ -0,0 +1,533 @@
|
||||
+
|
||||
+# This is the main Samba configuration file. You should read the
|
||||
|
|
@ -208,7 +208,7 @@
|
|||
+
|
||||
+# 1. Server Naming Options:
|
||||
+# workgroup = NT-Domain-Name or Workgroup-Name
|
||||
+ workgroup = MDKGROUP
|
||||
+ workgroup = MGAGROUP
|
||||
+
|
||||
+# netbios name is the name you will see in "Network Neighbourhood",
|
||||
+# but defaults to your hostname
|
||||
|
|
@ -722,8 +722,8 @@
|
|||
+; printable = no
|
||||
+; create mask = 0765
|
||||
+
|
||||
--- samba-3.0.23/packaging/Mandrake/smbprint.mdk 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Mandrake/smbprint 2006-07-11 13:28:27.000000000 +0200
|
||||
--- samba-3.0.23/packaging/Rosa/smbprint.mdv 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Rosa/smbprint 2006-07-11 13:28:27.000000000 +0200
|
||||
@@ -0,0 +1,77 @@
|
||||
+#!/bin/sh
|
||||
+
|
||||
|
|
@ -802,14 +802,14 @@
|
|||
+ echo "print -"
|
||||
+ cat
|
||||
+) | /usr/bin/smbclient "//$server/$service" $password -U $server -N >> $logfile
|
||||
--- samba-3.0.23/packaging/Mandrake/smbusers.mdk 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Mandrake/smbusers 2006-07-11 13:28:27.000000000 +0200
|
||||
--- samba-3.0.23/packaging/Rosa/smbusers.mdv 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Rosa/smbusers 2006-07-11 13:28:27.000000000 +0200
|
||||
@@ -0,0 +1,3 @@
|
||||
+# Unix_name = SMB_name1 SMB_name2 ...
|
||||
+root = administrator admin
|
||||
+nobody = guest pcguest smbguest
|
||||
--- samba-3.0.23/packaging/Mandrake/smb-winbind.conf.mdk 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Mandrake/smb-winbind.conf 2006-07-11 13:28:27.000000000 +0200
|
||||
--- samba-3.0.23/packaging/Rosa/smb-winbind.conf.mdv 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Rosa/smb-winbind.conf 2006-07-11 13:28:27.000000000 +0200
|
||||
@@ -0,0 +1,539 @@
|
||||
+
|
||||
+# This is the main Samba configuration file. You should read the
|
||||
|
|
@ -830,7 +830,7 @@
|
|||
+
|
||||
+# 1. Server Naming Options:
|
||||
+# workgroup = NT-Domain-Name or Workgroup-Name
|
||||
+ workgroup = MDKGROUP
|
||||
+ workgroup = MGAGROUP
|
||||
+
|
||||
+# netbios name is the name you will see in "Network Neighbourhood",
|
||||
+# but defaults to your hostname
|
||||
|
|
@ -1350,8 +1350,8 @@
|
|||
+; printable = no
|
||||
+; create mask = 0765
|
||||
+
|
||||
--- samba-3.0.23/packaging/Mandrake/system-auth-winbind.pamd.mdk 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Mandrake/system-auth-winbind.pamd 2006-07-11 13:28:27.000000000 +0200
|
||||
--- samba-3.0.23/packaging/Rosa/system-auth-winbind.pamd.mdv 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Rosa/system-auth-winbind.pamd 2006-07-11 13:28:27.000000000 +0200
|
||||
@@ -0,0 +1,17 @@
|
||||
+#%PAM-1.0
|
||||
+
|
||||
|
|
@ -1370,8 +1370,8 @@
|
|||
+session required /lib/security/pam_mkhomedir.so skel=/etc/skel/ umask=0022
|
||||
+session required /lib/security/pam_limits.so
|
||||
+session required /lib/security/pam_unix.so
|
||||
--- samba-3.0.23/packaging/Mandrake/winbind.init.mdk 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Mandrake/winbind.init 2006-07-11 13:28:27.000000000 +0200
|
||||
--- samba-3.0.23/packaging/Rosa/winbind.init.mdv 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Rosa/winbind.init 2006-07-11 13:28:27.000000000 +0200
|
||||
@@ -0,0 +1,93 @@
|
||||
+#!/bin/sh
|
||||
+#
|
||||
|
|
@ -1437,7 +1437,7 @@
|
|||
+ echo
|
||||
+ return $RETVAL
|
||||
+}
|
||||
+mdkstatus() {
|
||||
+mdvstatus() {
|
||||
+ status winbindd
|
||||
+}
|
||||
+
|
||||
|
|
@ -1455,7 +1455,7 @@
|
|||
+ reload
|
||||
+ ;;
|
||||
+ status)
|
||||
+ mdkstatus
|
||||
+ mdvstatus
|
||||
+ ;;
|
||||
+ condrestart)
|
||||
+ [ -f /var/lock/subsys/winbindd ] && restart || :
|
||||
|
|
@ -1466,8 +1466,8 @@
|
|||
+esac
|
||||
+
|
||||
+exit $?
|
||||
--- samba-3.0.23/packaging/Mandrake/wrepld.init.mdk 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Mandrake/wrepld.init 2006-07-11 13:28:27.000000000 +0200
|
||||
--- samba-3.0.23/packaging/Rosa/wrepld.init.mdv 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Rosa/wrepld.init 2006-07-11 13:28:27.000000000 +0200
|
||||
@@ -0,0 +1,93 @@
|
||||
+#!/bin/sh
|
||||
+#
|
||||
|
|
@ -1533,7 +1533,7 @@
|
|||
+ echo
|
||||
+ return $RETVAL
|
||||
+}
|
||||
+mdkstatus() {
|
||||
+mdvstatus() {
|
||||
+ status wrepld
|
||||
+}
|
||||
+
|
||||
|
|
@ -1551,7 +1551,7 @@
|
|||
+ reload
|
||||
+ ;;
|
||||
+ status)
|
||||
+ mdkstatus
|
||||
+ mdvstatus
|
||||
+ ;;
|
||||
+ condrestart)
|
||||
+ [ -f /var/lock/subsys/wrepld ] && restart || :
|
||||
|
|
@ -1562,8 +1562,8 @@
|
|||
+esac
|
||||
+
|
||||
+exit $?
|
||||
--- samba-3.0.23/packaging/Mandrake/smb.init.mdk 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Mandrake/smb.init 2006-07-11 13:31:22.000000000 +0200
|
||||
--- samba-3.0.23/packaging/Rosa/smb.init.mdv 2006-07-11 13:28:27.000000000 +0200
|
||||
+++ samba-3.0.23/packaging/Rosa/smb.init 2006-07-11 13:31:22.000000000 +0200
|
||||
@@ -0,0 +1,95 @@
|
||||
+#!/bin/sh
|
||||
+#
|
||||
|
|
@ -1630,7 +1630,7 @@
|
|||
+ echo
|
||||
+ return $RETVAL
|
||||
+}
|
||||
+mdkstatus() {
|
||||
+mdvstatus() {
|
||||
+ status smbd
|
||||
+ status nmbd
|
||||
+}
|
||||
|
|
@ -1649,7 +1649,7 @@
|
|||
+ reload
|
||||
+ ;;
|
||||
+ status)
|
||||
+ mdkstatus
|
||||
+ mdvstatus
|
||||
+ ;;
|
||||
+ condrestart)
|
||||
+ [ -f /var/lock/subsys/smb ] && restart || :
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
diff -p -up samba-3.0.30/source/lib/replace/autoconf-2.60.m4~ samba-3.0.30/source/lib/replace/autoconf-2.60.m4
|
||||
--- samba-3.0.30/lib/replace/autoconf-2.60.m4~ 2008-05-28 14:41:11.000000000 +0200
|
||||
+++ samba-3.0.30/lib/replace/autoconf-2.60.m4 2008-06-03 21:33:20.000000000 +0200
|
||||
@@ -185,8 +185,8 @@ AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
|
||||
AC_BEFORE([$0], [AC_RUN_IFELSE])
|
||||
|
||||
AC_REQUIRE([AC_GNU_SOURCE])
|
||||
- AC_REQUIRE([AC_AIX])
|
||||
- AC_REQUIRE([AC_MINIX])
|
||||
+ dnl AC_REQUIRE([AC_AIX])
|
||||
+ dnl AC_REQUIRE([AC_MINIX])
|
||||
|
||||
AH_VERBATIM([__EXTENSIONS__],
|
||||
[/* Enable extensions on Solaris. */
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.15 (GNU/Linux)
|
||||
|
||||
iD8DBQBPgEj6bzORW2Vot+oRAgMHAKDCBlhME9DNzB2ILcUWZDW2KEtPTgCePljc
|
||||
qNfFH9yWOYdO+IHYpy8CGx4=
|
||||
=lO2y
|
||||
-----END PGP SIGNATURE-----
|
||||
7
samba-3.6.9.tar.asc
Normal file
7
samba-3.6.9.tar.asc
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.18 (GNU/Linux)
|
||||
|
||||
iD8DBQBQjj57bzORW2Vot+oRAkz1AKCevaDdt2j5VgtHQZO8O4JNHbs+sACfdQhy
|
||||
XQLkp26HPaLSq+GStSL057A=
|
||||
=rMtp
|
||||
-----END PGP SIGNATURE-----
|
||||
111
samba-print-pdf.sh
Normal file
111
samba-print-pdf.sh
Normal file
|
|
@ -0,0 +1,111 @@
|
|||
#!/bin/bash
|
||||
# samba-print-pdf
|
||||
# This is a script which allows you to set up a virtual printer on samba
|
||||
# which will take the file (generated by a postscript filter on windows)
|
||||
# and turn it into a PDF, informing the user of where it is when it
|
||||
# is done
|
||||
#
|
||||
# (c) Buchan Milne <bgmilne@cae.co.za> 2002
|
||||
# License: GPLv2
|
||||
# Changelog
|
||||
# v0.0.6 20030428
|
||||
# - Allow options passed as env. variables from print command
|
||||
# - Inline and simplify sed (use tr) clean script
|
||||
# - Ensure file arrives in PREFIX even if TEMP is used without provided name
|
||||
# - Changes from Joshua M. Schmidlkofer <joshua@imr-net.com> 20030425
|
||||
# - Debugging, adjustments, and corrections.
|
||||
# - Stupid sed sanitizing script. [probably horribly inefficient also].
|
||||
# - Temp file usage cleanup.
|
||||
# v0.0.5 20020723
|
||||
# - Add support for preset settings
|
||||
# - Allow passing of filename provided by client as final filename
|
||||
#
|
||||
# Arguments:
|
||||
# $1 = file (usually passed with %s from samba)
|
||||
# $2 = unix prefix to where to place the file (~%u should work)
|
||||
# $3 = windows prefix to the same location (//%L/%u should work)
|
||||
# $4 = user/computer to send a notification to (%u or %m)
|
||||
# $5 = IP address of client (%I)
|
||||
# $6 = Name of destination file without extension (%J)
|
||||
# $7 = PDF setting (prepress,print,screen etc)
|
||||
#
|
||||
# If you want to customise any of the following configuration defaults,
|
||||
# you can place them in the file /etc/samba/print-pdf.conf.
|
||||
# If you need to modify anything in this script, please provide me with your
|
||||
# changes, preferably in such a way that the changes are configurable.
|
||||
|
||||
PS2PDF=ps2pdf13
|
||||
OPTIONS="-dAutoFilterColorImages=false -sColorImageFilter=FlateEncode"
|
||||
#Values taken from arguments:
|
||||
INPUT=$1
|
||||
PREFIX="$2"
|
||||
WINBASE=$(echo "$3"|sed -e 's,/,\\\\,g')
|
||||
#NAME=`echo "$6"|sed -e 's/[&/:{}\\\[<>$#@*^!?=|]/-/g;s/\]/-/g'`
|
||||
NAME=`echo "$6"|tr '[:punct:]' '[-*]'`
|
||||
|
||||
# Source config file if it exists:
|
||||
CONFFILE=/etc/samba/print-pdf.conf
|
||||
[ -e $CONFFILE ] && . $CONFFILE
|
||||
|
||||
#Values not taken as arguments, could be set via env. vars (?) or config file
|
||||
KEEP_PS=${KEEP_PS=0}
|
||||
PERMS=${PERMS=640}
|
||||
BASEFILE=${BASEFILE=pdf-service}
|
||||
TEMP="${TEMP=$2}"
|
||||
UMASK=${UMASK=006}
|
||||
|
||||
#Make sure that destination directory exists
|
||||
mkdir -p "$PREFIX"
|
||||
|
||||
INFILE=$(basename $INPUT)
|
||||
|
||||
umask $UMASK
|
||||
|
||||
[ -n "$NAME" ] && TEMP="$PREFIX"
|
||||
|
||||
#make a temp file to use for the output of the PDF
|
||||
OUTPUT=`mktemp -q $TEMP/$BASEFILE-XXXXXX`
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "$0: Can't create temp file $TEMP/$OUTPUT, exiting..."
|
||||
exit 1
|
||||
fi
|
||||
if [ -n "$NAME" ]; then
|
||||
FINALOUTPUT="$PREFIX/$NAME"
|
||||
else
|
||||
FINALOUTPUT="$OUTPUT"
|
||||
fi
|
||||
if [ -n "$7" ]; then
|
||||
OPTIONS="$OPTIONS -dPDFSETTINGS=/${7#pdf-}"
|
||||
else
|
||||
OPTIONS="$OPTIONS -dPDFSETTINGS=/default"
|
||||
fi
|
||||
|
||||
WIN_OUTPUT="$WINBASE\\"`basename "$FINALOUTPUT"`
|
||||
#mv "$INPUT" "$INPUT.ps";INPUT="$INPUT.ps"
|
||||
|
||||
# create the pdf
|
||||
$PS2PDF $OPTIONS "$INPUT" "$OUTPUT.pdf" >/dev/null 2>&1
|
||||
mv -f "${OUTPUT}.pdf" "${FINALOUTPUT}".pdf
|
||||
|
||||
# Generate a message to send to the user, and deal with the original file:
|
||||
MESSAGE=$(echo "Your PDF file has been created as $WIN_OUTPUT.pdf\n")
|
||||
|
||||
|
||||
# Cleanup
|
||||
if [ $KEEP_PS != 0 ];then
|
||||
mv -f $INPUT "${FINALOUTPUT}".ps
|
||||
MESSAGE=$(echo "$MESSAGE and your postscript file as $WIN_OUTPUT.ps")
|
||||
# Fix permissions on the generated files
|
||||
chmod $PERMS "${FINALOUTPUT}".ps "${FINALOUTPUT}".pdf
|
||||
else
|
||||
rm -f $INPUT
|
||||
# Fix permissions on the generated files
|
||||
chmod $PERMS "${FINALOUTPUT}".pdf
|
||||
fi
|
||||
|
||||
#Remove empty file from mktemp:
|
||||
rm -f $OUTPUT
|
||||
|
||||
# Send notification to user
|
||||
echo -e $MESSAGE|smbclient -M $4 -I $5 -U "PDF Generator" >/dev/null 2>&1
|
||||
|
||||
1345
samba.spec
1345
samba.spec
File diff suppressed because it is too large
Load diff
197
smb-migrate
Normal file
197
smb-migrate
Normal file
|
|
@ -0,0 +1,197 @@
|
|||
#!/usr/bin/perl
|
||||
|
||||
# migrate old samba2 smb.conf settings to new samba3 setup
|
||||
# as well as merge local configuration settings
|
||||
# Dec 3 2003 Stew Benedict <sbenedict@mandrakesoft.com>
|
||||
# revised Jan 6 2004 - dropping some parameters
|
||||
# revised Feb 11 2004 - don't try to process a config a second time
|
||||
|
||||
# check command line arguments
|
||||
my $numargs = @ARGV;
|
||||
if ($numargs lt 1) {
|
||||
print "useage: smb-migrate test|test-commit|commit\n";
|
||||
exit(1);
|
||||
}
|
||||
|
||||
# define some variables
|
||||
my $user_parms = 0;
|
||||
my $new_conf_file = "/etc/samba/smb.conf";
|
||||
my @new_conf;
|
||||
my $merged_conf_file = "/etc/samba/smb.conf";
|
||||
my $merge_comment = "# *** merged from original smb.conf: ***\n";
|
||||
my $uncomment_comment = "# *** uncommented from original smb.conf: ***\n";
|
||||
my $unique_comment = "# *** unique added from original smb.conf: ***\n";
|
||||
my @merge_log;
|
||||
my $log_file = "/var/log/samba/smb-migrate.log";
|
||||
my $to_merge = "/etc/samba/smb.conf.tomerge";
|
||||
|
||||
if ($ARGV[0] eq "test" || $ARGV[0] eq "test-commit") {
|
||||
$to_merge = "smb.conf";
|
||||
$log_file = "smb-migrate.log";
|
||||
$merged_conf_file = "smb.conf.merged";
|
||||
}
|
||||
|
||||
# if the file has already been processed, don't do it again
|
||||
my $processed = `grep -c 'original smb.conf: ***' $to_merge`;
|
||||
if ($processed > 0) {
|
||||
`cp $to_merge $new_conf_file`;
|
||||
print "Already processed, aborting.\n";
|
||||
exit 0;
|
||||
}
|
||||
|
||||
# get the stripped, uncommented data from old smb.conf
|
||||
my @old_conf = `grep -v "^#" $to_merge | grep -v "^;" | grep -v "^\$"` or die;
|
||||
|
||||
# use a clean config file as a starting point
|
||||
`cp /usr/share/samba/smb.conf.clean $new_conf_file` if $ARGV[0] !~ /test/;
|
||||
|
||||
# and the whole new conf file we're going to merge with
|
||||
my @new_conf_org = `cat $new_conf_file` or die;
|
||||
|
||||
mlog("Data to change/add in standard sections of smb.conf:\n\n");
|
||||
|
||||
sub mlog {
|
||||
my (@dstring) = @_;
|
||||
if ($ARGV[0] eq "test") {
|
||||
print "@dstring";
|
||||
} else {
|
||||
push @merge_log, @dstring;
|
||||
}
|
||||
}
|
||||
|
||||
sub merge_conf {
|
||||
my ($header, $new_value) = @_;
|
||||
my @parmlist = split " = ", $new_value;
|
||||
my $match = 0;
|
||||
my $comment = '';
|
||||
$comment = $unique_comment if $continuation = 0;
|
||||
$continuation = 1;
|
||||
|
||||
# find the header in question
|
||||
$index = 0;
|
||||
foreach (@new_conf_org) {
|
||||
if (/^\[$header\]|;\[$header\]|^; \[$header\]|^\[$header\$\]|;\[$header\$\]|^; \[$header\$\]/) {
|
||||
# restore print$
|
||||
$header = "print" . '$' if $header eq "print";
|
||||
# if the header is commented, remove the comment
|
||||
if (/^;\[|^#\[|^; \[/) {
|
||||
my $entry = $_;
|
||||
@new_conf_org[$index] =~ s/^;|^; |^#//g;
|
||||
mlog("uncomment: $header line $index: $entry -> @new_conf_org[$index]");
|
||||
splice(@new_conf_org, $index, 0, $uncomment_comment);
|
||||
$index++
|
||||
}
|
||||
$start_loc = $index;
|
||||
# print "[$header]: $start_loc\n";
|
||||
last;
|
||||
}
|
||||
$index++
|
||||
}
|
||||
|
||||
my $elements = @new_conf_org;
|
||||
|
||||
# walk through this header's entries, update as needed
|
||||
for ($i = $start_loc + 1; $i < $elements; $i++) {
|
||||
# if we hit a new header, may be commented - bail out
|
||||
my $is_header = @new_conf_org[$i];
|
||||
$is_header =~ s/^ |\t|\n//;
|
||||
if ($is_header =~ /^\[|;\[|#\[/) {
|
||||
# print "new header: $is_header at $i\n";
|
||||
if ($match == 0) {
|
||||
# it's possible the parameter is continued across multiple lines
|
||||
$continuation = 0 if $new_value !~ /\\$/;
|
||||
# completely new entry, try to place it under the correct header
|
||||
# print "new entry for [$header]: $new_value\n";
|
||||
mlog("unique: $header line $last_index: $new_value");
|
||||
splice(@new_conf_org, $last_index + 1, 0, $comment, $new_value);
|
||||
$last_index++;$last_index++;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
# some syntax changes
|
||||
if ($new_value =~ /winbind/) {
|
||||
$old_value = $new_value;
|
||||
$new_value =~ s/winbind/idmap/;
|
||||
mlog("syntax: $header: $old_value -> $new_value");
|
||||
}
|
||||
|
||||
# partial match, decide whether to add or replace
|
||||
if (@new_conf_org[$i] =~ /@parmlist[0]/) {
|
||||
if (@new_conf_org[$i] !~ /^;|^#/) {
|
||||
if (@new_conf_org[$i] ne $_) {
|
||||
mlog("update: $header line $i: @new_conf_org[$i] -> $new_value");
|
||||
@new_conf_org[$i] = ";" . $new_conf_org[$i];
|
||||
splice(@new_conf_org, $i + 1, 0, $merge_comment, $new_value);
|
||||
# $match = 1;
|
||||
}
|
||||
$match = 1;
|
||||
} else {
|
||||
# is it really a definition or just a comment?
|
||||
if (@new_conf_org[$i] =~ / = /) {
|
||||
# commented in new config, add the old entry
|
||||
mlog("add: $header line $i: @new_conf_org[$i] -> $new_value");
|
||||
splice(@new_conf_org, $i + 1, 0, $merge_comment, $new_value);
|
||||
$i++;$i++;
|
||||
$match = 1;
|
||||
}
|
||||
}
|
||||
# $match = 1 if $new_value eq @new_conf_org[$i];
|
||||
$last_index = $i;
|
||||
return if ($match eq 1);
|
||||
$match = 0;
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
foreach (@old_conf) {
|
||||
# check for section headers
|
||||
if (/^\[/) {
|
||||
# standard headers?
|
||||
if (!/^\[global\]|^\[homes\]|^\[netlogon\]|^\[Profiles\]|^\[printers\]|^\[print\$\]|^\[pdf-generator\]/) {
|
||||
# non-standard - add to new config
|
||||
$user_parms = 1;
|
||||
push (@new_conf, $_);
|
||||
} else {
|
||||
$user_parms = 0;
|
||||
chop;
|
||||
$header = $_;
|
||||
s/\[|\]|\$//g;
|
||||
$bare_header = $_;
|
||||
}
|
||||
} else {
|
||||
# non-standard - add to new config
|
||||
if ($user_parms == 1) {
|
||||
push (@new_conf, $_);
|
||||
} else {
|
||||
# now we're working with standard settings
|
||||
# update new config with values if they differ or are commented out
|
||||
# translate any old nomenclature to the new style
|
||||
# may still be some commented lines buried
|
||||
# throw those out and try to merge into new config
|
||||
if (!/^[ ]+#|^[ ]+;|^#|^;/) {
|
||||
# print "$header: $_\n";
|
||||
merge_conf($bare_header, $_);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# write the user config data to new smb.conf
|
||||
|
||||
mlog("\nNew data for smb.conf:\n\n");
|
||||
mlog("@new_conf");
|
||||
|
||||
if ($ARGV[0] eq "commit" || $ARGV[0] eq "test-commit") {
|
||||
local *NEWCONF;
|
||||
open(NEWCONF, "> $merged_conf_file");
|
||||
print NEWCONF @new_conf_org;
|
||||
print NEWCONF @new_conf;
|
||||
close NEWCONF;
|
||||
local *LOGFILE;
|
||||
open(LOGFILE, "> $log_file");
|
||||
print LOGFILE @merge_log;
|
||||
close LOGFILE
|
||||
}
|
||||
|
||||
17
smb.conf
17
smb.conf
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
# This is the main Samba configuration file. You should read the
|
||||
# smb.conf(5) manual page in order to understand the options listed
|
||||
# here. Samba has a huge number of configurable options (perhaps too
|
||||
|
|
@ -16,11 +17,11 @@
|
|||
|
||||
# 1. Server Naming Options:
|
||||
# workgroup = NT-Domain-Name or Workgroup-Name
|
||||
workgroup = WORKGROUP
|
||||
workgroup = MGAGROUP
|
||||
|
||||
# netbios name is the name you will see in "Network Neighbourhood",
|
||||
# but defaults to your hostname
|
||||
# netbios name = <computer name>
|
||||
# netbios name = <name_of_this_server>
|
||||
|
||||
# server string is the equivalent of the NT Description field
|
||||
server string = %h
|
||||
|
|
@ -342,18 +343,6 @@
|
|||
# dos charset = 850
|
||||
# unix charset = ISO8859-1
|
||||
|
||||
# 9. Allow usershares through 'net' command:
|
||||
|
||||
usershare max shares = 100
|
||||
|
||||
# 10. Guest mode support for usershares. This is need for properly browsing machine through
|
||||
# "Network neighborhood" in Windows.
|
||||
|
||||
usershare allow guests = Yes
|
||||
|
||||
# 11.
|
||||
|
||||
usershare owner only = False
|
||||
|
||||
#============================ Share Definitions ==============================
|
||||
[homes]
|
||||
|
|
|
|||
1
smb.init
1
smb.init
|
|
@ -9,6 +9,7 @@
|
|||
# Required-Start: $network
|
||||
# Required-Stop: $network
|
||||
# Default-Start: 3 4 5
|
||||
# Default-Stop: 0 1 2 6
|
||||
# Short-Description: Samba servers (nmbd and smbd)
|
||||
# Description:Starts and stops the Samba smbd and nmbd daemons
|
||||
# used to provide SMB network services.
|
||||
|
|
|
|||
BIN
swat_16.png
Normal file
BIN
swat_16.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 918 B |
BIN
swat_32.png
Normal file
BIN
swat_32.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
BIN
swat_48.png
Normal file
BIN
swat_48.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.6 KiB |
|
|
@ -2,16 +2,17 @@
|
|||
#
|
||||
# chkconfig: 345 81 45
|
||||
# description: Starts and stops the Samba winbind daemon to provide \
|
||||
# user and group information from a domain controller to linux.
|
||||
# user and group information from a domain controller to linux.
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: winbind
|
||||
# Required-Start: $network
|
||||
# Required-Stop: $network
|
||||
# Default-Start: 3 4 5
|
||||
# Default-Stop: 0 1 2 6
|
||||
# Short-Description: Winbind naming service (winbindd)
|
||||
# Description: Starts and stops the Samba winbind daemon to provide
|
||||
# user and group information from a domain controller to linux.
|
||||
# user and group information from a domain controller to linux.
|
||||
### END INIT INFO
|
||||
|
||||
# Source function library.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue