diff options
author | trhodes <trhodes@FreeBSD.org> | 2004-09-14 04:39:35 +0800 |
---|---|---|
committer | trhodes <trhodes@FreeBSD.org> | 2004-09-14 04:39:35 +0800 |
commit | 444a30687de04b83df60bd97f1387e4f478fa8aa (patch) | |
tree | 7721bfe357fcb53a1686676e7f1bd87d43d47d43 /net | |
parent | 00eef7f3e07a2051e97f5c325340848834aa3363 (diff) | |
download | freebsd-ports-gnome-444a30687de04b83df60bd97f1387e4f478fa8aa.tar.gz freebsd-ports-gnome-444a30687de04b83df60bd97f1387e4f478fa8aa.tar.zst freebsd-ports-gnome-444a30687de04b83df60bd97f1387e4f478fa8aa.zip |
Update to fix recently announced security vulnerability (DoS issues).
PR: 71704
Submitted by: Timur Bakeyev <timur@gnu.org>
Approved by: portmgr (marcus)
Diffstat (limited to 'net')
-rw-r--r-- | net/samba3/Makefile | 18 | ||||
-rw-r--r-- | net/samba3/distinfo | 8 | ||||
-rw-r--r-- | net/samba3/files/patch-jerry-homes-reuse_v2 | 69 | ||||
-rw-r--r-- | net/samba3/files/patch-jerry-winbind_getpwnam_v1 | 66 | ||||
-rw-r--r-- | net/samba3/pkg-plist | 4 |
5 files changed, 6 insertions, 159 deletions
diff --git a/net/samba3/Makefile b/net/samba3/Makefile index 256b5f3bad53..d18009b90afc 100644 --- a/net/samba3/Makefile +++ b/net/samba3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= samba -PORTVERSION= 3.0.6 +PORTVERSION= 3.0.7 PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES?= net @@ -70,8 +70,7 @@ OPTIONS= LDAP "With LDAP support" on \ SAM_PGSQL "With PostgreSQL smbpasswd backend" off \ SAM_OLD_LDAP "With Samba2.x LDAP smbpasswd backend" off \ PAM_SMBPASS "With SMB PAM module" off \ - POPT "With installed POPT library" on \ - I18N "With i18n patch" off + POPT "With installed POPT library" on .endif .include <bsd.port.pre.mk> @@ -248,18 +247,6 @@ WINBIND_FILTER= ${SED} -e 's|%%WINBIND%%||g' WINBIND_FILTER= ${GREP} -v '^%%WINBIND%%' .endif -.if defined(WITH_I18N) -IGNORE= "I18N patch not ported yet!" -# Based on patch from miraclelinux.com. -# http://www.miraclelinux.com/english/technet/samba30/index.html -PATCH_SITES= http://dist.bsdlab.org/ -PATCHFILES= samba-3.0.4-i18n-20040521.bz2 -PATCH_DIST_STRIP= -p1 -PLIST_SUB+= I18N="" -.else -PLIST_SUB+= I18N="@comment " -.endif - PLIST_SUB+= RC_DIR=${RC_DIR} \ SAMBA_LOGDIR=${SAMBA_LOGDIR} \ SAMBA_LOCKDIR=${SAMBA_LOCKDIR} @@ -282,7 +269,6 @@ pre-fetch: post-patch: @${FIND} ${WRKSRC} -name CVS -o -name .cvsignore | ${XARGS} ${RM} @${RM} -rf ${WRKDIR}/${DISTNAME}/examples/libsmbclient - @${CP} -pf ${FILESDIR}/samba.schema ${WRKDIR}/${DISTNAME}/examples/LDAP post-install: .for sect in 1 5 7 8 diff --git a/net/samba3/distinfo b/net/samba3/distinfo index 50a9baaef311..7487f375f9be 100644 --- a/net/samba3/distinfo +++ b/net/samba3/distinfo @@ -1,6 +1,2 @@ -MD5 (samba-3.0.6.tar.gz) = c8dc06e2bcf63513c2e8d849f6352d8a -SIZE (samba-3.0.6.tar.gz) = 14947376 -MD5 (samba-3.0.5.tar.gz) = 5896ad33676e3c26efaab5dcd897c466 -SIZE (samba-3.0.5.tar.gz) = 15076996 -MD5 (samba-3.0.4-i18n-20040521.bz2) = 24158c2fd00b47ff5b0bcad23cae16e1 -SIZE (samba-3.0.4-i18n-20040521.bz2) = 18982 +MD5 (samba-3.0.7.tar.gz) = 5906341429e64214909865a4be92e4ab +SIZE (samba-3.0.7.tar.gz) = 15012667 diff --git a/net/samba3/files/patch-jerry-homes-reuse_v2 b/net/samba3/files/patch-jerry-homes-reuse_v2 index e8d39b60b4d7..e69de29bb2d1 100644 --- a/net/samba3/files/patch-jerry-homes-reuse_v2 +++ b/net/samba3/files/patch-jerry-homes-reuse_v2 @@ -1,69 +0,0 @@ -Index: smbd/password.c -=================================================================== ---- smbd/password.c (revision 2069) -+++ smbd/password.c (working copy) -@@ -252,27 +252,30 @@ - } - - /* Register a home dir service for this user iff -+ - (a) This is not a guest connection, - (b) we have a home directory defined -- If a share exists by this name (autoloaded or not) reuse it so -- long as the home directory is the same as the share directory. */ -+ (c) there s not an existing static share by that name -+ -+ If a share exists by this name (autoloaded or not) reuse it . */ - -- if ( (!vuser->guest) && vuser->unix_homedir && *(vuser->unix_homedir)) { -+ vuser->homes_snum = -1; -+ -+ if ( (!vuser->guest) && vuser->unix_homedir && *(vuser->unix_homedir)) -+ { - int servicenumber = lp_servicenumber(vuser->user.unix_name); -+ - if ( servicenumber == -1 ) { - DEBUG(3, ("Adding homes service for user '%s' using home directory: '%s'\n", - vuser->user.unix_name, vuser->unix_homedir)); - vuser->homes_snum = add_home_service(vuser->user.unix_name, - vuser->user.unix_name, vuser->unix_homedir); -- } else if (strcmp(lp_pathname(servicenumber),vuser->unix_homedir) == 0) { -- DEBUG(3, ("Reusing homes service for user '%s' using home directory: '%s'\n", -- vuser->user.unix_name, vuser->unix_homedir)); -- -+ } else { -+ DEBUG(3, ("Using static (or previously created) service for user '%s'; path = '%s'\n", -+ vuser->user.unix_name, lp_pathname(servicenumber) )); - vuser->homes_snum = servicenumber; - } -- } else { -- vuser->homes_snum = -1; -- } -+ } - - if (srv_is_signing_negotiated() && !vuser->guest && !srv_signing_started()) { - /* Try and turn on server signing on the first non-guest sessionsetup. */ -Index: param/loadparm.c -=================================================================== ---- param/loadparm.c (revision 2069) -+++ param/loadparm.c (working copy) -@@ -2305,6 +2305,10 @@ - copy_service(ServicePtrs[i], &tservice, NULL); - if (name) - string_set(&ServicePtrs[i]->szService, name); -+ -+ DEBUG(8,("add_a_service: Creating snum = %d for %s\n", -+ i, ServicePtrs[i]->szService)); -+ - return (i); - } - -@@ -2344,7 +2348,7 @@ - ServicePtrs[i]->autoloaded = True; - - DEBUG(3, ("adding home's share [%s] for user '%s' at '%s'\n", pszHomename, -- user, newHomedir)); -+ user, ServicePtrs[i]->szPath )); - - return (True); - } diff --git a/net/samba3/files/patch-jerry-winbind_getpwnam_v1 b/net/samba3/files/patch-jerry-winbind_getpwnam_v1 index 484c9e775d36..e69de29bb2d1 100644 --- a/net/samba3/files/patch-jerry-winbind_getpwnam_v1 +++ b/net/samba3/files/patch-jerry-winbind_getpwnam_v1 @@ -1,66 +0,0 @@ -Index: libsmb/samlogon_cache.c -=================================================================== ---- libsmb/samlogon_cache.c (revision 2082) -+++ libsmb/samlogon_cache.c (working copy) -@@ -106,9 +106,10 @@ - - /*********************************************************************** - Store a NET_USER_INFO_3 structure in a tdb for later user -+ username should be in UTF-8 format - ***********************************************************************/ - --BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, NET_USER_INFO_3 *user) -+BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, const char * username, NET_USER_INFO_3 *user) - { - TDB_DATA data; - fstring keystr; -@@ -130,6 +131,14 @@ - slprintf(keystr, sizeof(keystr), "%s", sid_string_static(&user_sid)); - - DEBUG(10,("netsamlogon_cache_store: SID [%s]\n", keystr)); -+ -+ /* only Samba fills in the username, not sure why NT doesn't */ -+ /* so we fill it in since winbindd_getpwnam() makes use of it */ -+ -+ if ( !user->uni_user_name.buffer ) { -+ init_unistr2( &user->uni_user_name, username, STR_TERMINATE ); -+ init_uni_hdr( &user->hdr_user_name, &user->uni_user_name ); -+ } - - /* Prepare data */ - -Index: nsswitch/winbindd_pam.c -=================================================================== ---- nsswitch/winbindd_pam.c (revision 2082) -+++ nsswitch/winbindd_pam.c (working copy) -@@ -283,7 +283,7 @@ - } - - if (NT_STATUS_IS_OK(result)) { -- netsamlogon_cache_store( cli->mem_ctx, &info3 ); -+ netsamlogon_cache_store( cli->mem_ctx, name_user, &info3 ); - wcache_invalidate_samlogon(find_domain_from_name(name_domain), &info3); - - /* Check if the user is in the right group */ -@@ -538,7 +538,7 @@ - } - - if (NT_STATUS_IS_OK(result)) { -- netsamlogon_cache_store( cli->mem_ctx, &info3 ); -+ netsamlogon_cache_store( cli->mem_ctx, name_user, &info3 ); - wcache_invalidate_samlogon(find_domain_from_name(name_domain), &info3); - - if (!NT_STATUS_IS_OK(result = check_info3_in_group(mem_ctx, &info3, state->request.data.auth_crap.required_membership_sid))) { -Index: auth/auth_domain.c -=================================================================== ---- auth/auth_domain.c (revision 2082) -+++ auth/auth_domain.c (working copy) -@@ -205,7 +205,7 @@ - } else { - nt_status = make_server_info_info3(mem_ctx, user_info->internal_username.str, - user_info->smb_name.str, domain, server_info, &info3); -- netsamlogon_cache_store( mem_ctx, &info3 ); -+ netsamlogon_cache_store( mem_ctx, user_info->smb_name.str, &info3 ); - } - - #if 0 diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist index 673bad109410..8aa6782fbed2 100644 --- a/net/samba3/pkg-plist +++ b/net/samba3/pkg-plist @@ -46,7 +46,6 @@ lib/samba/vfs/expand_msdfs.so lib/samba/vfs/extd_audit.so lib/samba/vfs/fake_perms.so lib/samba/vfs/full_audit.so -%%I18N%%lib/samba/vfs/hex.so lib/samba/vfs/netatalk.so lib/samba/vfs/readonly.so lib/samba/vfs/recycle.so @@ -74,6 +73,7 @@ lib/samba/charset/CP850.so %%SMBPASS%%%%EXAMPLESDIR%%/pam_smbpass/password-sync %%EXAMPLESDIR%%/LDAP/README %%EXAMPLESDIR%%/LDAP/convertSambaAccount +%%EXAMPLESDIR%%/LDAP/get_next_oid %%EXAMPLESDIR%%/LDAP/ldapsync.pl %%EXAMPLESDIR%%/LDAP/samba-nds.schema %%EXAMPLESDIR%%/LDAP/samba-schema-netscapeds4.x @@ -126,7 +126,7 @@ lib/samba/charset/CP850.so %%EXAMPLESDIR%%/VFS/skel_transparent.c %%EXAMPLESDIR%%/auth/Makefile %%EXAMPLESDIR%%/auth/auth_skel.c -%%EXAMPLESDIR%%/autofs/auto.a +%%EXAMPLESDIR%%/autofs/auto.smb %%EXAMPLESDIR%%/dce-dfs/README %%EXAMPLESDIR%%/dce-dfs/smb.conf %%EXAMPLESDIR%%/genlogon/genlogon.pl |