head	1.34;
access;
symbols
	pkgsrc-2026Q3:1.34.0.120
	pkgsrc-2026Q3-base:1.34
	pkgsrc-2026Q2:1.34.0.118
	pkgsrc-2026Q2-base:1.34
	pkgsrc-2026Q1:1.34.0.116
	pkgsrc-2026Q1-base:1.34
	pkgsrc-2025Q4:1.34.0.114
	pkgsrc-2025Q4-base:1.34
	pkgsrc-2025Q3:1.34.0.112
	pkgsrc-2025Q3-base:1.34
	pkgsrc-2025Q2:1.34.0.110
	pkgsrc-2025Q2-base:1.34
	pkgsrc-2025Q1:1.34.0.108
	pkgsrc-2025Q1-base:1.34
	pkgsrc-2024Q4:1.34.0.106
	pkgsrc-2024Q4-base:1.34
	pkgsrc-2024Q3:1.34.0.104
	pkgsrc-2024Q3-base:1.34
	pkgsrc-2024Q2:1.34.0.102
	pkgsrc-2024Q2-base:1.34
	pkgsrc-2024Q1:1.34.0.100
	pkgsrc-2024Q1-base:1.34
	pkgsrc-2023Q4:1.34.0.98
	pkgsrc-2023Q4-base:1.34
	pkgsrc-2023Q3:1.34.0.96
	pkgsrc-2023Q3-base:1.34
	pkgsrc-2023Q2:1.34.0.94
	pkgsrc-2023Q2-base:1.34
	pkgsrc-2023Q1:1.34.0.92
	pkgsrc-2023Q1-base:1.34
	pkgsrc-2022Q4:1.34.0.90
	pkgsrc-2022Q4-base:1.34
	pkgsrc-2022Q3:1.34.0.88
	pkgsrc-2022Q3-base:1.34
	pkgsrc-2022Q2:1.34.0.86
	pkgsrc-2022Q2-base:1.34
	pkgsrc-2022Q1:1.34.0.84
	pkgsrc-2022Q1-base:1.34
	pkgsrc-2021Q4:1.34.0.82
	pkgsrc-2021Q4-base:1.34
	pkgsrc-2021Q3:1.34.0.80
	pkgsrc-2021Q3-base:1.34
	pkgsrc-2021Q2:1.34.0.78
	pkgsrc-2021Q2-base:1.34
	pkgsrc-2021Q1:1.34.0.76
	pkgsrc-2021Q1-base:1.34
	pkgsrc-2020Q4:1.34.0.74
	pkgsrc-2020Q4-base:1.34
	pkgsrc-2020Q3:1.34.0.72
	pkgsrc-2020Q3-base:1.34
	pkgsrc-2020Q2:1.34.0.68
	pkgsrc-2020Q2-base:1.34
	pkgsrc-2020Q1:1.34.0.48
	pkgsrc-2020Q1-base:1.34
	pkgsrc-2019Q4:1.34.0.70
	pkgsrc-2019Q4-base:1.34
	pkgsrc-2019Q3:1.34.0.66
	pkgsrc-2019Q3-base:1.34
	pkgsrc-2019Q2:1.34.0.64
	pkgsrc-2019Q2-base:1.34
	pkgsrc-2019Q1:1.34.0.62
	pkgsrc-2019Q1-base:1.34
	pkgsrc-2018Q4:1.34.0.60
	pkgsrc-2018Q4-base:1.34
	pkgsrc-2018Q3:1.34.0.58
	pkgsrc-2018Q3-base:1.34
	pkgsrc-2018Q2:1.34.0.56
	pkgsrc-2018Q2-base:1.34
	pkgsrc-2018Q1:1.34.0.54
	pkgsrc-2018Q1-base:1.34
	pkgsrc-2017Q4:1.34.0.52
	pkgsrc-2017Q4-base:1.34
	pkgsrc-2017Q3:1.34.0.50
	pkgsrc-2017Q3-base:1.34
	pkgsrc-2017Q2:1.34.0.46
	pkgsrc-2017Q2-base:1.34
	pkgsrc-2017Q1:1.34.0.44
	pkgsrc-2017Q1-base:1.34
	pkgsrc-2016Q4:1.34.0.42
	pkgsrc-2016Q4-base:1.34
	pkgsrc-2016Q3:1.34.0.40
	pkgsrc-2016Q3-base:1.34
	pkgsrc-2016Q2:1.34.0.38
	pkgsrc-2016Q2-base:1.34
	pkgsrc-2016Q1:1.34.0.36
	pkgsrc-2016Q1-base:1.34
	pkgsrc-2015Q4:1.34.0.34
	pkgsrc-2015Q4-base:1.34
	pkgsrc-2015Q3:1.34.0.32
	pkgsrc-2015Q3-base:1.34
	pkgsrc-2015Q2:1.34.0.30
	pkgsrc-2015Q2-base:1.34
	pkgsrc-2015Q1:1.34.0.28
	pkgsrc-2015Q1-base:1.34
	pkgsrc-2014Q4:1.34.0.26
	pkgsrc-2014Q4-base:1.34
	pkgsrc-2014Q3:1.34.0.24
	pkgsrc-2014Q3-base:1.34
	pkgsrc-2014Q2:1.34.0.22
	pkgsrc-2014Q2-base:1.34
	pkgsrc-2014Q1:1.34.0.20
	pkgsrc-2014Q1-base:1.34
	pkgsrc-2013Q4:1.34.0.18
	pkgsrc-2013Q4-base:1.34
	pkgsrc-2013Q3:1.34.0.16
	pkgsrc-2013Q3-base:1.34
	pkgsrc-2013Q2:1.34.0.14
	pkgsrc-2013Q2-base:1.34
	pkgsrc-2013Q1:1.34.0.12
	pkgsrc-2013Q1-base:1.34
	pkgsrc-2012Q4:1.34.0.10
	pkgsrc-2012Q4-base:1.34
	pkgsrc-2012Q3:1.34.0.8
	pkgsrc-2012Q3-base:1.34
	pkgsrc-2012Q2:1.34.0.6
	pkgsrc-2012Q2-base:1.34
	pkgsrc-2012Q1:1.34.0.4
	pkgsrc-2012Q1-base:1.34
	pkgsrc-2011Q4:1.34.0.2
	pkgsrc-2011Q4-base:1.34
	pkgsrc-2011Q3:1.33.0.18
	pkgsrc-2011Q3-base:1.33
	pkgsrc-2011Q2:1.33.0.16
	pkgsrc-2011Q2-base:1.33
	pkgsrc-2011Q1:1.33.0.14
	pkgsrc-2011Q1-base:1.33
	pkgsrc-2010Q4:1.33.0.12
	pkgsrc-2010Q4-base:1.33
	pkgsrc-2010Q3:1.33.0.10
	pkgsrc-2010Q3-base:1.33
	pkgsrc-2010Q2:1.33.0.8
	pkgsrc-2010Q2-base:1.33
	pkgsrc-2010Q1:1.33.0.6
	pkgsrc-2010Q1-base:1.33
	pkgsrc-2009Q4:1.33.0.4
	pkgsrc-2009Q4-base:1.33
	pkgsrc-2009Q3:1.33.0.2
	pkgsrc-2009Q3-base:1.33
	pkgsrc-2009Q2:1.32.0.16
	pkgsrc-2009Q2-base:1.32
	pkgsrc-2009Q1:1.32.0.14
	pkgsrc-2009Q1-base:1.32
	pkgsrc-2008Q4:1.32.0.12
	pkgsrc-2008Q4-base:1.32
	pkgsrc-2008Q3:1.32.0.10
	pkgsrc-2008Q3-base:1.32
	cube-native-xorg:1.32.0.8
	cube-native-xorg-base:1.32
	pkgsrc-2008Q2:1.32.0.6
	pkgsrc-2008Q2-base:1.32
	cwrapper:1.32.0.4
	pkgsrc-2008Q1:1.32.0.2
	pkgsrc-2008Q1-base:1.32
	pkgsrc-2007Q4:1.30.0.18
	pkgsrc-2007Q4-base:1.30
	pkgsrc-2007Q3:1.30.0.16
	pkgsrc-2007Q3-base:1.30
	pkgsrc-2007Q2:1.30.0.14
	pkgsrc-2007Q2-base:1.30
	pkgsrc-2007Q1:1.30.0.12
	pkgsrc-2007Q1-base:1.30
	pkgsrc-2006Q4:1.30.0.10
	pkgsrc-2006Q4-base:1.30
	pkgsrc-2006Q3:1.30.0.8
	pkgsrc-2006Q3-base:1.30
	pkgsrc-2006Q2:1.30.0.6
	pkgsrc-2006Q2-base:1.30
	pkgsrc-2006Q1:1.30.0.4
	pkgsrc-2006Q1-base:1.30
	pkgsrc-2005Q4:1.30.0.2
	pkgsrc-2005Q4-base:1.30
	pkgsrc-2005Q3:1.29.0.6
	pkgsrc-2005Q3-base:1.29
	pkgsrc-2005Q2:1.29.0.4
	pkgsrc-2005Q2-base:1.29
	pkgsrc-2005Q1:1.29.0.2
	pkgsrc-2005Q1-base:1.29
	pkgsrc-2004Q4:1.28.0.4
	pkgsrc-2004Q4-base:1.28
	pkgsrc-2004Q3:1.28.0.2
	pkgsrc-2004Q3-base:1.28
	pkgsrc-2004Q2:1.27.0.2
	pkgsrc-2004Q2-base:1.27
	pkgsrc-2004Q1:1.26.0.2
	pkgsrc-2004Q1-base:1.26
	pkgsrc-2003Q4:1.24.0.2
	pkgsrc-2003Q4-base:1.24
	netbsd-1-6-1:1.23.0.2
	netbsd-1-6-1-base:1.23
	netbsd-1-6:1.20.0.4
	netbsd-1-6-RELEASE-base:1.20
	buildlink2:1.18.0.2
	buildlink2-base:1.20
	netbsd-1-5-PATCH003:1.17
	netbsd-1-5-PATCH001:1.13
	netbsd-1-5-RELEASE:1.11
	netbsd-1-4-PATCH003:1.11
	netbsd-1-4-PATCH002:1.9
	comdex-fall-1999:1.8
	netbsd-1-4-PATCH001:1.7
	netbsd-1-4-RELEASE:1.7
	netbsd-1-3-PATCH003:1.6
	netbsd-1-3-PATCH002:1.2
	FreeBSD-current-1997-10-23:1.1.1.1
	FREEBSD:1.1.1;
locks; strict;
comment	@# @;


1.34
date	2011.12.16.11.05.24;	author asau;	state Exp;
branches;
next	1.33;

1.33
date	2009.10.04.16.58.38;	author taca;	state Exp;
branches;
next	1.32;

1.32
date	2008.04.03.20.19.42;	author jlam;	state Exp;
branches;
next	1.31;

1.31
date	2008.02.19.10.28.12;	author taca;	state Exp;
branches;
next	1.30;

1.30
date	2005.11.14.08.05.27;	author jlam;	state dead;
branches;
next	1.29;

1.29
date	2005.01.09.06.33.28;	author christos;	state Exp;
branches;
next	1.28;

1.28
date	2004.09.14.17.18.06;	author jlam;	state dead;
branches;
next	1.27;

1.27
date	2004.05.13.06.44.56;	author xtraeme;	state Exp;
branches;
next	1.26;

1.26
date	2004.02.17.11.51.54;	author jlam;	state dead;
branches;
next	1.25;

1.25
date	2004.01.11.02.26.31;	author jlam;	state Exp;
branches;
next	1.24;

1.24
date	2003.03.16.07.57.45;	author martti;	state Exp;
branches;
next	1.23;

1.23
date	2002.12.13.08.37.10;	author martti;	state Exp;
branches
	1.23.2.1;
next	1.22;

1.22
date	2002.10.18.11.50.28;	author martti;	state Exp;
branches;
next	1.21;

1.21
date	2002.08.25.21.50.13;	author jlam;	state Exp;
branches;
next	1.20;

1.20
date	2002.07.30.23.05.13;	author jlam;	state Exp;
branches;
next	1.19;

1.19
date	2002.06.22.21.31.31;	author jlam;	state dead;
branches;
next	1.18;

1.18
date	2002.05.05.16.57.11;	author taca;	state Exp;
branches
	1.18.2.1;
next	1.17;

1.17
date	2002.02.05.00.36.26;	author taca;	state Exp;
branches;
next	1.16;

1.16
date	2001.06.19.09.03.31;	author jlam;	state dead;
branches;
next	1.15;

1.15
date	2001.05.22.21.49.29;	author jlam;	state Exp;
branches;
next	1.14;

1.14
date	2001.05.14.18.56.16;	author jlam;	state Exp;
branches;
next	1.13;

1.13
date	2001.05.10.09.00.23;	author abs;	state Exp;
branches;
next	1.12;

1.12
date	2001.04.18.12.54.47;	author tron;	state Exp;
branches;
next	1.11;

1.11
date	2000.09.03.09.17.00;	author kei;	state Exp;
branches;
next	1.10;

1.10
date	2000.05.02.15.24.09;	author jlam;	state Exp;
branches;
next	1.9;

1.9
date	99.11.16.21.01.05;	author jlam;	state Exp;
branches;
next	1.8;

1.8
date	99.08.10.16.38.09;	author bouyer;	state Exp;
branches;
next	1.7;

1.7
date	99.02.18.11.50.07;	author bouyer;	state Exp;
branches;
next	1.6;

1.6
date	98.09.04.19.17.18;	author bad;	state Exp;
branches;
next	1.5;

1.5
date	98.08.09.16.14.08;	author kim;	state Exp;
branches;
next	1.4;

1.4
date	98.08.07.11.10.53;	author agc;	state Exp;
branches;
next	1.3;

1.3
date	98.06.17.17.07.14;	author bouyer;	state Exp;
branches;
next	1.2;

1.2
date	98.01.12.17.19.28;	author agc;	state Exp;
branches;
next	1.1;

1.1
date	97.12.24.10.32.01;	author agc;	state Exp;
branches
	1.1.1.1;
next	;

1.23.2.1
date	2003.03.23.01.23.42;	author jmc;	state Exp;
branches;
next	;

1.18.2.1
date	2002.06.23.18.56.58;	author jlam;	state dead;
branches;
next	1.18.2.2;

1.18.2.2
date	2002.08.25.21.20.32;	author jlam;	state Exp;
branches;
next	;

1.1.1.1
date	97.12.24.10.32.01;	author agc;	state Exp;
branches;
next	;


desc
@@


1.34
log
@Update to Samba 3.5.11 from net/samba35, part of Samba packages rearrangement.
@
text
@$NetBSD: patch-aa,v 1.3 2011/08/01 08:42:39 apb Exp $

Avoid an infinite loop in the configure script after 
"checking for replacing readdir using getdirentries()..."

--- ../lib/replace/test/os2_delete.c.orig	2011-07-24 20:04:44.000000000 +0000
+++ ../lib/replace/test/os2_delete.c	2011-08-01 08:09:59.000000000 +0000
@@@@ -116,6 +116,7 @@@@
 	while (1) {
 		int n = os2_delete(d);
 		if (n == 0) break;
+		if (test_readdir_os2_delete_ret != 0) break; /* if FAILED */
 		total_deleted += n;
 	}
 	closedir(d);
@


1.33
log
@Update samba package to 3.0.37.


This is a security release in order to address CVE-2009-2813, CVE-2009-2948
and CVE-2009-2906.
Please note that Samba 3.0 is not maintained any longer. This security
release is shipped on a voluntary basis.

   o CVE-2009-2813:
     In all versions of Samba later than 3.0.11, connecting to the home
     share of a user will use the root of the filesystem
     as the home directory if this user is misconfigured to have
     an empty home directory in /etc/passwd.

   o CVE-2009-2948:
     If mount.cifs is installed as a setuid program, a user can pass it a
     credential or password path to which he or she does not have access and
     then use the --verbose option to view the first line of that file.

   o CVE-2009-2906:
     Specially crafted SMB requests on authenticated SMB connections can
     send smbd into a 100% CPU loop, causing a DoS on the Samba server.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.32 2008/04/03 20:19:42 jlam Exp $
d3 13
a15 11
--- nsswitch/pam_winbind.c.orig	2009-09-30 21:21:56.000000000 +0900
+++ nsswitch/pam_winbind.c
@@@@ -1295,6 +1295,8 @@@@ static char *_pam_delete(register char *
 	return NULL;
 }
 
+PAM_EXTERN int pam_sm_close_session(pam_handle_t *, int, int, const char **);
+
 /*
  * obtain a password from the user
  */
@


1.32
log
@Update samba to version 3.0.28a.

CHANGES FOR PKGSRC:
==================

Makefile:
  + Modify section that manually handles the ELF symlinks for samba
    shared libraries -- add additional libraries that are built (addns,
    smbsharemodes) and reorganize so we don't need two loops where one
    will do.

  + Pass --with-included-popt to the configure script to force using
    the popt distribution included with samba to avoid any library
    mismatch errors between samba and any installed popt.  This fixes
    PR pkg/34444 by Jason Lingohr.

  + Don't build the smbmount programs on Linux -- they're deprecated in
    favor of the mount.cifs programs.

  + Remove some pkgviews-related settings -- I'm not supporting pkgviews
    installation of samba.

Makefile.patches:
  + Empty out PATCHFILES because we are updating to the latest release
    of samba, which has all previous patches for security advisories
    already rolled into the main sources.

Makefile.mirrors:
  + Update SAMBA_MIRRORS in Makefile.mirrors to the latest list of FTP
    mirrors.

options.mk:
  + Only show the ``acl'' option on platforms that actually support
    POSIX ACLs.

  + Add a new ``fam'' option to enable building the notify_fam VFS
    module.

patch-ab, patch-ax:
  + Remove patch-ab and update patch-ax -- there's nothing for the
    scripts to back up so we don't need to patch the install* scripts
    to avoid this.

patch-ae, patch-ah:
  + Update patch-ae and remove patch-ah -- we should definitely check
    that PAM_AUTHTOK_RECOVERY_ERR is defined before using its value to
    define PAM_AUTHTOK_RECOVER_ERR.

patch-at, patch-au:
  + Fix patch-at and patch-au -- in configure.in, we need to "escape"
    left and right brackets or else m4 will strip them away in the
    resulting configure script.  This should fix the detection of FreeBSD
    and NetBSD systems capable of using nss_winbind noted in PR pkg/38076
    by Ingo Meyer.

patch-ay:
  + Remove some unnecessary changes -- we can safely just do "mkdir" in
    some places because we know the parent and any intermediate directories
    exist.

patch-be:
  + Fix a bug in locating WINS_LIST -- nmbd/nmbd_winsserver.c was
    referring to WINS_LIST under the state directory in one place and
    under the lock directory in another; change all references to be
    under the state directory.

patch-db:
  + Add patch to fix the build of samba on older BSDs.  Patch supplied
    in PR pkg/37487 by John Frear.

All remaining changes to patches/patch-* are simply to remove fuzz.

MAJOR CHANGES FROM VERSION 3.0.26a:

* Fix failure to join Windows 2008 domains.

* Fix Windows Vista (including SP1 RC) inter-op issues.

* Add a new ``administrative share'' service parameter for defining
  hidden shares that cannot be managed from Windows.

* Fix for CVS-2007-6015 (already fixed in 3.0.26anb4 in pkgsrc).

* Fix for CVS-2007-5398 (already fixed in 3.0.26anb4 in pkgsrc).

* Fix for CVS-2007-4572 (already fixed in 3.0.26anb4 in pkgsrc).  Also
  subsequent fix for regression experienced by smbfs clients caused by
  the fix for CVS-2007-4572, noted in PR pkg/38300 by Dave Barnes.

* Many other bugs fixed and memory leaks plugged.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- nsswitch/pam_winbind.c.orig	2008-03-08 10:56:27.000000000 -0500
d5 1
a5 1
@@@@ -1291,6 +1291,8 @@@@ static char *_pam_delete(register char *
@


1.31
log
@Try to fix build problem on current with pam option.
@
text
@d3 1
a3 1
--- nsswitch/pam_winbind.c.orig	2007-04-21 10:48:07.000000000 +0900
d5 1
a5 1
@@@@ -1289,6 +1289,8 @@@@ static char *_pam_delete(register char *
@


1.30
log
@Update net/samba to 3.0.20.2 from samba-3.0.20b.  Recommended patches
for samba-3.0.20b that are applied as part of this update include:

	http://www.samba.org/samba/patches/print_lprm.patch
	http://www.samba.org/samba/patches/quota.patch
	http://www.samba.org/samba/patches/bug3201_wbinfo.patch

This fixes PRs pkg/31352 and pkg/31991.  Important changes that were
made as part of porting this Samba release to pkgsrc include the
following:

* The new release model for Samba includes distributing patches for
  urgent bug fixes that will be included in the next release of Samba,
  and are available at http://www.samba.org/samba/patches/.  Since
  these patches are rather generically named, we download all DISTFILES
  and PATCHFILES for Samba into a ${DISTNAME}-specific directory.

* The default configuration for the samba package no longer builds the
  "winbind" portions of samba, which are really only useful when
  attempting to unify logons between Unix and Microsoft Windows.  When
  the "winbind" option is specified, we also build the RID and AD idmap
  backends, which allow sharing UIDs/GIDs across Unix machines.

* New package options have been added to the build: "mysql", "pgsql",
  and "xml" allow adding optional support for experimental passdb
  storage backends, and "winbind" allows for optionally building the
  winbindd daemon and associated plugins.

* Two new smb.conf options were added -- "passwd expand gecos" and
  "state directory".  The first describes whether "&" in the GECOS
  field of a passwd db entry is expanded to the login name.  The
  second describes the location where the persistent-state database
  files are stored.

* Luke Mewburn contributed code to allow nss_winbind.so to work properly
  on supported NetBSD systems.  The FreeBSD NSS winbind code should
  probably be replaced with a suitably tweaked version of the NetBSD
  code since the latter is much more complete in the functions that are
  provided, but I'll leave that to freebsd-pkg-people.

* Samba dumps all of its files into "lock directory", but some of them
  need to persist across reboots.  We make a distinction between these
  files and the temporary files that are re-created by the Samba
  daemons when they are restarted -- the former are now stored in a
  "state directory" and the latter are stored in the "lock directory".
  This is modeled after the Debian patch to Samba located in:

	packaging/Debian/debian-unstable/patches/fhs.patch

  The "lock directory" default has been moved to ${VARBASE}/run/samba
  to emphasize the temporary status of the files stored in that
  directory.

* Samba persists in using PAM_AUTHTOK_RECOVER_ERR, when there is almost
  universal agreement that PAM_AUTHTOK_RECOVERY_ERR is the right
  constant to use.  Even the Linux-PAM distribution ensures that
  PAM_AUTHTOK_RECOVERY_ERR is correctly defined.  To work around this,
  we define PAM_AUTHTOK_RECOVER_ERR appropriately in all the places
  where it is used.

* The configure script checks for OpenSSL's libcrypto.so by looking
  for the symbol "des_set_key".  However, libcrypto.so might not
  contain that symbol because the DES functions might come from a
  separate library, e.g. libdes.so.  In this case, the configure script
  will think that libcrypto.so is not available, when it actually may
  be.  Instead, look for EVP_des_cbc, which is always provided by
  libcrypto.so.

* Add some missing $(PASSDB_LIBS) references to the Makefile to fix
  compilation problems if the experimental passdb backends are statically
  compiled into the Samba suite programs.

* Fix compilation problems in sam/idmap_rid.c and sam/idmap_ad.c if the
  "rid" and "ad" idmap backends are statically compiled into winbindd.

Changes between version 3.0.14a and 3.0.20b include:

  o Reporting files as read-only instead of returning the correct error
    code of "access denied"
  o File system quota support defects
  o Crash bugs caused by incompatibilities on 64-bit systems.
  o User Manager interoperability problems.
  o Support for several new Win32 rpc pipes.
  o New 'net rpc service' tool for managing Win32 services.
  o Capability to set the owner on new files and directory based on the
    parent's ownership.
  o Experimental, asynchronous IO file serving support.
  o Support for Microsoft Print Migrator.
  o New Winbind IDmap plugin (ad) for retrieving uid and gid from AD
    servers which maintain the SFU user and group attributes.
  o Rewritten support for POSIX pathnames when utilizing the Linux CIFS
    fs client.
  o New asynchronous winbindd.
  o New Windows NT registry file I/O library.
  o New user right (SeTakeOwnershipPrivilege) added.
  o New "net share migrate" options.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.29 2005/01/09 06:33:28 christos Exp $
d3 5
a7 32
--- nsswitch/pam_winbind.c.orig	2004-10-25 17:04:57.000000000 -0400
+++ nsswitch/pam_winbind.c	2005-01-09 01:17:21.000000000 -0500
@@@@ -338,10 +338,10 @@@@
 			item = NULL;
 			return PAM_SUCCESS;
 		} else if (on(WINBIND_USE_FIRST_PASS_ARG, ctrl)) {
-			return PAM_AUTHTOK_RECOVER_ERR;		/* didn't work */
+			return PAM_AUTHTOK_RECOVERY_ERR;		/* didn't work */
 		} else if (on(WINBIND_USE_AUTHTOK_ARG, ctrl)
 			   && off(WINBIND__OLD_PASSWORD, ctrl)) {
-			return PAM_AUTHTOK_RECOVER_ERR;
+			return PAM_AUTHTOK_RECOVERY_ERR;
 		}
 	}
 	/*
@@@@ -394,7 +394,7 @@@@
 						if (!resp[i - 1].resp
 						    || strcmp(token, resp[i - 1].resp)) {
 							_pam_delete(token);	/* mistyped */
-							retval = PAM_AUTHTOK_RECOVER_ERR;
+							retval = PAM_AUTHTOK_RECOVERY_ERR;
 							_make_remark(pamh								    ,PAM_ERROR_MSG, MISTYPED_PASS);
 						}
 					}
@@@@ -413,7 +413,7 @@@@
 
 		} else {
 			retval = (retval == PAM_SUCCESS)
-			    ? PAM_AUTHTOK_RECOVER_ERR : retval;
+			    ? PAM_AUTHTOK_RECOVERY_ERR : retval;
 		}
 	}
d9 5
@


1.29
log
@Fix the pam build: lunix defines both the portable
PAM_AUTHTOK_RECOVERY_ERR and the non-portable PAM_AUTHTOK_RECOVER_ERR as 21,
and you guessed which samba decided to use. Bump the version to nb2.
@
text
@d1 1
a1 1
$NetBSD$
@


1.28
log
@Update net/samba to 3.0.7.  Changes from version 3.0.5 include:

  o Fixes for two Denial of Service vulnerabalities
    (CVE ID# CAN-2004-0807 & CAN-2004-0808).
  o Winbind failure to return user entries under certain conditions.
  o Syntax errors in the OpenLDAP schema file (samba.schema).
  o Printing errors caused by not setting default values for the various
    printing commands.
  * Disable 'winbind enable local accounts' by default.
  o Schannel failure in winbindd.
  o Incompatibilities between the 'write list' and 'force user' smb.conf
    options.
  o Premature optimization of the open_directory() internal function that
    broke tools such as the ArcServe backup agent, Macromedia HomeSite,
    and Robocopy.
  o Sharing violation errors commonly seen when opening when serving
    Microsoft Office documents from a Samba file share.
  o Browsing problems caused by an apostrophe (') in the computer's
    description field.
  o Problems creating special file types from UNIX CIFS clients and
    enabling 'unix extensions'.
  o Fix stalls in smbd caused by inaccessible LDAP servers.
  o Remove various memory leaks.
  o Fix issues in the password lockout feature.
  o Using a cups server other than localhost.
  o Maintaining the service principal entry in the system keytab for
    integration with other kerberized services.  Please refer to the
    'use kerberos keytab' entry in smb.conf(5).  When using the heimdal
    kerberos libraries, you must also specify the following in /etc/krb5.conf:
    [libdefaults]
       default_keytab_name = FILE:/etc/krb5.keytab
  o Support for maintaining individual printer names stored separately
    from the printer's sharename.
  o Support for maintaining user password history.
  o Support for honoring the logon times for user in a Samba domain.
  * Reintroduce 'force unknown acl user' parameter.  When getting a security
    descriptor for a file, if the owner sid is not known, the owner uid is
    set to the current uid. Same for group sid.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.27 2004/05/13 06:44:56 xtraeme Exp $
d3 33
a35 11
--- Makefile.in.orig	2004-05-13 07:57:15.000000000 +0200
+++ Makefile.in	2004-05-13 07:58:12.000000000 +0200
@@@@ -58,7 +58,7 @@@@
 BINDIR = @@bindir@@
 # sbindir is mapped to bindir when compiling SAMBA in 2.0.x compatibility mode.
 SBINDIR = @@sbindir@@
-LIBDIR = @@libdir@@
+LIBDIR = @@libdir@@/samba
 VFSLIBDIR = $(LIBDIR)/vfs
 PDBLIBDIR = $(LIBDIR)/pdb
 RPCLIBDIR = $(LIBDIR)/rpc
@


1.27
log
@Update net/samba to 3.0.4.

Common bugs fixed in Samba 3.0.3 include:

  o Crash bugs and change notify issues in Samba's printing code.
  o Honoring secondary group membership on domain member servers.
  o TDB scalability issue surrounding the TDB_CLEAR_IF_FIRST flag.
  o Substitution errors for %[UuGg] in smb.conf.
  o winbindd crashes when using ADS security mode.
  o SMB signing errors.
  o Delays in winbindd startup caused by unnecessary
    connections to trusted domain controllers.
  o Various small memory leaks.
  o Winbindd failing due to expired Kerberos tickets.

New features introduced in Samba 3.0.3 include:

  o Improved support for i18n character sets.
  o Support for account lockout policy based on
    bad password attempts.
  o Improved support for long password changes (>14
    characters) and strong password enforcement.
  o Support for Windows aliases (i.e. nested groups).
  o Experimental support for storing DOS attribute on files
    and folders in Extended Attributes.
  o Support for local nested groups via winbindd.
  o Specifying options to be passed directly to the CUPS libraries.

And more... please review "WHATSNEW.txt".
@
text
@d1 1
a1 1
$NetBSD$
@


1.26
log
@Update net/samba to 3.0.2a.  Fixes from version 3.0.1 include:

  o Joining a Samba domain from Pre-SP2 Windows 2000 clients.
  o Logging onto a Samba domain from Windows XP clients.
  o Problems with the %U and %u smb.conf variables in relation to
    Windows 9x/ME clients.
  o Kerberos failures due to an invalid in memory keytab detection
    test.
  o Updates to the ntlm_auth tool.
  o Fixes for various SMB signing errors.
  o Better separation of WINS and DNS queries for domain controllers.
  o Issues with nss_winbind FreeBSD and Solaris.
  o Several crash bugs in smbd and winbindd.
  o Output formatting fixes for smbclient for better compatibility
    with scripts based on the 2.2 version.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.25 2004/01/11 02:26:31 jlam Exp $
d3 11
a13 11
--- configure.in.orig	Sun Dec 14 22:36:25 2003
+++ configure.in
@@@@ -1642,7 +1642,7 @@@@ dnl Try to find iconv(3)
     jm_ICONV($i)
 
     if test "$ICONV_FOUND" = yes; then
-	LDFLAGS=$save_LDFLAG
+	LDFLAGS=$save_LDFLAGS
         LIB_ADD_DIR(LDFLAGS, "$i/lib")
         CFLAGS_ADD_DIR(CPPFLAGS, "$i/include")
         LIBS="$save_LIBS"
@


1.25
log
@Update net/samba to 3.0.1.  Major changes from version 2.2.8anb6 include:

  * Active Directory support.  Samba is able to join a ADS realm as
    a member server and authenticate using LDAP/Kerberos.
  * Unicode support.
  * New, more flexible authentication (passdb) system.
  * A new "net" command that is similar to the "net" command in Windows.
  * Samba now negotiates NT-style status32 codes on the wire, which
    greatly improves error handling.
  * Better Windows 2K/2K3/XP printing support.
  * Loadable module support for passdb backends and character sets.
  * More performant winbindd.
  * Support for migrating from a Windows NT4 domain to a Samba domain
    and maintaining user, group, and domain SIDs.
  * Support for establishing trust relationships with Windows NT4 DCs.
  * Initial support for a distributed Winbind architecture using an
    LDAP directory for storing SID-to-uid/gid mappings.
  * Major updates to the Samba documentation tree.
  * Full support for client and server SMB signing to ensure
    compatibility with default Windows 2K3 security settings.
  * Improvement of ACL mapping features.
@
text
@d1 1
a1 1
$NetBSD$
@


1.24
log
@Updated samba to 2.2.8

****************************************
* IMPORTANT: Security bugfix for Samba *
****************************************

The SuSE security audit team, in particular Sebastian Krahmer
<krahmer@@suse.de>, has found a flaw in the Samba main smbd code which
could allow an external attacker to remotely and anonymously gain
Super User (root) privileges on a server running a Samba server.

This flaw exists in previous versions of Samba from 2.0.x to 2.2.7a
inclusive.  This is a serious problem and all sites should either
upgrade to Samba 2.2.8 immediately or prohibit access to TCP ports 139
and 445. Advice created by Andrew Tridgell, the leader of the Samba
Team, on how to protect an unpatched Samba server is given at the end
of this section.

The SMB/CIFS protocol implemented by Samba is vulnerable to many
attacks, even without specific security holes.  The TCP ports 139 and
the new port 445 (used by Win2k and the Samba 3.0 alpha code in
particular) should never be exposed to untrusted networks.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.23 2002/12/13 08:37:10 martti Exp $
d3 4
a6 5
--- configure.in.orig	Fri Feb 28 15:56:18 2003
+++ configure.in	Sun Mar 16 09:01:24 2003
@@@@ -2033,6 +2033,10 @@@@
 # we can't build a pam module if we don't have pam.
 AC_CHECK_LIB(pam, pam_get_data, [AC_DEFINE(HAVE_LIBPAM)])
d8 6
a13 7
+dnl Checks for libraries.
+AC_CHECK_LIB(c, __libc_sched_setscheduler, PAM_NEEDS_LIBC=, PAM_NEEDS_LIBC=-lc)
+AC_SUBST(PAM_NEEDS_LIBC)
+
 #################################################
 # check for pam_smbpass support
 AC_MSG_CHECKING(whether to use pam_smbpass)
@


1.23
log
@Updated samba to 2.2.7a

1)  Fix for smbclient reporting negative file sizes on dir command
    and negative statistics being reported when using put or get
    on large files.
2)  Fix bug in determination of allocation size
3)  Fix 64bit size problems which prevented copying of files larger
    than 2 GBytes.
4)  Fix for xcopy /s problem with old DOS clients not sending correct
    attributes on subsequent SMBsearch calls.
5)  Fix bug in call to standard_sub_advanced giving a 0 length. This
    fixes the string overflow in string_sub errors.
6)  Correctly handle querygroup rpcclient command
7)  fix broken incremental tar in smbtar command
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.22 2002/10/18 11:50:28 martti Exp $
d3 3
a5 3
--- configure.in.orig	Tue Dec 10 02:01:00 2002
+++ configure.in	Fri Dec 13 08:33:10 2002
@@@@ -2007,6 +2007,10 @@@@
@


1.23.2.1
log
@Pullup rev 1.24 (requested by bouyer in ticket #1220)
        Updated samba to 2.2.8

        ****************************************
        * IMPORTANT: Security bugfix for Samba *
        ****************************************

        The SuSE security audit team, in particular Sebastian Krahmer
        <krahmer@@suse.de>, has found a flaw in the Samba main smbd code which
        could allow an external attacker to remotely and anonymously gain
        Super User (root) privileges on a server running a Samba server.

        This flaw exists in previous versions of Samba from 2.0.x to 2.2.7a
        inclusive.  This is a serious problem and all sites should either
        upgrade to Samba 2.2.8 immediately or prohibit access to TCP ports 139
        and 445. Advice created by Andrew Tridgell, the leader of the Samba
        Team, on how to protect an unpatched Samba server is given at the end
        of this section.

        The SMB/CIFS protocol implemented by Samba is vulnerable to many
        attacks, even without specific security holes.  The TCP ports 139 and
        the new port 445 (used by Win2k and the Samba 3.0 alpha code in
        particular) should never be exposed to untrusted networks.
@
text
@d1 1
a1 1
$NetBSD$
d3 3
a5 3
--- configure.in.orig	Fri Feb 28 15:56:18 2003
+++ configure.in	Sun Mar 16 09:01:24 2003
@@@@ -2033,6 +2033,10 @@@@
@


1.22
log
@Updated samba to 2.2.6

* Fixes for MS-RPC printing issues affecting Windows 2000 clients
* New support for smb.conf generation in SWAT
* Inclusion of several performance enhancements
* Fixes for several file locking bugs and returned status codes
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.21 2002/08/25 21:50:13 jlam Exp $
d3 3
a5 3
--- configure.in.orig	Wed Oct  9 22:27:21 2002
+++ configure.in	Fri Oct 18 13:01:18 2002
@@@@ -1991,6 +1991,10 @@@@
@


1.21
log
@Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.18.2.2 2002/08/25 21:20:32 jlam Exp $
d3 3
a5 3
--- configure.in.orig	Sun Jul 28 18:13:04 2002
+++ configure.in
@@@@ -1976,6 +1976,10 @@@@ AC_ARG_WITH(pam,
@


1.20
log
@Factor out common parts of samba and winbind into net/samba/Makefile.common
and merge their patch collections.  These two packages are built from the
same source tree, and updates to the main distfile should be shared by
both packages.
@
text
@d1 1
a1 1
$NetBSD$
@


1.19
log
@Update net/samba to version 2.2.5.  The quick summary of changes from
version 2.2.4nb1 is that there are the usual minor bug fixes, plus some
important ones:

        * fix printing with Win2K/XP clients
        * fixes related to using LDAP for the SAM
        * fixes related to changing passwords

Pkgsrc changes:

	* Fetch the .tar.bz2 file -- it's smaller.
	* Use smb.conf.default as the sample config file and get rid of
	  the homegrown files/smb.conf.sample.  smb.conf.default is more
	  informative and is a better resource.
	* Remove irrelevant examples.
	* Move convert_smbpasswd script to the examples/samba/misc
	  directory.  It's pretty much outlived it's usefulness at this
	  point of the Samba release cycle.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.18 2002/05/05 16:57:11 taca Exp $
d3 1
a3 1
--- configure.in.orig	Fri May  3 10:02:46 2002
d5 3
a7 18
@@@@ -13,15 +13,15 @@@@
     codepagedir="\$(DATADIR)/samba/codepages"
     configdir="${sysconfdir}/samba"
     lockdir="\${VARDIR}/cache/samba"
-    piddir="\$(VARDIR)/run/samba"
+    piddir="\$(VARDIR)/run"
     logfilebase="\${VARDIR}/log/samba"
     privatedir="\${CONFIGDIR}/private"
     swatdir="\${DATADIR}/samba/swat",
     codepagedir="\$(LIBDIR)/codepages"
     configdir="\$(LIBDIR)"
-    logfilebase="\$(VARDIR)"
+    logfilebase="\$(VARDIR)/log"
     lockdir="\${VARDIR}/locks"
-    piddir="\$(VARDIR)/locks"
+    piddir="\$(VARDIR)/run"
     privatedir="\${prefix}/private"
     swatdir="\${prefix}/swat")
d9 7
@


1.18
log
@update samba package to 2.2.4.


              WHAT'S NEW IN Samba 2.2.4  - 2nd May 2002
              =========================================

This is the latest stable release of Samba. This is the version that all
production Samba servers should be running for all current bug-fixes.

There have been several fixes and internal enhancements which include:

 * More/better SPOOLSS printing functionality for Windows
   NT/2k/XP clients.
 * Several fixes relating to serving PC database files such
   as (Access and FoxPro) from a Samba file share.
 * Several improves in Samba's VFS layer which can be seen
   in the inclusion of a "Recycle Bin" vfs module.  See
   examples/VFS/README for more details on this.
 * Addition of a tool (tdbbackup) for backup/restore of Samba's
   tdb's
 * Continued improvements to winbind for greater scalability
   and stability
 * Several fixes related to Samba's MS-DFS support
 * Rpcclient's various printer commands now work (again)


New/Changed parameters in 2.2.4
--------------------------------

For more information on these parameters, see the man pages for
smb.conf(5).

Added/changed parameters
------------------------

* csc policy
* inherit acls
* nt status support
* lock spin count
* lock spin time
* pid directory
* winbind use default domain


Depreciated parameters
----------------------

The following parameters have been marked as depreciated
and will be removed in Samba 3.0

* postscript
* printer driver
* printer driver file
* printer driver location


Removed Parameters
------------------

  none


Changes in 2.2.4
----------------

See the cvs log for SAMBA_2_2 for more details

1)  added -c option to smbpasswd
2)  reworked smbpasswd internal command line option parsing
3)  small various bug fixes to experimental pdb_tdb.c
4)  Enforce spoolss RPCs based on the access granted at PrinterOpen()
5)  Added missing access checks to [add/delete/set]form
6)  Compile fixes for pam_smbpass
7)  fix smbd crash when netbios session request fails from
    spoolss_connect_to_client().
8)  fixed logic bug that prevent SetPrinter() from storing devmode
9)  Removed extra get_printer_snum() calls from set_printer_hnd_name()
10) fix joining domain on big endian machine when using -U to smbpasswd
11) allow command line arg to override smb.conf log level
12) continue to retry to register 1b name with wins server if there is an old IP there
13) fix smbclient print crash bug
14) 9x pnp fix when the config file and driver file are different
15) force testparm to print the correct value for log level
16) fix swat to show full log level info
17) fix server GetPrinterData() fields to be more sensible
18) fix logic error in SetPrinterDataEx()
19) Only set smb_read_error if not already set
20) Fix string returns that require unicode
21) Merge of printing performance fixes from appliance
22) lpq parsing fixes
23) Back port tridge's xcopy /o fix from HEAD
24) Fix the printer change notify code (unfinished)
25) Patch for Domain users not showing up
26) Fixed SetPrinterData(magic key) to support zero length DEVMODE
27) Ensure that all methods of looking up and connecting to DC's work
    using identical logic.
28) Merge in the mutex code to stop multiple domain logon failure
29) Ignore 0/0 lock
30) Fix winbindd to respect command line debuglevel as nmbd/smbd
31) Update with tdbbackup from HEAD
32) Fix for typo on solaris nss
33) Merge in the locking changes from HEAD
34) Added POSIX ACL layer into the vfs
35) Fix the returning of domain enum
36) Fix the generation of the MACHINE.SID file into the secrets.tdb.
37) Enable test for -rdynamic when building binaries
38) Remove the "stat open" code - make it inline
39) Fix the mp3 rename bug
40) Fix for Explorer DFS problems on older Windows 9X machines
41) implement OpenPrinter() opnum == 0x01
42) Matched W2K *insane* open semantics....
43) small fix that will prevent the "failed to marshall
    R_NET_SAMLOGON" message in the logs
42) don't do checking of local passdb in smbpasswd if using -r option
43) fix "smbpasswd -j DOMAIN -r * -U Admin%XXXX" so that it doesn't
    try to connect to a server named '*'
44) merge rpcclient code from HEAD
45) Ensure MACHINE.SID update done before child spawns
46) Fix the bad path errors for mkdir so mkdir \a\b\c\d works
47) Removed --with-vfs - always built if available
48) Fixed psec for 2.2
49) Fixed the handle leak in the connection management code
50) fix disable spoolss after the switch to nt status codes
51) Added Shirish's client side caching policy change
52) Honor the specversion when parsing the the DEVICEMODE
53) fix parsing bug when DEVICEMODE's private data does not end
    on a 4 byte boundary
54) do not idle an smbd when there is an open pipe
55) when a new driver is added to a Samba server, cycle through
    all printers and bump the change_id for each one bound to the driver
56) allow smbclient to work with a FIFO as well (needed for KDE
    ioslave)
57) various updates to pdb_nisplus.c
58) many small documentation updates
59) removed many compiler warnings



Known Bugs
----------

* Under certain conditions when serving the MS Access 2000
  executable file and an Access database from a Samba share,
  it is possible to experience data corruption.  This pug does
  does occur when the database is served from a Samba file share
  but the Access *.exe is stored on the client's local file system.
  The exact reason for this bug is unknown at this time.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.17 2002/02/05 00:36:26 taca Exp $
@


1.18.2.1
log
@Merge from pkgsrc-current to buildlink2 branch.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.18 2002/05/05 16:57:11 taca Exp $
@


1.18.2.2
log
@Merge changes in the main trunk into the buildlink2 branch for those
packages that have been converted to USE_BUILDLINK2.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.20 2002/07/30 23:05:13 jlam Exp $
d3 1
a3 1
--- configure.in.orig	Sun Jul 28 18:13:04 2002
d5 18
a22 3
@@@@ -1976,6 +1976,10 @@@@ AC_ARG_WITH(pam,
 # we can't build a pam module if we don't have pam.
 AC_CHECK_LIB(pam, pam_get_data, [AC_DEFINE(HAVE_LIBPAM)])
a23 7
+dnl Checks for libraries.
+AC_CHECK_LIB(c, __libc_sched_setscheduler, PAM_NEEDS_LIBC=, PAM_NEEDS_LIBC=-lc)
+AC_SUBST(PAM_NEEDS_LIBC)
+
 #################################################
 # check for pam_smbpass support
 AC_MSG_CHECKING(whether to use pam_smbpass)
@


1.17
log
@(1) Change Samba's "lockdir" from /var/run/samba to /var/db/samba.
(2) Add "piddir" as /var/run and "pidfile dir" and "pidfile directory"
    statement for smb.conf.
(3) Some fix for password synchronization but it isn't tested much and
    it is almost useless under "encrypt passwords = yes" environment.

Changes for INSTALL and part of Makefile are provided by
"Johnny C. Lam" <jlam@@netbsd.org> and (2) and (3) are got
from FreeBSD ports.

Bump revision to 1; samba-2.2.3nb1 now.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- configure.in.orig	Sun Feb  3 09:46:35 2002
d5 1
a5 1
@@@@ -13,13 +13,15 @@@@
d9 1
a15 1
     lockdir="\$(VARDIR)/locks"
a16 1
+    piddir="\${VARDIR}/run"
d18 3
a23 31
@@@@ -56,6 +58,22 @@@@
   esac])
 
 #################################################
+# set pid directory location
+AC_ARG_WITH(piddir,
+[  --with-piddir=DIR      Where to put lock files (\${VARDIR}/run)],
+[ case "$withval" in
+  yes|no)
+  #
+  # Just in case anybody calls it without argument
+  #
+    AC_MSG_WARN([--with-piddir called without argument - will use default])
+  ;;
+  * )
+    piddir="$withval"
+    ;;
+  esac])
+
+#################################################
 # set SWAT directory location
 AC_ARG_WITH(swatdir,
 [  --with-swatdir=DIR      Where to put SWAT files ($ac_default_prefix/swat)],
@@@@ -123,6 +141,7 @@@@
 AC_SUBST(configdir)
 AC_SUBST(lockdir)
 AC_SUBST(logfilebase)
+AC_SUBST(piddir)
 AC_SUBST(privatedir)
 AC_SUBST(swatdir)
 AC_SUBST(bindir)
@


1.16
log
@Convert to use buildlink.mk files and remove unnecessary config.cache
entry to prevent finding libncurses and unnecessary patches to configure
script to handle SSL location and probing libcups.  Also use FILES_SUBST
instead of repeating a sed script throughout the Makefile.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.15 2001/05/22 21:49:29 jlam Exp $
d3 18
a20 5
--- configure.in.orig	Tue Apr 17 01:44:30 2001
+++ configure.in	Tue May 22 15:58:59 2001
@@@@ -392,9 +392,6 @@@@
 AC_CHECK_TYPE(ssize_t, int)
 AC_CHECK_TYPE(wchar_t, unsigned short)
d22 2
a23 8
-# 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, dlopen, [LIBS="$LIBS -ldl";
 	AC_DEFINE(HAVE_LIBDL)])
@@@@ -1460,6 +1457,24 @@@@
 fi
d25 4
a28 7
 
+################################################
+# check for CUPS support
+AC_MSG_CHECKING(whether to use CUPS)
+AC_ARG_WITH(cups,
+[  --with-cups    Include CUPS support
+  --without-cups Don't include CUPS support (default)],
d30 8
a37 3
+  yes)
+    AC_MSG_RESULT(yes)
+    AC_CHECK_LIB(cups, httpConnect)
d39 1
a39 6
+  *)
+    AC_MSG_RESULT(no)
+    ;;
+  esac ],
+  AC_MSG_RESULT(no)
+)
d41 12
a52 25
 #################################################
 # check for smbwrapper support
 AC_MSG_CHECKING(whether to use smbwrapper)
@@@@ -1724,6 +1739,9 @@@@
 	  LIBS="-lssl -lcrypto $LIBS"
 	  LDFLAGS="=L/usr/local/ssl/lib $LDFLAGS"
 	;;
+	/usr)
+	  LIBS="-lssl -lcrypto $LIBS"
+	;;
         * )
           CFLAGS="-I${withval}/include $CFLAGS"
 	  LIBS="-lssl -lcrypto $LIBS"
@@@@ -1738,11 +1756,6 @@@@
 	LDFLAGS="-L/usr/local/ssl/lib $LDFLAGS"
 
     fi
-
-    if test ! -d ${withval}; then
-      echo "configure: error: called with --with-ssl, but ssl base directory ${withval} does not exist or is not a directory. Aborting config" 1>&2
-      exit 1
-    fi 
 
     CFLAGS="-DHAVE_CRYPT_DECL $CFLAGS"  # Damn, SSLeay defines its own
 
@


1.15
log
@Use devel/readline/Makefile.readline for GNU readline support and note why
GNU readline is required.  Clean up how to pass location of OpenSSL headers
to the configure script.
@
text
@d1 1
a1 1
$NetBSD$
@


1.14
log
@Update samba to 2.2.0.  Changes from version 2.0.9 include:

* Integration between Windows oplocks and NFS file opens (IRIX and Linux
  2.4 kernel only). This gives complete data and locking integrity between
  Windows and UNIX file access to the same data files.

* Ability to act as an authentication source for Windows 2000 clients as
  well as for NT4.x clients.

* Integration with the winbind daemon that provides a single
  sign on facility for UNIX servers in Windows 2000/NT4 networks
  driven by a Windows 2000/NT4 PDC.

* Support for native Windows 2000/NT4 printing RPCs. This includes
  support for automatic printer driver download.

* Support for server supported Access Control Lists (ACLs).

* On PAM (Pluggable Authentication Module) based systems - better debugging
  messages and encrypted password users now have access control verified via
  PAM - Note: Authentication still uses the encrypted password database.

* Rewritten internal locking semantics for more robustness.
  This release supports full 64 bit locking semantics on all
  (even 32 bit) platforms. SMB locks are mapped onto POSIX
  locks (32 bit or 64 bit) as the underlying system allows.

* Conversion of various internal flat data structures to use
  database records for increased performance and
  flexibility.

* Support for acting as a MS-DFS (Distributed File System) server.

* Support for manipulating Samba shares using Windows client tools
  (server manager). Per share security can be set using these tools
  and Samba will obey the access restrictions applied.

* Samba profiling support

* Compile time option for enabling a (Virtual file system) VFS layer
  to allow non-disk resources to be exported as Windows filesystems
  (such as databases etc.).
@
text
@d4 1
a4 1
+++ configure.in
d15 1
a15 2
@@@@ -1459,6 +1456,24 @@@@
     AC_DEFINE(BROKEN_NISPLUS_INCLUDE_FILES)
d18 1
a18 1
+
d36 1
a36 1
 
d39 23
@


1.13
log
@Update samba to 2.0.9:

Samba 2.0.9 is a security bugfix release which correctly fixes the problem
2.0.8 was supposed to address.  (A bug in the handling of temporary files
that allowed local users to destroy data on local devices).
@
text
@d3 34
a36 14
--- Makefile.in.orig	Thu Mar 16 22:57:08 2000
+++ Makefile.in
@@@@ -25,10 +25,12 @@@@
 BINDIR = @@bindir@@
 # we don't use sbindir because we want full compatibility with
 # the previous releases of Samba
-SBINDIR = @@bindir@@
+SBINDIR = @@sbindir@@
 LIBDIR = @@libdir@@
 VARDIR = @@localstatedir@@
 MANDIR = @@mandir@@
+ETCDIR?= $(BASEDIR)/etc
+LOGDIR?= $(BASEDIR)/log
 SAMBABOOK = @@sambabook@@
d38 2
a39 50
 # The permissions to give the executables
@@@@ -37,12 +39,12 @@@@
 # 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))
-SMBLOGFILE = $(VARDIR)/log.smb
-NMBLOGFILE = $(VARDIR)/log.nmb
-CONFIGFILE = $(LIBDIR)/smb.conf
-LMHOSTSFILE = $(LIBDIR)/lmhosts
-DRIVERFILE = $(LIBDIR)/printers.def
-PASSWD_PROGRAM = /bin/passwd
+SMBLOGFILE = $(LOGDIR)/log.smb
+NMBLOGFILE = $(LOGDIR)/log.nmb
+CONFIGFILE = $(ETCDIR)/smb.conf
+LMHOSTSFILE = $(ETCDIR)/lmhosts
+DRIVERFILE = $(ETCDIR)/printers.def
+PASSWD_PROGRAM = /usr/bin/passwd
 # This is where smbpasswd et al go
 PRIVATEDIR = @@privatedir@@
 
@@@@ -463,14 +465,14 @@@@
 
 installdirs:
 	$(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) \
-	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR)
+	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(ETCDIR) $(LOGDIR) $(CODEPAGEDIR)
 
 installservers: all installdirs
-	@@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
+	@@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
 
 installbin: all installdirs
-	@@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
-	@@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
+	@@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
+	@@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
 
 installscripts: installdirs
 	@@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
@@@@ -495,8 +497,8 @@@@
 	@@$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir)
 
 uninstallbin:
-	@@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
-	@@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
+	@@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
+	@@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
 
 uninstallscripts:
 	@@$(SHELL) $(srcdir)/script/uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
@


1.12
log
@Update "samba" package to version 2.0.8:
 Samba 2.0.8 is a security bugfix release. Previous versions of Samba
 had a bug with the handling of temporary files that allows local users
 to destroy data on local devices. This bug was discovered during a
 routine security audit by Caldera. While no exploitation of this bug
 is known to have occurred it is fairly easy to exploit so sites with
 untrusted local users should take the threat seriously.
Unfortunately we lose japanese language support by this update.
@
text
@d3 2
a4 2
--- Makefile.in.orig	Thu Mar 16 23:57:08 2000
+++ Makefile.in	Wed Apr 18 14:29:22 2001
@


1.11
log
@Merged japanese/samba package to net/samba, as per discussion of
Hubert Feyrer and Manuel Bouyer.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1.1.1 2000/08/30 17:29:44 kei Exp $
d3 3
a5 3
--- Makefile.in.orig	Thu Jun  8 13:31:59 2000
+++ Makefile.in	Sun Sep  3 06:23:06 2000
@@@@ -26,10 +26,12 @@@@
d19 1
a19 1
@@@@ -38,12 +40,12 @@@@
d38 1
a38 1
@@@@ -470,14 +472,14 @@@@
d42 2
a43 2
-	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR) ${SWATDIR} ${SAMBABOOK}
+	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(ETCDIR) $(LOGDIR) $(CODEPAGEDIR) ${SWATDIR} ${SAMBABOOK}
d57 1
a57 1
@@@@ -502,8 +504,8 @@@@
@


1.10
log
@Updated samba to 2.0.7.  Major changes from version 2.0.6 are below.  A
complete list of changes can be found at http://www.samba.org/.

New Documentation in 2.0.7
--------------------------

O'Reilly and Associates have donated their book "Using Samba"
to the Samba community to be updated in a collaberative way
along with the Samba software. Starting with this release the
html of "Using Samba" will be distributed with the Samba software
as the online documentation for Samba. Bug fixes for the book
are encouraged as is new material. Please help us make this
documentation the best it can be for Samba !

Windows 2000 Issues
-------------------

This version of Samba has been tested with Windows 2000 and
the five known incompatibilities with Windows 2000 have been
fixed. See the "Changes in 2.0.7" list below for details.

New/Changed parameters in 2.0.7
-------------------------------

There are 5 new parameters in the smb.conf file.

utmp
utmp dir
utmp hostname
utmp consolidate
wtmp directory

These parameters are only available if the "--with-utmp"
option was selected at configure time. The yes/no option "utmp"
specifies whether utmp records should be recorded on user
logon/logoff. It defaults to "no". The "utmp dir" and "wtmp dir"
are string parameters specifying pathnames to the directories containing
the utmp/wtmp file databases. See the smb.conf man page for more details.

inherit permissions

This boolean parameter causes newly created files and directories
to inherit their initial permissions from their parent directory.
This can be very useful in propagating such things as the set-group
bit in directory heirarchies. See the smb.conf man page for more
details.

write cache size

This integer parameter specifies (in bytes) the size of a user level
per-file write cache that smbd will create for an oplocked file. This
can improve performance significantly for writing files by causing
writes to be done in large chunk sizes. If this parameter is set (it
defaults to zero which means no write cache) to the stripe size of
a raid volume then it will cause writes to be much more efficient.
Up to 10 write caches can be active simultaneously per smbd (allocated
for the first 10 oplocked file opens). All normal warnings about the
dangers of user level caching of data apply. See the smb.conf man page
for more details.

source environment

This pathname parameter causes Samba to read a list of environment
variables from a named file on startup. This can be useful in setting
up Samba in a clustered environment. See the smb.conf man page for more
details.

Ability to delete users added
-----------------------------

SWAT and smbpasswd can now delete users from the Samba smbpasswd file.
See the man page for smbpasswd for details.

Roving profile behavior finalized
---------------------------------

The change in behavior with roving profiles (using the "logon home"
parameter instead of the "logon path" parameter) introduced in 2.0.6
has been discovered to be consistant with the way Windows NT behaves,
and has been left as the default action. Please see the additional
notes in the "logon home" parameter description in the smb.conf man
page for more details.
@
text
@d1 1
a1 1
$NetBSD$
d3 3
a5 3
--- Makefile.in.orig	Tue Apr 25 19:06:11 2000
+++ Makefile.in	Fri Apr 28 16:26:52 2000
@@@@ -25,10 +25,12 @@@@
d19 1
a19 1
@@@@ -37,12 +39,12 @@@@
d38 1
a38 1
@@@@ -463,14 +465,14 @@@@
d42 2
a43 2
-	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR)
+	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(ETCDIR) $(LOGDIR) $(CODEPAGEDIR)
d57 1
a57 1
@@@@ -495,8 +497,8 @@@@
@


1.9
log
@* Update samba to 2.0.6.
* It turns out -lreadline also needs -ltermcap to link under ELF.  I had
  to patch the GNU configure script to make it correctly detect readline.
  Are we going to have to do this to all the packages which depend upon
  readline?

New/Changed parameters in 2.0.6
-------------------------------

There are 6 new parameters in the smb.conf file.

wins hook

This parameter allows an external program to be called
on all changes to a Samba WINS database, allowing dynamic
DNS updates.

debug hires timestamp
debug pid
debug uid

The above 3 parameters provide greater debug information.

preexec close
rootpreexec close

The above 2 parameters control the action taken on the
success or failure of a 'preexec' script.

There is also one removed parameter.

mangle locks

The addition of these new parameters and the removal of the old
is described in more detail in the smb.conf man page,

When using "security=domain" the "password server"
parameter can now be set to the string "*', which will
cause Samba to search for Domain controllers in the
same way that Windows NT does. See the smb.conf man
page for more details.

The "interfaces" parameter in smb.conf can now be dynamically
detected on startup and can also now take an interface name
such as eth0. See the smb.conf man page for the details
on the new features of the "interfaces" parameter.
nmbd has been enhanced to use this feature.

The syntax for the Linux-specific smbmount command has been changed
and is now compatible with the standard mount command. See the modified
smbmount man page for details.

Support for the UNIX CUPS printer standard has been added.
See www.cups.org for details. Thanks to the folks at Easy Software
Products for this code. Set the printcap name to "cups" to
enable this. See the smb.conf man page for details.

Changes in 2.0.6
-----------------

1). 64-bit locking removed from Linux autoconf build. This fixes
several Linux specific locking issues.
2). Crash bug fix in smbclient recursive processing. Fix from
E. Jay Berkenbilt (ejb@@ql.org).
3). "history" command added to smbclient if readline available.
4). smbtar - updates files and directory message on restore.
5). smbmnt - 'u', 'g', 'r', 'f', 'd' options added by Andrew. See
man page for details.
6). smbmount updated to be useable by autofs on Linux. See the
samba/examples/autofs/README file for details.
7). Bug fixed where TCP_NODELAY was not being used by default in smbd.
8). Many oplock fixes. Samba now waits 30 seconds, not 45. Also
smbd no longer aborts on client break failure, but logs a message
and continues. This is what NT does. This should fix many "oplock
break" message problems people have been having.
9). New code from Andrew to dynamically detect interfaces. nmbd will
now attempt to dynamically detect interface changes and register names
as an interface goes "up".
10). Win95 ioctl for print jobs added by Matt.
11). Mapping for ISO8859-1 extended for codepage 437 and 850.
12). Code Page 737 -> ISO-8859-7 (Greek-Hellenic) mapping added.
13). Character strings now correctly converted from UNIX character set
format to DOS codepage when read from smb.conf or external passwd or
group files. Samba is now much more careful about what format external
strings should be converted to/from.
14). snprintf crash fix for IRIX 6.2 and below.
15). Increased timestamp debug fixes (adds milliseconds and uid/pid if
requested).
16). Optimisation for wildcard exact match requests.
17). Win95 wildcard semantics fix - unused code removed.
18). 'mangle locks' parameter removed. This now done automatically.
19). setXid() routines re-written to provide asserts and also to fix
AIX versions prior to 4.1.x.
20). MSG_WAITALL optimisation removed due to bugs in FreeBSD.
21). Length fix when writing UNICODE string.
22). oplock processing added to libsmb client code.
23). Added more client error message strings.
24). Fix bug with connecting to encrypted server when non-encrypted
password given.
25). In security=domain, password server extended to search for DC's
if parameter = '*'.
26). "root did not create samaphore" bug fixed.
27). random generator initialized early to prevent icons not showing
up in Win9x.
28). Logging fix after SIGHUP.
29). WINS hook external call added when nmbd is a WINS server.
30). Support for CUPS printer protocol added by Michael Sweet.
31). Support for NIS+ backend password database updates.
32). Handle dashes in print job id's. Fix from Dom.Mitchell@@palmerharvey.co.uk
33). Race condition in UNIX password sync on some platforms fixed by Matt.
34). Dirptr leak from Win98 fixed.
35). Logic bug in handling of level II oplocks fixed.
36). smbd crash bug fix when opening directories.
37). Paranoia oplock fix from Charles Hoch (hoch@@exemplary.com)
38). Fix Win2k problem where DCE/RPC is done on SMBwrite as well as SMBwriteX.
39). Fix Win95 redirector alignment bug that caused oplock break failures.
40). Preexec close code added.
41). Extra sanity checks in testparm code.
42). oplock tests added to smbtorture.
43). Tell SWAT user if logged in as root or not.
44). Solaris packaging fixes donated by VERITAS.
@
text
@d3 3
a5 3
--- Makefile.in.orig	Wed Nov 10 21:35:55 1999
+++ Makefile.in	Tue Nov 16 10:36:48 1999
@@@@ -25,10 +25,11 @@@@
d12 1
a12 1
-VARDIR = @@localstatedir@@
d16 1
d19 1
a19 2
 INSTALLPERMS = 0755
@@@@ -36,12 +37,12 @@@@
d38 10
a47 2
@@@@ -458,8 +459,8 @@@@
 	@@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
d57 1
a57 1
@@@@ -484,8 +485,8 @@@@
@


1.8
log
@Update to 2.0.5a. Supplied by mcmahill@@mtl.mit.edu with minor corrections by
me.
@
text
@d3 4
a6 3
--- Makefile.in.orig	Tue Jul 20 21:24:31 1999
+++ Makefile.in	Sun Aug  8 21:31:11 1999
@@@@ -26,8 +26,9 @@@@
d18 3
a20 1
@@@@ -37,10 +38,10 @@@@
d37 3
a39 1
@@@@ -443,6 +444,6 @@@@
d48 3
a50 1
@@@@ -469,6 +470,6 @@@@
d59 1
@


1.7
log
@Samba 1.9.18 is dead, upgrade to samba 2.0.2.
@
text
@d1 7
a7 9
$NetBSD: patch-aa,v 1.4 1999/02/11 17:11:33 bouyer Exp $
--- Makefile.in.orig	Sat Feb  6 22:51:43 1999
+++ Makefile.in	Thu Feb 11 14:29:47 1999
@@@@ -23,12 +23,11 @@@@
 
 BASEDIR= @@prefix@@
 BINDIR = @@bindir@@
-# we don't use sbindir because we want full compatibility with
-# the previous releases of Samba
d17 1
a17 3
 INSTALLPERMS = 0755
@@@@ -36,12 +35,12 @@@@
 # set these to where to find various files
d34 1
a34 3
 
@@@@ -430,8 +429,8 @@@@
 	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR)
d43 1
a43 3
 	@@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
@@@@ -456,8 +455,8 @@@@
 	@@$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir)
a51 1
 	@@$(SHELL) $(srcdir)/script/uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
@


1.6
log
@Update to samba-1.9.18p10.

While here clean up the package somewhat:
- Remove confusion about where the SAMBA_PRIVATE directory is.
- Don't gratitously create yet another world writeable directory.
- Don't use $PREFIX as the WEB_ROOT, use the htdocs directory from the
  Apache pkg instead.
- Enable use of netgroups, checking of disk quotas and the password
  changing feature.
- Use /var/run/samba for runtime status files.
- Always install the example startup file.
- Misc. minor modification for better maintainability.
@
text
@d1 14
a14 26
$NetBSD: patch-aa,v 1.5 1998/08/09 16:14:08 kim Exp $

--- Makefile.orig	Mon Jun  1 02:29:04 1998
+++ Makefile	Sun Aug  2 14:52:27 1998
@@@@ -5,11 +5,11 @@@@
 ###########################################################################
 
 # The base directory for all samba files
-BASEDIR = /usr/local/samba
+BASEDIR = $(PREFIX)
 
 # The base manpages directory to put the man pages in
 # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
-MANDIR = /usr/local/man
+MANDIR = $(PREFIX)/man
 
 # The directories to put things in. If you use multiple
 # architectures or share the samba binaries across NFS then
@@@@ -18,9 +18,11 @@@@
 #       normally only applies to nmbd and smbd
 #       SBINDIR implies a secure binary directory
 BINDIR = $(BASEDIR)/bin
-SBINDIR = $(BASEDIR)/bin
+SBINDIR = $(BASEDIR)/sbin
 LIBDIR = $(BASEDIR)/lib
-VARDIR = $(BASEDIR)/var
a16 1
+PRIVDIR?= $(BASEDIR)/private
d20 1
a20 1
@@@@ -45,17 +47,17 @@@@
d29 3
a31 2
+SMBLOGFILE = $(LOGDIR)/smb
+NMBLOGFILE = $(LOGDIR)/nmb
d35 17
a51 39
 SMB_PASSWD = $(BINDIR)/smbpasswd
-SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
+SMB_PASSWD_FILE = $(PRIVDIR)/smbpasswd
-WEB_ROOT = $(BASEDIR)
+WEB_ROOT = $(BASEDIR)/http/htdocs
 
 # the directory where lock files go
-LOCKDIR = $(VARDIR)/locks
+LOCKDIR?= $(VARDIR)/locks
 
 # The directory where code page definition files go
 CODEPAGEDIR = $(LIBDIR)/codepages
@@@@ -352,10 +354,10 @@@@
 # LIBSM =   
 
 
-# This is for NetBSD. Add -DNETBSD_1_0 if you are using 1.0
+# This is for NetBSD
 # contributed by noses@@oink.rhein.de
-# FLAGSM = -DNETBSD -DSHADOW_PWD
-# LIBSM = -lcrypt 
+FLAGSM = -DFAST_SHARE_MODES -DSHADOW_PWD -DNETGROUP -DALLOW_CHANGE_PASSWORD -DQUOTAS
+LIBSM = -lcrypt 
 
 # This is for NetBSD 1.3  
 # contributed by sean@@fuzzymagic.com  
@@@@ -824,8 +826,8 @@@@
 install: installbin installman installscripts installcp
 
 installbin: all
-	@@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
-	@@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
+	@@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
+	@@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
 
 installscripts:
 	@@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
@@@@ -847,8 +849,8 @@@@
 	@@$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir)
d54 4
a57 4
-	@@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
-	@@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
+	@@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(ETCDIR) $(LOGDIR) $(SPROGS)
+	@@$(SHELL) $(srcdir)uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(ETCDIR) $(LOGDIR) $(PROGS)
d60 1
a60 1
 	@@$(SHELL) $(srcdir)uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
@


1.5
log
@The password file for samba cannot generally be share between machines,
so place it in /etc/samba/private.  Other machine dependent files (e.g.
the printer defs) go now into /etc/samba by default.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.4 1998/08/07 11:10:53 agc Exp $
d28 1
a28 1
+LOGDIR = /var/log
d50 2
a51 1
 WEB_ROOT = $(BASEDIR)
d55 1
a55 1
+LOCKDIR = /var/spool/locks
d68 1
a68 1
+FLAGSM = -DFAST_SHARE_MODES
@


1.4
log
@Add NetBSD RCS Ids.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 2
--- Makefile.orig	Mon Jun  1 08:29:04 1998
+++ Makefile	Wed Jun 17 14:57:00 1998
d19 1
a19 1
@@@@ -18,9 +18,10 @@@@
d27 1
a27 1
+ETCDIR = $(BASEDIR)/etc
d29 1
d33 1
a33 1
@@@@ -45,17 +46,17 @@@@
d48 2
a49 1
 SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
d58 1
a58 1
@@@@ -352,10 +353,10 @@@@
d72 1
a72 1
@@@@ -824,8 +825,8 @@@@
d83 1
a83 1
@@@@ -847,8 +848,8 @@@@
@


1.3
log
@Update to 1.9.18p8.
@
text
@d1 2
@


1.2
log
@Update to version 1.9.18, from Ty Sarna (tsarna@@endicor.com).

This version unites the samba and the uncommitted samba-des packages,
as it includes a "castrated" DES implementation that is only usable as
a hash function.

Some very minor typos in the description file corrected by myself.
@
text
@d1 2
a2 4
$NetBSD$

--- Makefile.orig	Wed Jan  7 12:29:04 1998
+++ Makefile	Fri Jan  9 17:48:49 1998
d54 1
a54 1
@@@@ -333,10 +334,10 @@@@
d66 3
a68 3
 
 # This is for SEQUENT. 
@@@@ -795,8 +796,8 @@@@
d79 1
a79 1
@@@@ -818,8 +819,8 @@@@
@


1.1
log
@Initial revision
@
text
@d1 4
a4 2
--- Makefile.orig	Sat Sep 27 00:04:52 1997
+++ Makefile	Wed Oct 15 17:09:58 1997
d19 1
a19 1
@@@@ -18,9 +18,9 @@@@
d24 2
a25 1
-LIBDIR = $(BASEDIR)/lib
a26 1
+SBINDIR = $(BASEDIR)/sbin
d32 1
a32 1
@@@@ -45,13 +45,13 @@@@
d40 1
d45 4
d52 6
a57 1
+LOCKDIR = /var/spool/lock
d59 5
a63 7
 # set this to the default group you want your machine to appear in
 # for browsing. This can also be set in nmbd (see nmbd(8))
@@@@ -383,8 +383,8 @@@@
 # This is for FreeBSD
 # contributed by kuku@@acds.physik.rwth-aachen.de
 # NOTE: You may need to add -DBSD44 if you have password problems
-# FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
d65 1
a65 1
+FLAGSM = -DFreeBSD -DFAST_SHARE_MODES
d69 3
a71 3
 # This is for NEXTSTEP Release 2.X
@@@@ -684,8 +684,8 @@@@
 install: installbin installman installscripts
d81 11
@


1.1.1.1
log
@Initial import of samba, from FreeBSD, into the NetBSD packages
collection, thanks to Ty Sarna (tsarna@@endicor.com), and addresses the
first part of PR pkg/4746.

The Samba software suite is a collection of programs that implements
the SMB protocol for UNIX systems. 
@
text
@@