diff options
Diffstat (limited to 'net/samba3/files')
| -rw-r--r-- | net/samba3/files/README.FreeBSD | 21 | ||||
| -rw-r--r-- | net/samba3/files/patch-aa | 35 | ||||
| -rw-r--r-- | net/samba3/files/patch-ab | 35 | ||||
| -rw-r--r-- | net/samba3/files/patch-ac | 20 | ||||
| -rw-r--r-- | net/samba3/files/patch-ae | 11 | ||||
| -rw-r--r-- | net/samba3/files/patch-ah | 12 | ||||
| -rw-r--r-- | net/samba3/files/patch-aj | 14 | ||||
| -rw-r--r-- | net/samba3/files/patch-ba | 43 | ||||
| -rw-r--r-- | net/samba3/files/patch-bb | 10 | ||||
| -rw-r--r-- | net/samba3/files/samba.sh.sample | 22 | ||||
| -rw-r--r-- | net/samba3/files/smb.conf.default | 283 |
11 files changed, 0 insertions, 506 deletions
diff --git a/net/samba3/files/README.FreeBSD b/net/samba3/files/README.FreeBSD deleted file mode 100644 index 67cc86c58cb2..000000000000 --- a/net/samba3/files/README.FreeBSD +++ /dev/null @@ -1,21 +0,0 @@ -If you want to use samba ports, - -1. Copy /usr/local/etc/smb.conf.default to /usr/local/etc/smb.conf, and edit - it. -2. Copy /usr/local/etc/rc.d/samba.sh.sample to /usr/local/etc/rc.d/samba.sh -3. Type /usr/local/etc/rc.d/samba.sh or reboot. - -See document files in /usr/local/share/doc/samba and example config files in -/usr/local/share/examples/samba for details. - -FreeBSD Samba ports for localization and encrypt passwords support are no -longer provided because these supports have been integrated into the -original distribution since 1.9.18. If you're Western European or Japanese -Windows users, please set "client code page" parameter in smb.conf (1.9.18 -does not support Chinese Windows. If you want to use Chinese samba, please -use chinese/samba port). See smb.conf.sample for details. If you want to -use NT4+SP3 or Win95+updates clients, set "encrypt passwords" parameter to -yes and use smbpasswd [username] to use /usr/local/private/smbpasswd for -authentication. - -FreeBSD SAMBA ports maintainer: Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org> diff --git a/net/samba3/files/patch-aa b/net/samba3/files/patch-aa deleted file mode 100644 index af170104b851..000000000000 --- a/net/samba3/files/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ ---- Makefile.in.orig Fri Mar 23 16:38:06 2001 -+++ Makefile.in Fri Mar 23 18:12:53 2001 -@@ -43,11 +43,11 @@ - # set these to where to find various files - # These can be overridden by command line switches (see smbd(8)) - # or in smb.conf (see smb.conf(5)) --LOGFILEBASE = @logfilebase@ -+LOGFILEBASE = $(VARDIR)/log - CONFIGFILE = $(CONFIGDIR)/smb.conf - LMHOSTSFILE = $(CONFIGDIR)/lmhosts - DRIVERFILE = $(CONFIGDIR)/printers.def --PASSWD_PROGRAM = /bin/passwd -+PASSWD_PROGRAM = /usr/bin/passwd - # This is where smbpasswd et al go - PRIVATEDIR = @privatedir@ - -@@ -60,6 +60,9 @@ - # the directory where lock files go - LOCKDIR = @lockdir@ - -+# the directory where pid files go -+PIDFILEDIR = $(VARDIR)/run -+ - # The directory where code page definition files go - CODEPAGEDIR = @codepagedir@ - -@@ -78,7 +81,7 @@ - PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\" - FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\" - FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" --FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" -+FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" - FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" - FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H - FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) diff --git a/net/samba3/files/patch-ab b/net/samba3/files/patch-ab deleted file mode 100644 index 7cc000262680..000000000000 --- a/net/samba3/files/patch-ab +++ /dev/null @@ -1,35 +0,0 @@ ---- param/loadparm.c.orig Fri Feb 2 00:42:53 2001 -+++ param/loadparm.c Fri Feb 2 00:45:23 2001 -@@ -108,6 +108,7 @@ - char *szAddPrinterCommand; - char *szDeletePrinterCommand; - char *szLockDir; -+ char *szPidDir; - char *szRootdir; - char *szDefaultService; - char *szDfree; -@@ -948,6 +949,8 @@ - {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING}, - {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, - {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, -+ {"pidfile dir", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0}, -+ {"pidfile directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0}, - #ifdef WITH_UTMP - {"utmp dir", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0}, - {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0}, -@@ -1171,6 +1174,7 @@ - string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM); - string_set(&Globals.szPrintcapname, PRINTCAP_NAME); - string_set(&Globals.szLockDir, LOCKDIR); -+ string_set(&Globals.szPidDir, PIDFILEDIR); - #ifdef WITH_UTMP - string_set(&Globals.szUtmpDir, ""); - string_set(&Globals.szWtmpDir, ""); -@@ -1403,6 +1407,7 @@ - FN_GLOBAL_STRING(lp_addprinter_cmd, &Globals.szAddPrinterCommand) - FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand) - FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir) -+FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir) - #ifdef WITH_UTMP - FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir) - FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir) diff --git a/net/samba3/files/patch-ac b/net/samba3/files/patch-ac deleted file mode 100644 index 0527cb5a32f8..000000000000 --- a/net/samba3/files/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/pidfile.c.orig Fri Feb 2 00:38:09 2001 -+++ lib/pidfile.c Fri Feb 2 00:38:26 2001 -@@ -39,7 +39,7 @@ - unsigned ret; - pstring pidFile; - -- slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name); -+ slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name); - - fd = sys_open(pidFile, O_NONBLOCK | O_RDWR, 0644); - if (fd == -1) { -@@ -80,7 +80,7 @@ - pstring pidFile; - pid_t pid; - -- slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name); -+ slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name); - - pid = pidfile_pid(name); - if (pid != 0) { diff --git a/net/samba3/files/patch-ae b/net/samba3/files/patch-ae deleted file mode 100644 index 252ac19c8e63..000000000000 --- a/net/samba3/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- script/convert_smbpasswd.orig Thu Nov 5 11:50:17 1998 -+++ script/convert_smbpasswd Wed Feb 10 00:02:01 1999 -@@ -7,7 +7,7 @@ - # with trying to work out how to get the seconds since 1970 - # in awk or the shell. JRA. - # --nawk 'BEGIN {FS=":"} -+awk 'BEGIN {FS=":"} - { - if( $0 ~ "^#" ) { - print $0 diff --git a/net/samba3/files/patch-ah b/net/samba3/files/patch-ah deleted file mode 100644 index e97b12388c05..000000000000 --- a/net/samba3/files/patch-ah +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/util_sock.c.orig Fri Feb 2 12:09:17 2001 -+++ lib/util_sock.c Fri Feb 2 12:09:36 2001 -@@ -28,6 +28,9 @@ - extern int sslFd; - #endif /* WITH_SSL */ - -+#undef MSG_WAITALL -+#define MSG_WAITALL 0 -+ - extern int DEBUGLEVEL; - - /* the last IP received from */ diff --git a/net/samba3/files/patch-aj b/net/samba3/files/patch-aj deleted file mode 100644 index ad93c26811da..000000000000 --- a/net/samba3/files/patch-aj +++ /dev/null @@ -1,14 +0,0 @@ ---- include/local.h.orig Thu Nov 11 03:36:00 1999 -+++ include/local.h Fri Feb 4 11:33:01 2000 -@@ -171,9 +171,9 @@ - * Default passwd chat script. - */ - --#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*" -+#define DEFAULT_PASSWD_CHAT "*\\n*ew\\spassword* %n\\n *ew\\spassword* %n\\n *updating\\sthe\\sdatabase...\\npasswd:\\sdone\\n" - - /* Minimum length of allowed password when changing UNIX password. */ --#define MINPASSWDLENGTH 5 -+#define MINPASSWDLENGTH 6 - - #endif diff --git a/net/samba3/files/patch-ba b/net/samba3/files/patch-ba deleted file mode 100644 index 14c0d89b492a..000000000000 --- a/net/samba3/files/patch-ba +++ /dev/null @@ -1,43 +0,0 @@ ---- configure.in.orig Tue Apr 17 19:00:52 2001 -+++ configure.in Thu Jun 7 13:49:53 2001 -@@ -234,9 +234,6 @@ - AC_CHECK_TYPE(offset_t,loff_t) - AC_CHECK_TYPE(ssize_t, int) - --# we need libcups for CUPS support... --AC_CHECK_LIB(cups,httpConnect) -- - # we need libdl for PAM and the new VFS code - AC_CHECK_LIB(dl,main) - -@@ -1258,7 +1255,7 @@ - --without-krb5 Don't include Kerberos 5 support (default)], - [ AC_MSG_RESULT(yes) - AC_DEFINE(KRB5_AUTH) -- LIBS="$LIBS -ldes425 -lkrb5 -lcrypto -lcom_err" -+ LIBS="$LIBS -ldes425 -lkrb5 -lk5crypto -lcom_err" - CFLAGS="$CFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib"], - AC_MSG_RESULT(no) -@@ -1486,6 +1483,21 @@ - esac ], - AC_MSG_RESULT(no) - ) -+ -+################################################# -+# check for CUPS printing support -+AC_MSG_CHECKING(whether to use CUPS printing) -+AC_ARG_WITH(cups, -+[ --with-cups=base-dir Include CUPS printing support -+ --without-cups Don't include CUPS printing support (default)], -+[ AC_MSG_RESULT(yes) -+ LIBS="$LIBS -lcups" -+ CFLAGS="$CFLAGS -I$withval/include" -+ LDFLAGS="$LDFLAGS -L$withval/lib" -+ AC_CHECK_LIB(cups,httpConnect)], -+ AC_MSG_RESULT(no) -+) -+ - - ################################################# - # check for experimental disk-quotas support diff --git a/net/samba3/files/patch-bb b/net/samba3/files/patch-bb deleted file mode 100644 index 0f70c69c78f4..000000000000 --- a/net/samba3/files/patch-bb +++ /dev/null @@ -1,10 +0,0 @@ ---- include/proto.h.orig Fri Feb 2 15:34:50 2001 -+++ include/proto.h Fri Feb 2 16:13:03 2001 -@@ -1420,6 +1420,7 @@ - char *lp_addprinter_cmd(void); - char *lp_deleteprinter_cmd(void); - char *lp_lockdir(void); -+char *lp_piddir(void); - char *lp_utmpdir(void); - char *lp_wtmpdir(void); - char *lp_utmp_hostname(void); diff --git a/net/samba3/files/samba.sh.sample b/net/samba3/files/samba.sh.sample deleted file mode 100644 index e6807ad6d145..000000000000 --- a/net/samba3/files/samba.sh.sample +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -smbspool=/var/spool/samba -pidfiledir=/var/run -smbd=/usr/local/sbin/smbd -nmbd=/usr/local/sbin/nmbd - -# start -if [ "x$1" = "x" -o "x$1" = "xstart" ]; then - if [ -f $smbd ]; then - if [ -d $smbspool ]; then - rm -f $smbspool/* - fi - echo -n ' Samba' - $smbd -D - $nmbd -D - fi - -# stop -elif [ "x$1" = "xstop" ]; then - kill `cat $pidfiledir/smbd.pid` - kill `cat $pidfiledir/nmbd.pid` -fi diff --git a/net/samba3/files/smb.conf.default b/net/samba3/files/smb.conf.default deleted file mode 100644 index ef0d65a03705..000000000000 --- a/net/samba3/files/smb.conf.default +++ /dev/null @@ -1,283 +0,0 @@ -# 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 -# many!) most of which are not shown in this example -# -# Any line which starts with a ; (semi-colon) or a # (hash) -# is a comment and is ignored. In this example we will use a # -# for commentry and a ; for parts of the config file that you -# may wish to enable -# -# NOTE: Whenever you modify this file you should run the command "testparm" -# to check that you have not many any basic syntactic errors. -# -#======================= Global Settings ===================================== -[global] - -# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4 - workgroup = MYGROUP - -# server string is the equivalent of the NT Description field - server string = Samba Server - -# This option is important for security. It allows you to restrict -# connections to machines which are on your local network. The -# following example restricts access to two C class networks and -# the "loopback" interface. For more examples of the syntax see -# the smb.conf man page -; hosts allow = 192.168.1. 192.168.2. 127. - -# If you want to automatically load your printer list rather -# than setting them up individually then you'll need this - load printers = yes - -# you may wish to override the location of the printcap file -; printcap name = /etc/printcap - -# on SystemV system setting printcap name to lpstat should allow -# you to automatically obtain a printer list from the SystemV spool -# system -; printcap name = lpstat - -# It should not be necessary to specify the print system type unless -# it is non-standard. Currently supported print systems include: -# bsd, sysv, plp, lprng, aix, hpux, qnx -; printing = bsd - -# Uncomment this if you want a guest account, you must add this to /etc/passwd -# otherwise the user "nobody" is used -; guest account = pcguest - -# this tells Samba to use a separate log file for each machine -# that connects - log file = %%SAMBA_LOGDIR%%/log.%m - -# Put a capping on the size of the log files (in Kb). - max log size = 50 - -# Security mode. Most people will want user level security. See -# security_level.txt for details. - security = user -# Use password server option only with security = server -; password server = <NT-Server-Name> - -# You may wish to use password encryption. Please read -# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation. -# Do not enable this option unless you have read those documents -; encrypt passwords = yes - -# Using the following line enables you to customise your configuration -# on a per machine basis. The %m gets replaced with the netbios name -# of the machine that is connecting -; include = %%SAMBA_CONFDIR%%/smb.conf.%m - -# Most people will find that this option gives better performance. -# See speed.txt and the manual pages for details - socket options = TCP_NODELAY - -# Configure Samba to use multiple interfaces -# If you have multiple network interfaces then you must list them -# here. See the man page for details. -; interfaces = 192.168.12.2/24 192.168.13.2/24 - -# Browser Control Options: -# set local master to no if you don't want Samba to become a master -# browser on your network. Otherwise the normal election rules apply -; local master = no - -# OS Level determines the precedence of this server in master browser -# elections. The default value should be reasonable -; os level = 33 - -# Domain Master specifies Samba to be the Domain Master Browser. This -# allows Samba to collate browse lists between subnets. Don't use this -# if you already have a Windows NT domain controller doing this job -; domain master = yes - -# Preferred Master causes Samba to force a local browser election on startup -# and gives it a slightly higher chance of winning the election -; preferred master = yes - -# Use only if you have an NT server on your network that has been -# configured at install time to be a primary domain controller. -; domain controller = <NT-Domain-Controller-SMBName> - -# Enable this if you want Samba to be a domain logon server for -# Windows95 workstations. -; domain logons = yes - -# if you enable domain logons then you may want a per-machine or -# per user logon script -# run a specific logon batch file per workstation (machine) -; logon script = %m.bat -# run a specific logon batch file per username -; logon script = %U.bat - -# Where to store roving profiles (only for Win95 and WinNT) -# %L substitutes for this servers netbios name, %U is username -# You must uncomment the [Profiles] share below -; logon path = \\%L\Profiles\%U - -# Windows Internet Name Serving Support Section: -# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server -; wins support = yes - -# WINS Server - Tells the NMBD components of Samba to be a WINS Client -# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both -; wins server = w.x.y.z - -# WINS Proxy - Tells Samba to answer name resolution queries on -# behalf of a non WINS capable client, for this to work there must be -# at least one WINS Server on the network. The default is NO. -; wins proxy = yes - -# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names -# via DNS nslookups. The built-in default for versions 1.9.17 is yes, -# this has been changed in version 1.9.18 to no. - dns proxy = no - -# Client codepage settings - -# for Greek users -; client code page=737 - -# for European users (Latin 1) -; client code page=850 - -# for European users (Latin 2) -; client code page=852 - -# for Icelandic users -; client code page=861 - -# for Cyrillic users -; client code page=866 - -# for Japanese Users -; client code page=932 -; coding system=cap - -# for Simplified Chinese Users -; client code page=936 -; coding system=cap - -# for Korean Users -; client code page=949 -; coding system=cap - -# for Traditional Chinese Users -; client code page=950 -; coding system=cap - -#============================ Share Definitions ============================== -[homes] - comment = Home Directories - browseable = no - writeable = yes - -# Un-comment the following and create the netlogon directory for Domain Logons -; [netlogon] -; comment = Network Logon Service -; path = /usr/local/samba/lib/netlogon -; guest ok = yes -; writeable = no -; share modes = no - - -# Un-comment the following to provide a specific roving profile share -# the default is to use the user's home directory -;[Profiles] -; path = /usr/local/samba/profiles -; browseable = no -; guest ok = yes - - -# NOTE: If you have a BSD-style print system there is no need to -# specifically define each individual printer -[printers] - comment = All Printers - path = %%SAMBA_SPOOL%% - browseable = no -# Set public = yes to allow user 'guest account' to print - guest ok = no - writeable = no - printable = yes - -# This one is useful for people to share files -;[tmp] -; comment = Temporary file space -; path = /tmp -; read only = no -; public = yes - -# A publicly accessible directory, but read only, except for people in -# the "staff" group -;[public] -; comment = Public Stuff -; path = /home/samba -; public = yes -; writeable = yes -; printable = no -; write list = @staff - -# Other examples. -# -# A private printer, usable only by fred. Spool data will be placed in fred's -# home directory. Note that fred must have write access to the spool directory, -# wherever it is. -;[fredsprn] -; comment = Fred's Printer -; valid users = fred -; path = /homes/fred -; printer = freds_printer -; public = no -; writeable = no -; printable = yes - -# A private directory, usable only by fred. Note that fred requires write -# access to the directory. -;[fredsdir] -; comment = Fred's Service -; path = /usr/somewhere/private -; valid users = fred -; public = no -; writeable = yes -; printable = no - -# a service which has a different directory for each machine that connects -# this allows you to tailor configurations to incoming machines. You could -# also use the %U option to tailor it by user name. -# The %m gets replaced with the machine name that is connecting. -;[pchome] -; comment = PC Directories -; path = /usr/pc/%m -; public = no -; writeable = yes - -# A publicly accessible directory, read/write to all users. Note that all files -# created in the directory by users will be owned by the default user, so -# any user with access can delete any other user's files. Obviously this -# directory must be writeable by the default user. Another user could of course -# be specified, in which case all files would be owned by that user instead. -;[public] -; path = /usr/somewhere/else/public -; public = yes -; only guest = yes -; writeable = yes -; printable = no - -# The following two entries demonstrate how to share a directory so that two -# users can place files there that will be owned by the specific users. In this -# setup, the directory should be writeable by both users and should have the -# sticky bit set on it to prevent abuse. Obviously this could be extended to -# as many users as required. -;[myshare] -; comment = Mary's and Fred's stuff -; path = /usr/somewhere/shared -; valid users = mary fred -; public = no -; writeable = yes -; printable = no -; create mask = 0765 - - |