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

5 files changed, 27 insertions, 27 deletions

diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index cba80cf40cb..dc7654bf067 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.21 2002/08/25 21:50:13 jlam Exp $
+$NetBSD: patch-aa,v 1.22 2002/10/18 11:50:28 martti Exp $
 
---- configure.in.orig	Sun Jul 28 18:13:04 2002
-+++ configure.in
-@@ -1976,6 +1976,10 @@ AC_ARG_WITH(pam,
+--- configure.in.orig	Wed Oct  9 22:27:21 2002
++++ configure.in	Fri Oct 18 13:01:18 2002
+@@ -1991,6 +1991,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)])
  
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
index 4a87d72edbe..72474a7dcd0 100644
--- a/net/samba/patches/patch-ab
+++ b/net/samba/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.17 2002/08/25 21:50:13 jlam Exp $
+$NetBSD: patch-ab,v 1.18 2002/10/18 11:50:28 martti Exp $
 
---- configure.orig	Sun Jul 28 18:13:04 2002
-+++ configure
-@@ -11945,6 +11945,49 @@ else
+--- configure.orig	Wed Oct  9 22:27:21 2002
++++ configure	Fri Oct 18 13:01:38 2002
+@@ -11993,6 +11993,49 @@
  fi
  
  
@@ -52,7 +52,7 @@ $NetBSD: patch-ab,v 1.17 2002/08/25 21:50:13 jlam Exp $
  #################################################
  # check for pam_smbpass support
  echo $ac_n "checking whether to use pam_smbpass""... $ac_c" 1>&6
-@@ -13787,6 +13830,7 @@ s%@TERMLIBS@%$TERMLIBS%g
+@@ -14362,6 +14405,7 @@
  s%@TERMLDFLAGS@%$TERMLDFLAGS%g
  s%@ROFF@%$ROFF%g
  s%@DYNEXP@%$DYNEXP%g
diff --git a/net/samba/patches/patch-ac b/net/samba/patches/patch-ac
index 4f20421c0db..2b2cecd146a 100644
--- a/net/samba/patches/patch-ac
+++ b/net/samba/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.10 2002/02/04 08:09:03 martti Exp $
+$NetBSD: patch-ac,v 1.11 2002/10/18 11:50:28 martti Exp $
 
---- profile/profile.c.orig	Sun Feb  3 01:46:49 2002
-+++ profile/profile.c	Mon Feb  4 08:32:16 2002
-@@ -22,7 +22,7 @@
- 
+--- profile/profile.c.orig	Wed Oct  9 22:27:22 2002
++++ profile/profile.c	Fri Oct 18 13:02:32 2002
+@@ -23,7 +23,7 @@
  #include "includes.h"
  
+ #ifdef WITH_PROFILE
 -#define IPC_PERMS ((SHM_R | SHM_W) | (SHM_R>>3) | (SHM_R>>6))
 +#define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH)
- 
  static int shm_id;
  static BOOL read_only;
+ 
diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad
index 761f42324be..e1fe7174974 100644
--- a/net/samba/patches/patch-ad
+++ b/net/samba/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.10 2002/08/25 21:50:14 jlam Exp $
+$NetBSD: patch-ad,v 1.11 2002/10/18 11:50:28 martti Exp $
 
---- Makefile.in.orig	Sun Jul 28 18:13:04 2002
-+++ Makefile.in
-@@ -89,6 +89,8 @@ FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $
+--- Makefile.in.orig	Wed Oct  9 22:27:15 2002
++++ Makefile.in	Fri Oct 18 13:04:01 2002
+@@ -89,6 +89,8 @@
  FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
  FLAGS32  = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS)
  
@@ -11,16 +11,16 @@ $NetBSD: patch-ad,v 1.10 2002/08/25 21:50:14 jlam Exp $
  WINBIND_PROGS = @WINBIND_TARGETS@
  WINBIND_SPROGS = @WINBIND_STARGETS@
  WINBIND_PAM_PROGS = @WINBIND_PAM_TARGETS@
-@@ -650,7 +652,7 @@ bin/libsmbclient.a: $(LIBSMBCLIENT_PICOB
+@@ -654,7 +656,7 @@
  
  bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ) bin/.dummy
  	@echo Linking shared library $@
--	$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) -lc \
-+	$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) $(PAM_NEEDS_LIBC) \
+-	$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) $(LDAPLIBS) -lc \
++	$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) $(LDAPLIBS) $(PAM_NEEDS_LIBC) \
  		@SONAMEFLAG@`basename $@`
  
  nsswitch/libnss_wins.so: $(NSS_OBJ)
-@@ -674,7 +676,7 @@ nsswitch/libnss_winbind.so: $(WINBIND_NS
+@@ -678,7 +680,7 @@
  
  nsswitch/pam_winbind.so: $(PAM_WINBIND_OBJ)
  	@echo Linking $@
diff --git a/net/samba/patches/patch-al b/net/samba/patches/patch-al
index 3b0f1f65e70..b6d2e52f77e 100644
--- a/net/samba/patches/patch-al
+++ b/net/samba/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1 2002/02/05 00:36:27 taca Exp $
+$NetBSD: patch-al,v 1.2 2002/10/18 11:50:28 martti Exp $
 
---- include/local.h.orig	Sun Feb  3 09:46:39 2002
-+++ include/local.h
-@@ -170,10 +170,10 @@
+--- include/local.h.orig	Wed Oct  9 22:27:21 2002
++++ include/local.h	Fri Oct 18 13:04:36 2002
+@@ -169,10 +169,10 @@
   * Default passwd chat script.
   */