[SCM] Samba Shared Repository - branch v3-3-stable updated -
release-3-2-0pre2-3812-g07dece8
Karolin Seeger
kseeger at samba.org
Mon Aug 25 09:05:07 GMT 2008
The branch, v3-3-stable has been updated
via 07dece84fbff76de2278605e254089b6f7a18163 (commit)
via b4e47c1b29d7538c36f698208a6cc3020929a2ec (commit)
via d0414ea0c20a726fc6edb6ee901b99d170ae86c6 (commit)
via 9c970acfddb9cfda016857f0076f91aedd06d24e (commit)
from af4ad677812763ea9bde8a767ed873918e184123 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable
- Log -----------------------------------------------------------------
commit 07dece84fbff76de2278605e254089b6f7a18163
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Aug 25 10:34:01 2008 +0200
WHATSNEW: Add some feature descriptions.
Karolin
(cherry picked from commit 14caf928ebcc3e7beff507eb77961e6642e1713a)
commit b4e47c1b29d7538c36f698208a6cc3020929a2ec
Author: Jeff Layton <jlayton at redhat.com>
Date: Fri Aug 22 17:29:16 2008 -0400
cifs.upcall: bump SPNEGO msg version number and don't reject old versions
When we added the ability for the kernel to send sec=mskrb5 to the
upcall, we subtly broke old cifs.upcall versions that don't understand
it. Bump the spnego message version to 2 to make this clear. Also,
change cifs.upcall to not reject requests with a version that's lower
than the current one, and to send the reply with the same version that
the request sent. The idea is to try and keep cifs.upcall backward
compatible with old kernels.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 653c9a6abc88dffe786941c4e99fd125f53e3b86)
commit d0414ea0c20a726fc6edb6ee901b99d170ae86c6
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Aug 22 23:05:43 2008 +0200
WHATSNEW: Add winbind reconnect delay.
Karolin
(cherry picked from commit 59f52b3d9885c33569eba4f3afed50367a10ba9f)
commit 9c970acfddb9cfda016857f0076f91aedd06d24e
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Fri Aug 22 14:54:50 2008 -0500
idmap_gid_to_sid: Fix a cut-a-npaste error.
The call was looking up a uid and not gid in the cache.
(cherry picked from commit 0efe7e5e95497def1b75ceb8ba84b45d118e7746)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 23 ++++++++++++++++++++---
source/client/cifs.upcall.c | 4 ++--
source/client/cifs_spnego.h | 2 +-
source/winbindd/idmap_util.c | 2 +-
4 files changed, 24 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 87cb180..4515cdc 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,6 +1,6 @@
=================================
Release Notes for Samba 3.3.0pre1
- August 19, 2008
+ August 26, 2008
=================================
This is the first preview release of Samba 3.3.0. This is *not*
@@ -24,7 +24,16 @@ Major enhancements in Samba 3.3.0 include:
Administrative tools:
o The destination "all" of smbcontrol does now affect all running
daemons including nmbd and winbindd.
- o New 'net rpc vampire keytab' command.
+ o New 'net rpc vampire keytab' and 'net rpc vampire ldif' commands.
+
+
+Configure changes
+=================
+
+The configure option "--with-libdir" has been removed. The library
+directory can still be specified by using the existing "--libdir" option.
+A new option "--with-modulesdir" has been added to allow the specification
+of a separate driectory for the shared modules.
Winbind idmap backend changes
@@ -50,6 +59,14 @@ being set with the "old" parameters "idmap uid" and "idmap gid".
The "idmap domains" parameter has been removed.
+winbind reconnect delay
+=======================
+
+This is a new parameter which specifies the number of seconds the Winbind
+daemon will wait between attempts to contact a Domain controller for a domain
+that is determined to be down or not contactable.
+
+
######################################################################
Changes
#######
@@ -59,10 +76,10 @@ smb.conf changes
Parameter Name Description Default
-------------- ----------- -------
- idmap backend Changed Default tdb
idmap domains Removed
init logon delayed hosts New ""
init logon delay New 100
+ winbind reconnect delay New 30
######################################################################
diff --git a/source/client/cifs.upcall.c b/source/client/cifs.upcall.c
index cf5f1c3..7cb5166 100644
--- a/source/client/cifs.upcall.c
+++ b/source/client/cifs.upcall.c
@@ -284,7 +284,7 @@ int main(const int argc, char *const argv[])
}
SAFE_FREE(buf);
- if (kernel_upcall_version != CIFS_SPNEGO_UPCALL_VERSION) {
+ if (kernel_upcall_version > CIFS_SPNEGO_UPCALL_VERSION) {
syslog(LOG_WARNING,
"incompatible kernel upcall version: 0x%x",
kernel_upcall_version);
@@ -353,7 +353,7 @@ int main(const int argc, char *const argv[])
rc = 1;
goto out;
}
- keydata->version = CIFS_SPNEGO_UPCALL_VERSION;
+ keydata->version = kernel_upcall_version;
keydata->flags = 0;
keydata->sesskey_len = sess_key.length;
keydata->secblob_len = secblob.length;
diff --git a/source/client/cifs_spnego.h b/source/client/cifs_spnego.h
index 13909dd..f8753a7 100644
--- a/source/client/cifs_spnego.h
+++ b/source/client/cifs_spnego.h
@@ -23,7 +23,7 @@
#ifndef _CIFS_SPNEGO_H
#define _CIFS_SPNEGO_H
-#define CIFS_SPNEGO_UPCALL_VERSION 1
+#define CIFS_SPNEGO_UPCALL_VERSION 2
/*
* The version field should always be set to CIFS_SPNEGO_UPCALL_VERSION.
diff --git a/source/winbindd/idmap_util.c b/source/winbindd/idmap_util.c
index 2a6beca..b10a1a4 100644
--- a/source/winbindd/idmap_util.c
+++ b/source/winbindd/idmap_util.c
@@ -87,7 +87,7 @@ NTSTATUS idmap_gid_to_sid(const char *domname, DOM_SID *sid, gid_t gid)
DEBUG(10,("gid = [%lu]\n", (unsigned long)gid));
- if (idmap_cache_find_uid2sid(gid, sid, &expired)) {
+ if (idmap_cache_find_gid2sid(gid, sid, &expired)) {
DEBUG(10, ("idmap_cache_find_gid2sid found %d%s\n", gid,
expired ? " (expired)": ""));
if (expired && idmap_is_online()) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list