[SCM] CTDB repository - branch master updated - ctdb-1.12-100-gfaf25e8
The branch, master has been updated
via faf25e8a2fdf80a016048e1f698a014ceb5e604f (commit)
via f60de23e0a8307b5baaa9c4b8406b2b223487a48 (commit)
from 57fb074a65dc56168fc3813b79a5bab4b3727cf3 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit faf25e8a2fdf80a016048e1f698a014ceb5e604f
Author: Michael Adam ob...@samba.org
Date: Tue Dec 6 10:38:04 2011 +0100
libctdb: fix libctdb's traverse after changes in the core
In 8281bb210858ed04992eacea7f6d02261e0fc1b1, I forgot to change
this hunk back when hiding the wire changes done in commit
ddc5da3a0df7701934404192a0a0aa659a806acb behind a new control
CTDB_CONTROL_TRAVERSE_START_EXT.
commit f60de23e0a8307b5baaa9c4b8406b2b223487a48
Author: Michael Adam ob...@samba.org
Date: Tue Dec 6 10:42:43 2011 +0100
Revert Fix the build that broke in
8281bb210858ed04992eacea7f6d02261e0fc1b1
This reverts commit 08e06176feab1ec244496e62a916fbb77817239f.
I wanted to fix this differently, not using the extended traverse_start
control...
---
Summary of changes:
libctdb/ctdb.c |5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libctdb/ctdb.c b/libctdb/ctdb.c
index 0c5a1b3..2f694a1 100644
--- a/libctdb/ctdb.c
+++ b/libctdb/ctdb.c
@@ -1106,7 +1106,7 @@ static void traverse_msghnd_cb(struct ctdb_connection
*ctdb,
{
struct ctdb_traverse_state *state = private_data;
struct ctdb_db *ctdb_db = state-ctdb_db;
- struct ctdb_traverse_start_ext t;
+ struct ctdb_traverse_start t;
if (!ctdb_set_message_handler_recv(ctdb, state-handle)) {
DEBUG(ctdb, LOG_ERR,
@@ -1127,10 +1127,9 @@ static void traverse_msghnd_cb(struct ctdb_connection
*ctdb,
t.db_id = ctdb_db-id;
t.srvid = state-srvid;
t.reqid = 0;
- t.withemptyrecords = false;
state-handle = new_ctdb_control_request(ctdb,
- CTDB_CONTROL_TRAVERSE_START_EXT,
+ CTDB_CONTROL_TRAVERSE_START,
CTDB_CURRENT_NODE,
t, sizeof(t),
traverse_start_cb, state);
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 891258c s3:net registry check: replace rawmemchr by functionally
equivalent portable strchr
via 958e4f5 Revert Remove rawmemchr calls - found by Ira Cooper. These
are glibc-specific calls, makes us completely non-portable.
via 2a69de6 s3:registry: replace use of rawmemchr by portable
equivalent use of strchr.
from 116a150 knownfail: Mark some ldap.acl search tests as no longer
failing.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 891258cd7043fd9b4ae99324a541cffbce09e27a
Author: Michael Adam ob...@samba.org
Date: Tue Dec 6 01:17:02 2011 +0100
s3:net registry check: replace rawmemchr by functionally equivalent
portable strchr
rawmemchr is glibc only - not portable. Remarked by Ira Cooper.
Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Tue Dec 6 12:20:48 CET 2011 on sn-devel-104
commit 958e4f51d2857e1f84acf770ab0d9f2cee5d5d83
Author: Michael Adam ob...@samba.org
Date: Tue Dec 6 01:05:39 2011 +0100
Revert Remove rawmemchr calls - found by Ira Cooper. These are
glibc-specific calls, makes us completely non-portable.
This reverts commit 82b1702284ba2bb61b23e1f14ce9145d896c36c0.
This is not functionally equivalent, needs to be done differently.
commit 2a69de6fde68d6e865e901beb7c65e6f4f16f0f8
Author: Michael Adam ob...@samba.org
Date: Tue Dec 6 00:58:24 2011 +0100
s3:registry: replace use of rawmemchr by portable equivalent use of strchr.
---
Summary of changes:
source3/registry/reg_backend_db.c |2 +-
source3/utils/net_registry_check.c |7 +++
2 files changed, 4 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/registry/reg_backend_db.c
b/source3/registry/reg_backend_db.c
index 965d121..378b20f 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -545,7 +545,7 @@ static bool tdb_data_is_cstr(TDB_DATA d) {
if (tdb_data_is_empty(d) || (d.dptr[d.dsize-1] != '\0')) {
return false;
}
- return rawmemchr(d.dptr, '\0') == d.dptr[d.dsize-1];
+ return strchr((char *)d.dptr, '\0') == (char *)d.dptr[d.dsize-1];
}
static bool upgrade_v2_to_v3_check_subkeylist(struct db_context *db,
diff --git a/source3/utils/net_registry_check.c
b/source3/utils/net_registry_check.c
index 9dca219..201dc5e 100644
--- a/source3/utils/net_registry_check.c
+++ b/source3/utils/net_registry_check.c
@@ -208,10 +208,10 @@ static bool tdb_data_read_regval(TDB_DATA *buf, struct
regval *result)
}
static bool tdb_data_is_cstr(TDB_DATA d) {
- if (tdb_data_is_empty(d)) {
+ if (tdb_data_is_empty(d) || (d.dptr[d.dsize-1] != '\0')) {
return false;
}
- return (d.dptr[d.dsize-1] == '\0');
+ return strchr((char *)d.dptr, '\0') == (char *)d.dptr[d.dsize-1];
}
static char* tdb_data_print(TALLOC_CTX *mem_ctx, TDB_DATA d)
@@ -664,8 +664,7 @@ static bool srprs_path(const char **ptr, const char*
prefix, char sep,
return false;
}
*ppath = path;
- /* We know pos ends in '\0'. */
- *ptr = pos[strlen(pos)];
+ *ptr = strchr(pos, '\0');
return true;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8f7f244 lib/util/util_tdb: adhere to coding style for
tdb_data_is_empty()
from 891258c s3:net registry check: replace rawmemchr by functionally
equivalent portable strchr
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8f7f244200947d36baeabd892b1fecd0bdb88194
Author: Michael Adam ob...@samba.org
Date: Tue Dec 6 13:46:08 2011 +0100
lib/util/util_tdb: adhere to coding style for tdb_data_is_empty()
Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Tue Dec 6 15:22:08 CET 2011 on sn-devel-104
---
Summary of changes:
lib/util/util_tdb.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/util_tdb.c b/lib/util/util_tdb.c
index 0c30d77..f239797 100644
--- a/lib/util/util_tdb.c
+++ b/lib/util/util_tdb.c
@@ -46,7 +46,8 @@ bool tdb_data_equal(TDB_DATA t1, TDB_DATA t2)
return (memcmp(t1.dptr, t2.dptr, t1.dsize) == 0);
}
-bool tdb_data_is_empty(TDB_DATA d) {
+bool tdb_data_is_empty(TDB_DATA d)
+{
return (d.dsize == 0) || (d.dptr == NULL);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via df616e9 s3-winbind: Add an update function for winbind cache.
from 33a8e16 s3: Attempt to fix the vfs_commit module
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit df616e928e08646bbc234af673a496117535c6d8
Author: Andreas Schneider a...@samba.org
Date: Mon Dec 5 12:33:25 2011 -0800
s3-winbind: Add an update function for winbind cache.
With 57b3d32 we changed the format for the winbind cache database and
the code deleted the database for the upgrade. As this database holds
also cached credentials, removing it is not an option. We need to update
from version 1 to version 2.
Fix bug #8643 (A Samba update to 3.6 deletes the winbind cache with cached
credentials).
---
Summary of changes:
source3/winbindd/winbindd_cache.c | 96 -
1 files changed, 94 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_cache.c
b/source3/winbindd/winbindd_cache.c
index 4b0c35b..ea503e1 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -38,7 +38,10 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
-#define WINBINDD_CACHE_VERSION 2
+#define WINBINDD_CACHE_VER1 1 /* initial db version */
+#define WINBINDD_CACHE_VER2 2 /* second version with timeouts for NDR entries
*/
+
+#define WINBINDD_CACHE_VERSION WINBINDD_CACHE_VER2
#define WINBINDD_CACHE_VERSION_KEYSTR WINBINDD_CACHE_VERSION
extern struct winbindd_methods reconnect_methods;
@@ -4081,6 +4084,70 @@ static void validate_panic(const char *const why)
exit(47);
}
+static int wbcache_update_centry_fn(TDB_CONTEXT *tdb,
+ TDB_DATA key,
+ TDB_DATA data,
+ void *state)
+{
+ uint64_t ctimeout;
+ TDB_DATA blob;
+
+ if (is_non_centry_key(key)) {
+ return 0;
+ }
+
+ if (data.dptr == NULL || data.dsize == 0) {
+ if (tdb_delete(tdb, key) 0) {
+ DEBUG(0, (tdb_delete for [%s] failed!\n,
+ key.dptr));
+ return 1;
+ }
+ }
+
+ /* add timeout to blob (uint64_t) */
+ blob.dsize = data.dsize + 8;
+
+ blob.dptr = SMB_XMALLOC_ARRAY(uint8_t, blob.dsize);
+ if (blob.dptr == NULL) {
+ return 1;
+ }
+ memset(blob.dptr, 0, blob.dsize);
+
+ /* copy status and seqnum */
+ memcpy(blob.dptr, data.dptr, 8);
+
+ /* add timeout */
+ ctimeout = lp_winbind_cache_time() + time(NULL);
+ SBVAL(blob.dptr, 8, ctimeout);
+
+ /* copy the rest */
+ memcpy(blob.dptr + 16, data.dptr + 8, data.dsize - 8);
+
+ if (tdb_store(tdb, key, blob, TDB_REPLACE) 0) {
+ DEBUG(0, (tdb_store to update [%s] failed!\n,
+ key.dptr));
+ SAFE_FREE(blob.dptr);
+ return 1;
+ }
+
+ SAFE_FREE(blob.dptr);
+ return 0;
+}
+
+static bool wbcache_upgrade_v1_to_v2(TDB_CONTEXT *tdb)
+{
+ int rc;
+
+ DEBUG(1, (Upgrade to version 2 of the winbindd_cache.tdb\n));
+
+ rc = tdb_traverse(tdb, wbcache_update_centry_fn, NULL);
+ if (rc 0) {
+ return false;
+ }
+
+ return true;
+}
+
/***
Try and validate every entry in the winbindd cache. If we fail here,
delete the cache tdb and return non-zero.
@@ -4091,11 +4158,12 @@ int winbindd_validate_cache(void)
int ret = -1;
const char *tdb_path = cache_path(winbindd_cache.tdb);
TDB_CONTEXT *tdb = NULL;
+ uint32_t vers_id;
+ bool ok;
DEBUG(10, (winbindd_validate_cache: replacing panic function\n));
smb_panic_fn = validate_panic;
-
tdb = tdb_open_log(tdb_path,
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
TDB_INCOMPATIBLE_HASH |
@@ -4109,6 +4177,30 @@ int winbindd_validate_cache(void)
error opening/initializing tdb\n));
goto done;
}
+
+ /* Version check and upgrade code. */
+ if (!tdb_fetch_uint32(tdb, WINBINDD_CACHE_VERSION_KEYSTR, vers_id)) {
+ DEBUG(10, (Fresh database\n));
+ tdb_store_uint32(tdb, WINBINDD_CACHE_VERSION_KEYSTR,
WINBINDD_CACHE_VERSION);
+ vers_id = WINBINDD_CACHE_VERSION;
+ }
+
+ if (vers_id != WINBINDD_CACHE_VERSION) {
+ if (vers_id == WINBINDD_CACHE_VER1) {
+ ok = wbcache_upgrade_v1_to_v2(tdb);
+ if (!ok) {
+ DEBUG(10,
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 407c3fa manpage: add more undocumented options to mount.cifs manpage from d682960 docs: Add missing prefixpath options for mount.cifs. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 407c3facf1061616d6dc9a814bab2217ea343040 Author: Jeff Layton jlay...@redhat.com Date: Tue Dec 6 09:32:18 2011 -0500 manpage: add more undocumented options to mount.cifs manpage Signed-off-by: Jeff Layton jlay...@redhat.com Fix bug #8648 (document more undocumented mount.cifs options). --- Summary of changes: docs-xml/manpages-3/mount.cifs.8.xml | 52 +- 1 files changed, 51 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml index 21c7f60..d58859b 100644 --- a/docs-xml/manpages-3/mount.cifs.8.xml +++ b/docs-xml/manpages-3/mount.cifs.8.xml @@ -159,6 +159,17 @@ information. /para /varlistentry varlistentry + termcifsacl/term + listitem + para + This option is used to map CIFS/NTFS ACLs to/from Linux permission + bits, map SIDs to/from UIDs and GIDs, and get and set Security + Descriptors. + /para + /listitem +/varlistentry + +varlistentry termforceuid/term listitem parainstructs the client to ignore any uid provided by @@ -202,7 +213,7 @@ port 445 is tried and if no response then port 139 is tried. /varlistentry varlistentry -termservern=replaceablearg/replaceable/term +termservernetbiosname=replaceablearg/replaceable/term listitempara Specify the server netbios name (RFC1001 name) to use @@ -216,6 +227,13 @@ port 445 is tried and if no response then port 139 is tried. /para/listitem /varlistentry +varlistentry + termservern=replaceablearg/replaceable/term + listitem + parasynonym for emphasisservernetbiosname=/emphasis/para + /listitem +/varlistentry + varlistentry termnetbiosname=replaceablearg/replaceable/term @@ -415,6 +433,15 @@ permissions in memory that can't be stored on the server. This information can d /listitem /varlistentry +varlistentry + termignorecase/term + listitem + para + Synonym for emphasisnocase/emphasis + /para + /listitem +/varlistentry + varlistentry termsec=/term listitem @@ -547,6 +574,29 @@ permissions in memory that can't be stored on the server. This information can d maximum wsize currently allowed by CIFS is 57344 (fourteen 4096 byte pages)/para/listitem /varlistentry + +varlistentry + termnoposixpaths/term + listitem + para + If unix extensions are enabled on a share, then the client will + typically allow filenames to include any character besides '/' in a + pathname component, and will use forward slashes as a pathname + delimiter. This option prevents the client from attempting to + negotiate the use of posix-style pathnames to the server. + /para + /listitem +/varlistentry + +varlistentry + termposixpaths/term + listitem + para + Inverse of emphasisnoposixpaths/emphasis + /para + /listitem +/varlistentry + varlistentry term--verbose/term listitemparaPrint additional debugging information for the mount. Note that this parameter must be specified before the -o. For example:/paraparamount -t cifs //server/share /mnt --verbose -o user=username/para/listitem -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 817f752 tevent: Install python tevent modules.
via de4b894 Install (platform-independent) python scripts to the
PYTHONDIR rather than PYTHONARCHDIR.
via 5d19227 Add stub python module for tevent.
from 8f7f244 lib/util/util_tdb: adhere to coding style for
tdb_data_is_empty()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 817f7529d3e6483c83ef336600b8743af62c545e
Author: Jelmer Vernooij jel...@samba.org
Date: Tue Dec 6 21:18:43 2011 +0100
tevent: Install python tevent modules.
Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Tue Dec 6 23:13:37 CET 2011 on sn-devel-104
commit de4b8943bfb40e2f50c9e4e2ee5d39e986317d08
Author: Jelmer Vernooij jel...@samba.org
Date: Tue Dec 6 21:08:15 2011 +0100
Install (platform-independent) python scripts to the PYTHONDIR rather than
PYTHONARCHDIR.
commit 5d1922739e852fcc2a143996e88420b09c5dbff9
Author: Jelmer Vernooij jel...@samba.org
Date: Tue Dec 6 21:03:21 2011 +0100
Add stub python module for tevent.
---
Summary of changes:
lib/tevent/tevent.py | 28
lib/tevent/wscript |6 ++
source4/scripting/python/wscript_build |2 +-
3 files changed, 35 insertions(+), 1 deletions(-)
create mode 100644 lib/tevent/tevent.py
Changeset truncated at 500 lines:
diff --git a/lib/tevent/tevent.py b/lib/tevent/tevent.py
new file mode 100644
index 000..758ed48
--- /dev/null
+++ b/lib/tevent/tevent.py
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+#
+# Python integration for tevent
+#
+# Copyright (C) Jelmer Vernooij 2011
+#
+# ** NOTE! The following LGPL license applies to the tevent
+# ** library. This does NOT imply that all of Samba is released
+# ** under the LGPL
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, see
http://www.gnu.org/licenses/.
+
+from _tevent import (
+backend_list,
+Context,
+Signal,
+)
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 5afaaca..d240630 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -97,6 +97,12 @@ def build(bld):
'pytevent.c',
deps='tevent',
realname='_tevent.so')
+# install out various python scripts for use by make test
+bld.SAMBA_SCRIPT('tevent_python',
+ pattern='tevent.py',
+ installdir='python')
+
+bld.INSTALL_WILDCARD('${PYTHONDIR}', 'tevent.py', flat=False)
def test(ctx):
diff --git a/source4/scripting/python/wscript_build
b/source4/scripting/python/wscript_build
index 8879f75..73f7ae8 100644
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -36,4 +36,4 @@ bld.SAMBA_SCRIPT('samba_python',
pattern='samba/**/*.py',
installdir='python')
-bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'samba/**/*.py', flat=False)
+bld.INSTALL_WILDCARD('${PYTHONDIR}', 'samba/**/*.py', flat=False)
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via dbbb626 s4-dns Use match-by-key in GSSAPI server if principal is
not specified
via 0344e72 auth: Allow a NULL principal to be obtained from the
credentials
via b9f4feb dlz_bind9: Add command line options for URL and debug
via de9a4ca dlz_bind9: Set debugging output to stderr
via ce19bfc dlz_bind9: Use client supplied credentials for DNS record
update
via d3d365d dlz_bind9: For creating a child entry, use only
SEC_ADS_CREATE_CHILD
from 817f752 tevent: Install python tevent modules.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit dbbb626dc0ad7b0100aec3ee3a787e1ac18f528a
Author: Andrew Bartlett abart...@samba.org
Date: Tue Dec 6 14:18:41 2011 +1100
s4-dns Use match-by-key in GSSAPI server if principal is not specified
This allows dlz_bind9 to match on exactly the same key as bind9 itself
Andrew Bartlett
Autobuild-User: Amitay Isaacs ami...@samba.org
Autobuild-Date: Wed Dec 7 02:20:10 CET 2011 on sn-devel-104
commit 0344e7278b5ddaba0efd7b31a894e901bd9ef6fb
Author: Andrew Bartlett abart...@samba.org
Date: Tue Dec 6 15:56:44 2011 +1100
auth: Allow a NULL principal to be obtained from the credentials
This is important when trying to let GSSAPI search the keytab.
Andrew Bartlett
commit b9f4febd405c9ed8c5386cedeb3190aa395b41c4
Author: Amitay Isaacs ami...@gmail.com
Date: Tue Dec 6 12:01:42 2011 +1100
dlz_bind9: Add command line options for URL and debug
To specify debug level, use -d level in named.conf.
To specify sam db, use -H path/to/sam.ldb in named.conf.
The default log level is set to 0. The log level specified in smb.conf
is not used. To set log level, use -d option.
commit de9a4ca831a0928044d7a2bc6d9801d92e23e5d9
Author: Amitay Isaacs ami...@gmail.com
Date: Tue Dec 6 10:51:01 2011 +1100
dlz_bind9: Set debugging output to stderr
commit ce19bfcc6bcbd266c8696b97128d9dd89a2d3bf6
Author: Amitay Isaacs ami...@gmail.com
Date: Wed Nov 30 16:06:08 2011 +1100
dlz_bind9: Use client supplied credentials for DNS record update
This creates the DNS records with correct owner and group settings.
commit d3d365daab18245ee5f6c2a2de54b9ba00c47f6e
Author: Amitay Isaacs ami...@gmail.com
Date: Wed Nov 30 10:37:14 2011 +1100
dlz_bind9: For creating a child entry, use only SEC_ADS_CREATE_CHILD
The member servers in AD do not have access to modify the parent, but
do have access to create child DNS records.
---
Summary of changes:
auth/credentials/credentials_krb5.c | 12 ++-
source4/auth/gensec/gensec_krb5.c |5 +-
source4/auth/kerberos/kerberos_util.c | 12 ++-
source4/dns_server/dlz_bind9.c| 146 ++---
source4/dns_server/wscript_build |2 +-
5 files changed, 139 insertions(+), 38 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/credentials/credentials_krb5.c
b/auth/credentials/credentials_krb5.c
index 1b7be3f..1e5600c 100644
--- a/auth/credentials/credentials_krb5.c
+++ b/auth/credentials/credentials_krb5.c
@@ -794,9 +794,15 @@ _PUBLIC_ int cli_credentials_get_server_gss_creds(struct
cli_credentials *cred,
return ENOMEM;
}
- /* This creates a GSSAPI cred_id_t with the principal and keytab set */
- maj_stat = gss_krb5_import_cred(min_stat, NULL, princ, ktc-keytab,
- gcc-creds);
+ if (obtained CRED_SPECIFIED) {
+ /* This creates a GSSAPI cred_id_t with the principal and
keytab set */
+ maj_stat = gss_krb5_import_cred(min_stat, NULL, NULL,
ktc-keytab,
+ gcc-creds);
+ } else {
+ /* This creates a GSSAPI cred_id_t with the principal and
keytab set */
+ maj_stat = gss_krb5_import_cred(min_stat, NULL, princ,
ktc-keytab,
+ gcc-creds);
+ }
if (maj_stat) {
if (min_stat) {
ret = min_stat;
diff --git a/source4/auth/gensec/gensec_krb5.c
b/source4/auth/gensec/gensec_krb5.c
index 2a3bd22..0c86177 100644
--- a/source4/auth/gensec/gensec_krb5.c
+++ b/source4/auth/gensec/gensec_krb5.c
@@ -521,7 +521,10 @@ static NTSTATUS gensec_krb5_update(struct gensec_security
*gensec_security,
return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
}
- /* This ensures we lookup the correct entry in that keytab */
+ /* This ensures we lookup the correct entry in that
+* keytab. A NULL principal is acceptable, and means
+* that the krb5 libs should search the keytab at
+*
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 3adc4f5 selftest: samba4.samba-tool.domopen now passes, so do not skip via 2da506e s4-selftest re-enable nsstest on libnss_winbind.so via 8d3e92d s4-kdc: only build hdb plugin if we build against system Heimdal via f8e26c6 clarify Roadmap, as the shape of Samba 4.0 is much clearer now via 6092517 Remove outdated information from the README via 650bd5e s4-dnsupdate: Do not attempt to add the PDC names if we are not a PDC via d8f9893 pydsdb: provide a am_pdc hook like am_rodc to python scripts from dbbb626 s4-dns Use match-by-key in GSSAPI server if principal is not specified http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3adc4f5545cba9ba1b328fedbefede0a65852c52 Author: Andrew Bartlett abart...@samba.org Date: Wed Dec 7 12:56:50 2011 +1100 selftest: samba4.samba-tool.domopen now passes, so do not skip Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Wed Dec 7 04:42:02 CET 2011 on sn-devel-104 commit 2da506ee66111ea52e7e3f211392bcaf707e0f6a Author: Andrew Bartlett abart...@samba.org Date: Wed Dec 7 12:51:59 2011 +1100 s4-selftest re-enable nsstest on libnss_winbind.so commit 8d3e92d0430ec994d22ddd96babb430f8beb9315 Author: Andrew Bartlett abart...@samba.org Date: Wed Dec 7 11:43:01 2011 +1100 s4-kdc: only build hdb plugin if we build against system Heimdal It is not safe to have a system kadmin use our plugin if we do not share the same libkrb5. Andrew Bartlett commit f8e26c6920420aa072ef337ec5f7f5c40ba0f2e4 Author: Andrew Bartlett abart...@samba.org Date: Thu Nov 10 10:02:15 2011 +1100 clarify Roadmap, as the shape of Samba 4.0 is much clearer now commit 60925179c96cfa717396b059a3c44895ed7ef8ef Author: Andrew Bartlett abart...@samba.org Date: Thu Nov 10 09:59:57 2011 +1100 Remove outdated information from the README commit 650bd5e718a603b3cbcd503db6fe4150d2cf8369 Author: Andrew Bartlett abart...@samba.org Date: Wed Dec 7 09:57:07 2011 +1100 s4-dnsupdate: Do not attempt to add the PDC names if we are not a PDC commit d8f98933fd35bb10f064edaa1a4ac8d89c6e83bc Author: Andrew Bartlett abart...@samba.org Date: Wed Dec 7 09:56:31 2011 +1100 pydsdb: provide a am_pdc hook like am_rodc to python scripts --- Summary of changes: README | 36 +++--- Roadmap | 14 --- selftest/skip |2 - source4/dsdb/pydsdb.c | 22 +++ source4/kdc/wscript_build |1 + source4/scripting/bin/samba_dnsupdate | 16 + source4/scripting/python/samba/samdb.py |4 +++ source4/selftest/tests.py |2 +- testprogs/blackbox/nsstest.sh | 22 +++ 9 files changed, 75 insertions(+), 44 deletions(-) create mode 100755 testprogs/blackbox/nsstest.sh Changeset truncated at 500 lines: diff --git a/README b/README index ea75cc0..6c842c3 100644 --- a/README +++ b/README @@ -61,7 +61,7 @@ a complete replacement for Windows NT, Warp, NFS or Netware servers. - a SMB server, to provide Windows NT and LAN Manager-style file and print services to SMB clients such as Windows 95, Warp Server, smbfs and others. -- a Windows NT 4.0 Domain Controller replacement. +- a Windows Domain Controller (NT4 and AD) replacement. - a file/print server that can act as a member of a Windows NT 4.0 or Active Directory domain. @@ -82,14 +82,14 @@ http://samba.org/samba, and browse the user survey. Related packages include: -- smbfs, a Linux-only filesystem allowing you to mount remote SMB - filesystems from PCs on your Linux box. This is included as standard with - Linux 2.0 and later. - -- cifsvfs, a more advanced Linux-only filesystem allowing you to mount +- cifsvfs, an advanced Linux-only filesystem allowing you to mount remote SMB filesystems from PCs on your Linux box. This is included as standard with Linux 2.5 and later. +- smbfs, the previous Linux-only filesystem allowing you to mount remote SMB + filesystems from PCs on your Linux box. This is included as standard with + Linux 2.0 and later. + CONTRIBUTIONS @@ -105,20 +105,13 @@ on the various Samba mailing lists can be found at http://lists.samba.org/. You can also get the Samba sourcecode straight from the git repository - see http://wiki.samba.org/index.php/Using_Git_for_Samba_Development. -You could also send hardware/software/money/jewelry or pre-paid pizza -vouchers directly to Andrew. The pizza vouchers would be especially -welcome, in fact there is a special field in the survey for people who -have paid up their pizza :-) - If you like a particular
