diff options
author | jlam <jlam@pkgsrc.org> | 2004-01-11 02:26:30 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2004-01-11 02:26:30 +0000 |
commit | 2a085db7871e837f8f806076692ec6ce1ce74acc (patch) | |
tree | 5ab4f601d568858d0210e45f72fb18565cb78dec /net/samba/patches | |
parent | 168ce375b92c0e86a7333a326c4fc766fe135c32 (diff) | |
download | pkgsrc-2a085db7871e837f8f806076692ec6ce1ce74acc.tar.gz |
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.
Diffstat (limited to 'net/samba/patches')
-rw-r--r-- | net/samba/patches/patch-aa | 24 | ||||
-rw-r--r-- | net/samba/patches/patch-ab | 69 | ||||
-rw-r--r-- | net/samba/patches/patch-ac | 24 | ||||
-rw-r--r-- | net/samba/patches/patch-ad | 82 | ||||
-rw-r--r-- | net/samba/patches/patch-ae | 13 | ||||
-rw-r--r-- | net/samba/patches/patch-af | 53 | ||||
-rw-r--r-- | net/samba/patches/patch-ag | 23 | ||||
-rw-r--r-- | net/samba/patches/patch-ah | 13 | ||||
-rw-r--r-- | net/samba/patches/patch-aj | 13 | ||||
-rw-r--r-- | net/samba/patches/patch-al | 17 | ||||
-rw-r--r-- | net/samba/patches/patch-ap | 57 | ||||
-rw-r--r-- | net/samba/patches/patch-aq | 56 | ||||
-rw-r--r-- | net/samba/patches/patch-ar | 16 | ||||
-rw-r--r-- | net/samba/patches/patch-as | 16 |
14 files changed, 154 insertions, 322 deletions
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa index d65c004c320..c21b9aaed4c 100644 --- a/net/samba/patches/patch-aa +++ b/net/samba/patches/patch-aa @@ -1,15 +1,13 @@ -$NetBSD: patch-aa,v 1.24 2003/03/16 07:57:45 martti Exp $ +$NetBSD: patch-aa,v 1.25 2004/01/11 02:26:31 jlam Exp $ ---- 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)]) +--- 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) -+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) + 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" diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab index f24ca257cd7..f42836282d1 100644 --- a/net/samba/patches/patch-ab +++ b/net/samba/patches/patch-ab @@ -1,62 +1,13 @@ -$NetBSD: patch-ab,v 1.20 2003/03/16 07:57:46 martti Exp $ +$NetBSD: patch-ab,v 1.21 2004/01/11 02:26:31 jlam Exp $ ---- configure.orig Fri Feb 28 15:56:18 2003 -+++ configure Sun Mar 16 09:01:58 2003 -@@ -12074,6 +12074,49 @@ - fi +--- configure.orig Mon Dec 15 09:55:22 2003 ++++ configure +@@ -20216,7 +20216,7 @@ echo "${ECHO_T}no" >&6 -+echo $ac_n "checking for __libc_sched_setscheduler in -lc""... $ac_c" 1>&6 -+echo "configure:11950: checking for __libc_sched_setscheduler in -lc" >&5 -+ac_lib_var=`echo c'_'__libc_sched_setscheduler | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lc $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 11958 "configure" -+#include "confdefs.h" -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char __libc_sched_setscheduler(); -+ -+int main() { -+__libc_sched_setscheduler() -+; return 0; } -+EOF -+if { (eval echo configure:11969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ PAM_NEEDS_LIBC= -+else -+ echo "$ac_t""no" 1>&6 -+PAM_NEEDS_LIBC=-lc -+fi -+ -+ -+ - ################################################# - # check for pam_smbpass support - echo $ac_n "checking whether to use pam_smbpass""... $ac_c" 1>&6 -@@ -14491,6 +14534,7 @@ - s%@TERMLDFLAGS@%$TERMLDFLAGS%g - s%@ROFF@%$ROFF%g - s%@DYNEXP@%$DYNEXP%g -+s%@PAM_NEEDS_LIBC@%$PAM_NEEDS_LIBC%g - s%@LDAPLIBS@%$LDAPLIBS%g - s%@QUOTAOBJS@%$QUOTAOBJS%g - s%@WINBIND_TARGETS@%$WINBIND_TARGETS%g + if test "$ICONV_FOUND" = yes; then +- LDFLAGS=$save_LDFLAG ++ LDFLAGS=$save_LDFLAGS + + if test ""$i/lib"" != "/usr/lib" ; then + LDFLAGS="$LDFLAGS -L"$i/lib"" diff --git a/net/samba/patches/patch-ac b/net/samba/patches/patch-ac index 2b2cecd146a..8cefa5799dd 100644 --- a/net/samba/patches/patch-ac +++ b/net/samba/patches/patch-ac @@ -1,13 +1,17 @@ -$NetBSD: patch-ac,v 1.11 2002/10/18 11:50:28 martti Exp $ +$NetBSD: patch-ac,v 1.12 2004/01/11 02:26:31 jlam Exp $ ---- 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" +--- include/local.h.orig Fri Nov 7 12:37:33 2003 ++++ include/local.h +@@ -170,10 +170,10 @@ + * Default passwd chat script. + */ - #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; +-#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 + + /* maximum ID number used for session control. This cannot be larger + than 62*62 for the current code */ diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad index 265bd446e49..2b23b392cff 100644 --- a/net/samba/patches/patch-ad +++ b/net/samba/patches/patch-ad @@ -1,31 +1,55 @@ -$NetBSD: patch-ad,v 1.12 2003/03/16 07:57:46 martti Exp $ +$NetBSD: patch-ad,v 1.13 2004/01/11 02:26:31 jlam Exp $ ---- Makefile.in.orig Fri Feb 28 15:56:06 2003 -+++ Makefile.in Sun Mar 16 09:02:19 2003 -@@ -91,6 +91,8 @@ - FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) - FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS) - -+PAM_NEEDS_LIBC = @PAM_NEEDS_LIBC@ +--- lib/util_getent.c.orig Sat Jun 7 13:57:33 2003 ++++ lib/util_getent.c +@@ -133,6 +133,11 @@ struct sys_pwent * getpwent_list(void) + struct sys_pwent *plist; + struct sys_pwent *pent; + struct passwd *pwd; ++#ifdef BSD ++# define BUFLEN 1024 ++ char *bp, *gecos, *p, buf[BUFLEN]; ++ int buflen; ++#endif + + pent = (struct sys_pwent *) malloc(sizeof(struct sys_pwent)); + if (pent == NULL) { +@@ -156,9 +161,38 @@ struct sys_pwent * getpwent_list(void) + pent->pw_uid = pwd->pw_uid; + pent->pw_gid = pwd->pw_gid; + if (pwd->pw_gecos) { ++#ifdef BSD ++ gecos = pwd->pw_gecos; ++ if (*gecos == '*') ++ gecos++; ++ bp = buf; + - WINBIND_PROGS = @WINBIND_TARGETS@ - WINBIND_SPROGS = @WINBIND_STARGETS@ - WINBIND_PAM_PROGS = @WINBIND_PAM_TARGETS@ -@@ -658,7 +660,7 @@ - - bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ) bin/.dummy - @echo Linking shared library $@ -- $(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) -@@ -682,7 +684,7 @@ - - nsswitch/pam_winbind.so: $(PAM_WINBIND_OBJ) - @echo Linking $@ -- @$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) \ -+ @$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) $(LDFLAGS) $(DYNEXP) $(PAM_NEEDS_LIBC) \ - @SONAMEFLAG@`basename $@` - - bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \ ++ /* copy gecos, interpolating & to be full name */ ++ for (p = gecos; *p != '\0'; p++) { ++ if (bp >= &buf[BUFLEN - 1]) ++ /* buffer overflow */ ++ goto gecos_done; ++ if (*p == '&') { ++ /* interpolate full name */ ++ snprintf(bp, BUFLEN - (bp - buf), ++ "%s", pwd->pw_name); ++ *bp = toupper(*bp); ++ bp += strlen(bp); ++ } ++ else ++ *bp++ = *p; ++ } ++ *bp = '\0'; ++ if ((pent->pw_name = strdup(buf)) == NULL) ++ goto err; ++#else + if ((pent->pw_name = strdup(pwd->pw_gecos)) == NULL) + goto err; ++#endif + } ++#ifdef BSD ++ gecos_done: ++#endif + if (pwd->pw_dir) { + if ((pent->pw_name = strdup(pwd->pw_dir)) == NULL) + goto err; diff --git a/net/samba/patches/patch-ae b/net/samba/patches/patch-ae new file mode 100644 index 00000000000..b69f89737f2 --- /dev/null +++ b/net/samba/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.6 2004/01/11 02:26:31 jlam Exp $ + +--- profile/profile.c.orig Sat Jun 7 13:57:36 2003 ++++ profile/profile.c +@@ -22,7 +22,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) + #endif /* WITH_PROFILE */ + + #ifdef WITH_PROFILE diff --git a/net/samba/patches/patch-af b/net/samba/patches/patch-af new file mode 100644 index 00000000000..a9bc6b32d9a --- /dev/null +++ b/net/samba/patches/patch-af @@ -0,0 +1,53 @@ +$NetBSD: patch-af,v 1.5 2004/01/11 02:26:31 jlam Exp $ + +--- ../examples/smb.conf.default.orig Fri Aug 15 16:39:44 2003 ++++ ../examples/smb.conf.default +@@ -21,7 +21,7 @@ + workgroup = MYGROUP + + # server string is the equivalent of the NT Description field +- server string = Samba Server ++ server string = Samba %v (%h) + + # Security mode. Defines in which mode Samba will operate. Possible + # values are share, user, server, domain and ads. Most people will want +@@ -58,10 +58,10 @@ + + # this tells Samba to use a separate log file for each machine + # that connects +- log file = /usr/local/samba/var/log.%m ++; log file = /usr/local/samba/var/log.%m + + # Put a capping on the size of the log files (in Kb). +- max log size = 50 ++; max log size = 50 + + # Use password server option only with security = server + # The argument list may include: +@@ -91,7 +91,7 @@ + # and the manual pages for details. + # You may want to add the following on a Linux system: + # SO_RCVBUF=8192 SO_SNDBUF=8192 +- socket options = TCP_NODELAY ++; socket options = TCP_NODELAY + + # Configure Samba to use multiple interfaces + # If you have multiple network interfaces then you must list them +@@ -147,7 +147,7 @@ + + # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names + # via DNS nslookups. The default is NO. +- dns proxy = no ++; dns proxy = no + + # These scripts are used on a domain controller or stand-alone + # machine to add or delete corresponding unix accounts +@@ -186,7 +186,7 @@ + # specifically define each individual printer + [printers] + comment = All Printers +- path = /usr/spool/samba ++ path = /var/tmp + browseable = no + # Set public = yes to allow user 'guest account' to print + guest ok = no diff --git a/net/samba/patches/patch-ag b/net/samba/patches/patch-ag deleted file mode 100644 index 694decd58dc..00000000000 --- a/net/samba/patches/patch-ag +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2003/06/04 06:12:22 jlam Exp $ - ---- script/installbin.sh.orig Fri Jan 12 11:28:02 2001 -+++ script/installbin.sh -@@ -11,7 +11,7 @@ - shift - shift - --for d in $BASEDIR $BINDIR $LIBDIR $VARDIR $BASEDIR/private; do -+for d in $BASEDIR $BINDIR $LIBDIR $VARDIR; do - if [ ! -d $d ]; then - mkdir $d - if [ ! -d $d ]; then -@@ -30,7 +30,9 @@ - mv $BINDIR/$p2 $BINDIR/$p2.old - fi - cp $p $BINDIR/ -+ strip $BINDIR/$p2 - chmod $INSTALLPERMS $BINDIR/$p2 -+ rm -f $BINDIR/$p2.old - - # this is a special case, mount needs this in a specific location - if [ $p2 = smbmount ]; then diff --git a/net/samba/patches/patch-ah b/net/samba/patches/patch-ah deleted file mode 100644 index f7b4095c879..00000000000 --- a/net/samba/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2001/07/13 16:08:41 taca Exp $ - ---- script/installcp.sh.orig Mon Dec 13 22:27:43 1999 -+++ script/installcp.sh -@@ -12,7 +12,7 @@ - echo Installing codepage files in $CODEPAGEDIR - for d in $LIBDIR $CODEPAGEDIR; do - if [ ! -d $d ]; then --mkdir $d -+mkdir -p $d - if [ ! -d $d ]; then - echo Failed to make directory $d - exit 1 diff --git a/net/samba/patches/patch-aj b/net/samba/patches/patch-aj deleted file mode 100644 index e7c42c1d9a7..00000000000 --- a/net/samba/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2001/07/13 16:08:41 taca Exp $ - ---- script/installswat.sh.orig Mon Apr 16 10:34:11 2001 -+++ script/installswat.sh -@@ -10,7 +10,7 @@ - - for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; do - if [ ! -d $d ]; then -- mkdir $d -+ mkdir -p $d - if [ ! -d $d ]; then - echo Failed to make directory $d, does $USER have privileges? - exit 1 diff --git a/net/samba/patches/patch-al b/net/samba/patches/patch-al deleted file mode 100644 index b6d2e52f77e..00000000000 --- a/net/samba/patches/patch-al +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-al,v 1.2 2002/10/18 11:50:28 martti Exp $ - ---- 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. - */ - --#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 - - /* maximum ID number used for session control. This cannot be larger - than 62*62 for the current code */ diff --git a/net/samba/patches/patch-ap b/net/samba/patches/patch-ap deleted file mode 100644 index 071d0eb731c..00000000000 --- a/net/samba/patches/patch-ap +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2002/10/14 01:51:27 kim Exp $ - -Expand & in the gecos field to a capitalized login name. - ---- lib/util_getent.c.orig Sat Feb 2 19:46:42 2002 -+++ lib/util_getent.c Sun Oct 13 21:37:56 2002 -@@ -155,6 +155,11 @@ - struct sys_pwent *plist; - struct sys_pwent *pent; - struct passwd *pwd; -+#ifdef BSD -+# define BUFLEN 1024 -+ char *bp, *gecos, *p, buf[BUFLEN]; -+ int buflen; -+#endif - - pent = (struct sys_pwent *) malloc(sizeof(struct sys_pwent)); - if (pent == NULL) { -@@ -178,9 +183,38 @@ - pent->pw_uid = pwd->pw_uid; - pent->pw_gid = pwd->pw_gid; - if (pwd->pw_gecos) { -+#ifdef BSD -+ gecos = pwd->pw_gecos; -+ if (*gecos == '*') -+ gecos++; -+ bp = buf; -+ -+ /* copy gecos, interpolating & to be full name */ -+ for (p = gecos; *p != '\0'; p++) { -+ if (bp >= &buf[BUFLEN - 1]) -+ /* buffer overflow */ -+ goto gecos_done; -+ if (*p == '&') { -+ /* interpolate full name */ -+ snprintf(bp, BUFLEN - (bp - buf), -+ "%s", pwd->pw_name); -+ *bp = toupper(*bp); -+ bp += strlen(bp); -+ } -+ else -+ *bp++ = *p; -+ } -+ *bp = '\0'; -+ if ((pent->pw_name = strdup(buf)) == NULL) -+ goto err; -+#else - if ((pent->pw_name = strdup(pwd->pw_gecos)) == NULL) - goto err; -+#endif - } -+#ifdef BSD -+ gecos_done: -+#endif - if (pwd->pw_dir) { - if ((pent->pw_name = strdup(pwd->pw_dir)) == NULL) - goto err; diff --git a/net/samba/patches/patch-aq b/net/samba/patches/patch-aq deleted file mode 100644 index 2ad37976946..00000000000 --- a/net/samba/patches/patch-aq +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2002/10/14 01:51:27 kim Exp $ - -Expand & in the gecos field to a capitalized login name. - ---- lib/system.c.orig Thu May 2 21:03:10 2002 -+++ lib/system.c Sun Oct 13 21:36:59 2002 -@@ -773,6 +773,12 @@ - - static void copy_pwent(struct saved_pw *dst, struct passwd *pass) - { -+#ifdef BSD -+# define BUFLEN 1024 -+ char *bp, *gecos, *p, buf[BUFLEN]; -+ int buflen; -+#endif -+ - memcpy((char *)&dst->pass, pass, sizeof(struct passwd)); - - fstrcpy(dst->pw_name, pass->pw_name); -@@ -781,7 +787,36 @@ - fstrcpy(dst->pw_passwd, pass->pw_passwd); - dst->pass.pw_passwd = dst->pw_passwd; - -+#ifdef BSD -+ gecos = pass->pw_gecos; -+ if (*gecos == '*') -+ gecos++; -+ bp = buf; -+ -+ /* copy gecos, interpolating & to be full name */ -+ for (p = gecos; *p != '\0'; p++) { -+ if (bp >= &buf[BUFLEN - 1]) { -+ /* buffer overflow */ -+ gecos = pass->pw_name; -+ goto gecos_done; -+ } -+ if (*p == '&') { -+ /* interpolate full name */ -+ snprintf(bp, BUFLEN - (bp - buf), "%s", pass->pw_name); -+ *bp = toupper(*bp); -+ bp += strlen(bp); -+ } -+ else -+ *bp++ = *p; -+ } -+ *bp = '\0'; -+ gecos = buf; -+ -+ gecos_done: -+ fstrcpy(dst->pw_gecos, gecos); -+#else - fstrcpy(dst->pw_gecos, pass->pw_gecos); -+#endif - dst->pass.pw_gecos = dst->pw_gecos; - - pstrcpy(dst->pw_dir, pass->pw_dir); diff --git a/net/samba/patches/patch-ar b/net/samba/patches/patch-ar deleted file mode 100644 index 00c7b27f47f..00000000000 --- a/net/samba/patches/patch-ar +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ar,v 1.2 2003/03/16 07:57:47 martti Exp $ - ---- smbd/open.c.orig Fri Feb 28 15:56:20 2003 -+++ smbd/open.c Sun Mar 16 09:03:17 2003 -@@ -979,8 +979,11 @@ - fsp_open = open_file(fsp,conn,fname,psbuf,flags|flags2,mode,desired_access); - - if (!fsp_open && (flags == O_RDWR) && (errno != ENOENT) && fcbopen) { -+ int saved_errno = errno; - if((fsp_open = open_file(fsp,conn,fname,psbuf,O_RDONLY,mode,desired_access)) == True) - flags = O_RDONLY; -+ else -+ errno = saved_errno; - } - - if (!fsp_open) { diff --git a/net/samba/patches/patch-as b/net/samba/patches/patch-as deleted file mode 100644 index 2bc372e1d8a..00000000000 --- a/net/samba/patches/patch-as +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-as,v 1.1 2003/09/05 19:13:42 kim Exp $ - -Fix DFS referrals for Windows XP and 2003 clients. -http://lists.xsec.it/pipermail/samba-it/2003-April/000321.html - ---- smbd/trans2.c.orig Sun Apr 6 21:54:00 2003 -+++ smbd/trans2.c Fri Sep 5 14:47:28 2003 -@@ -3041,7 +3041,7 @@ - { - char *params = *pparams; - enum remote_arch_types ra_type = get_remote_arch(); -- BOOL NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K)); -+ BOOL NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K) || (ra_type == RA_WINXP) || (ra_type == RA_WIN2K3)); - pstring pathname; - int reply_size = 0; - int max_referral_level; |