Commit 2865eba1 authored by Ivo De Decker's avatar Ivo De Decker

Imported Upstream version 3.6.15

parent 14ebdf43
==============================
Release Notes for Samba 3.6.15
May 08, 2013
==============================
This is is the latest stable release of Samba 3.6.
Major enhancements in Samba 3.6.15 include:
o Fix crash bug in Winbind (bug #9854).
Changes since 3.6.14:
---------------------
o Andrew Bartlett <abartlet@samba.org>
* BUG 9746: Fix "guest ok", "force user" and "force group" for guest users.
o David Disseldorp <ddiss@samba.org>
* BUG 9830: Fix panic in nt_printer_publish_ads.
o Volker Lendecke <vl@samba.org>
* BUG 9854: Fix crash bug in Winbind.
o Andreas Schneider <asn@samba.org>
* BUG 9817: Fix 'map untrusted to domain' with NTLMv2.
######################################################################
Reporting bugs & Development Discussion
#######################################
Please discuss this release on the samba-technical mailing list or by
joining the #samba-technical IRC channel on irc.freenode.net.
If you do report problems then please try to send high quality
feedback. If you don't provide vital information to help us track down
the problem then you will probably be ignored. All bug reports should
be filed under the Samba 3.6 product in the project's Bugzilla
database (https://bugzilla.samba.org/).
======================================================================
== Our Code, Our Bugs, Our Responsibility.
== The Samba Team
======================================================================
Release notes for older releases follow:
----------------------------------------
==============================
Release Notes for Samba 3.6.14
April 29, 2013
......@@ -95,8 +149,9 @@ database (https://bugzilla.samba.org/).
== The Samba Team
======================================================================
Release notes for older releases follow:
----------------------------------------
----------------------------------------------------------------------
==============================
Release Notes for Samba 3.6.13
......
......@@ -5,7 +5,7 @@ Summary: Samba SMB client and server
Vendor: Samba Team
Packager: Samba Team <samba@samba.org>
Name: samba
Version: 3.6.14
Version: 3.6.15
Release: 1GITHASH
Epoch: 0
License: GNU GPL version 3
......
......@@ -20,7 +20,7 @@ SRCDIR=`rpm --eval %_sourcedir`
USERID=`id -u`
GRPID=`id -g`
VERSION='3.6.14'
VERSION='3.6.15'
REVISION=''
SPECFILE="samba.spec"
RPMVER=`rpm --version | awk '{print $3}'`
......
......@@ -11,7 +11,7 @@ Summary: Samba SMB client and server
Vendor: Samba Team
Packager: Samba Team <samba@samba.org>
Name: samba
Version: 3.6.14
Version: 3.6.15
Release: 1
Epoch: 0
License: GNU GPL version 3
......
......@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=3
SAMBA_VERSION_MINOR=6
SAMBA_VERSION_RELEASE=14
SAMBA_VERSION_RELEASE=15
########################################################
# Bug fix releases use a letter for the patch revision #
......
......@@ -902,6 +902,7 @@ static NTSTATUS make_new_session_info_system(TALLOC_CTX *mem_ctx,
NTSTATUS make_serverinfo_from_username(TALLOC_CTX *mem_ctx,
const char *username,
bool use_guest_token,
bool is_guest,
struct auth_serversupplied_info **presult)
{
......@@ -925,7 +926,7 @@ NTSTATUS make_serverinfo_from_username(TALLOC_CTX *mem_ctx,
result->nss_token = true;
result->guest = is_guest;
if (is_guest) {
if (use_guest_token) {
status = make_server_info_guest(mem_ctx, &result);
} else {
status = create_local_token(result);
......
......@@ -62,9 +62,15 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context,
}
/* Send off request */
params.account_name = user_info->client.account_name;
params.domain_name = user_info->mapped.domain_name;
/*
* We need to send the domain name from the client to the DC. With
* NTLMv2 the domain name is part of the hashed second challenge,
* if we change the domain name, the DC will fail to verify the
* challenge cause we changed the domain name, this is like a
* man in the middle attack.
*/
params.domain_name = user_info->client.domain_name;
params.workstation_name = user_info->workstation_name;
params.flags = 0;
......
......@@ -149,6 +149,7 @@ NTSTATUS make_server_info_pw(struct auth_serversupplied_info **server_info,
struct passwd *pwd);
NTSTATUS make_serverinfo_from_username(TALLOC_CTX *mem_ctx,
const char *username,
bool use_guest_token,
bool is_guest,
struct auth_serversupplied_info **presult);
struct auth_serversupplied_info *copy_serverinfo(TALLOC_CTX *mem_ctx,
......
/* Autogenerated by script/mkversion.sh */
#define SAMBA_VERSION_MAJOR 3
#define SAMBA_VERSION_MINOR 6
#define SAMBA_VERSION_RELEASE 14
#define SAMBA_VERSION_OFFICIAL_STRING "3.6.14"
#define SAMBA_VERSION_RELEASE 15
#define SAMBA_VERSION_OFFICIAL_STRING "3.6.15"
#ifdef SAMBA_VERSION_VENDOR_FUNCTION
# define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
#else /* SAMBA_VERSION_VENDOR_FUNCTION */
......
......@@ -113,6 +113,10 @@ NTSTATUS dcerpc_pull_ncacn_packet(TALLOC_CTX *mem_ctx,
ndr->flags |= LIBNDR_FLAG_BIGENDIAN;
}
if (CVAL(blob->data, DCERPC_PFC_OFFSET) & DCERPC_PFC_FLAG_OBJECT_UUID) {
ndr->flags |= LIBNDR_FLAG_OBJECT_PRESENT;
}
ndr_err = ndr_pull_ncacn_packet(ndr, NDR_SCALARS|NDR_BUFFERS, r);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
......
......@@ -192,17 +192,23 @@ static WERROR nt_printer_publish_ads(struct messaging_context *msg_ctx,
DEBUG(5, ("publishing printer %s\n", printer));
/* figure out where to publish */
ads_find_machine_acct(ads, &res, global_myname());
ads_rc = ads_find_machine_acct(ads, &res, global_myname());
if (!ADS_ERR_OK(ads_rc)) {
DEBUG(0, ("failed to find machine account for %s\n",
global_myname()));
TALLOC_FREE(ctx);
return WERR_NOT_FOUND;
}
/* We use ldap_get_dn here as we need the answer
* in utf8 to call ldap_explode_dn(). JRA. */
srv_dn_utf8 = ldap_get_dn((LDAP *)ads->ldap.ld, (LDAPMessage *)res);
ads_msgfree(ads, res);
if (!srv_dn_utf8) {
TALLOC_FREE(ctx);
return WERR_SERVER_UNAVAILABLE;
}
ads_msgfree(ads, res);
srv_cn_utf8 = ldap_explode_dn(srv_dn_utf8, 1);
if (!srv_cn_utf8) {
TALLOC_FREE(ctx);
......
......@@ -656,7 +656,7 @@ static NTSTATUS create_connection_session_info(struct smbd_server_connection *sc
return NT_STATUS_WRONG_PASSWORD;
}
return make_serverinfo_from_username(mem_ctx, user, guest,
return make_serverinfo_from_username(mem_ctx, user, guest, guest,
presult);
}
......@@ -690,7 +690,7 @@ NTSTATUS set_conn_force_user_group(connection_struct *conn, int snum)
}
status = make_serverinfo_from_username(
conn, fuser, conn->session_info->guest,
conn, fuser, false, conn->session_info->guest,
&forced_serverinfo);
if (!NT_STATUS_IS_OK(status)) {
return status;
......
......@@ -946,7 +946,7 @@ static void wcache_save_name_to_sid(struct winbindd_domain *domain,
if (!centry)
return;
if (domain_name[0] == '\0') {
if ((domain_name == NULL) || (domain_name[0] == '\0')) {
struct winbindd_domain *mydomain =
find_domain_from_sid_noinit(sid);
if (mydomain != NULL) {
......@@ -974,7 +974,7 @@ static void wcache_save_sid_to_name(struct winbindd_domain *domain, NTSTATUS sta
if (!centry)
return;
if (domain_name[0] == '\0') {
if ((domain_name == NULL) || (domain_name[0] == '\0')) {
struct winbindd_domain *mydomain =
find_domain_from_sid_noinit(sid);
if (mydomain != NULL) {
......@@ -1798,7 +1798,7 @@ NTSTATUS wcache_name_to_sid(struct winbindd_domain *domain,
return NT_STATUS_NO_MEMORY;
}
if (domain_name[0] == '\0') {
if ((domain_name == NULL) || (domain_name[0] == '\0')) {
domain_name = domain->name;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment