Rev 5379: merge from upstream in
http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
Michael Adam
ma at sernet.de
Sun Jun 3 19:07:32 GMT 2007
At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
------------------------------------------------------------
revno: 5379
revision-id: ma at sernet.de-20070603190723-224q0v6t9b0okndn
parent: ma at sernet.de-20070602232613-1ohum1a444koaoeo
parent: metze at samba.org-20070603163110-bc1fydjxp5qr4qg0
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Sun 2007-06-03 21:07:23 +0200
message:
merge from upstream
added:
source/iniparser_build/ iniparser_build-20070603160029-8hjfwb4brph2pn1f-1
source/iniparser_build/dictionary.c dictionary.c-20070603160029-8hjfwb4brph2pn1f-2
source/iniparser_build/iniparser.c iniparser.c-20070603160029-8hjfwb4brph2pn1f-3
source/iniparser_build/strlib.c strlib.c-20070603160029-8hjfwb4brph2pn1f-4
modified:
REVISION REVISION-20060530022625-68239662668b41c3
source/Makefile.in Makefile.in-20060530022626-b16dac2328ebe703
source/lib/dbwrap_tdb.c dbwrap_tdb.c-20070510110204-r3qybke0030vfwde-1
source/nsswitch/winbindd_cache.c winbindd_cache.c-20060530022627-45b83e217d38566d
------------------------------------------------------------
revno: 5275.1.774
merged: metze at samba.org-20070603163110-bc1fydjxp5qr4qg0
parent: metze at samba.org-20070603160032-jpw6l1rj17bfa00m
committer: metze at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Sun 2007-06-03 11:31:10 -0500
message:
metze at samba.org (r23315) 2007-06-03 11:21:40 -0500 (Sun, 03 Jun 2007)
- don't use the builtin and -liniparser together in bin/net
- unify handling on @BUILD_INIPARSER@
btw: nsswitch/pam_winbind.c doesn't compile anymore on SuSE 10.2!
I think we should build pam modules by default to notice things
like this in the build-farm...
metze
------------------------------------------------------------
revno: 5275.1.773
merged: metze at samba.org-20070603160032-jpw6l1rj17bfa00m
parent: vlendec at samba.org-20070603070110-cuazddmzym63nrx9
committer: metze at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Sun 2007-06-03 11:00:32 -0500
message:
metze at samba.org (r23314) 2007-06-03 10:51:09 -0500 (Sun, 03 Jun 2007)
For some systems it's needed to inject replace.h into
the iniparser source code, I do it in a way we can still have
a unmodified copy of iniparser in source/iniparser/
and have the wrapper stuff in source/iniparser_build/.
If the build-farm is happy with this I'll merge it to 3_0_26
tomorrow...
metze
------------------------------------------------------------
revno: 5275.1.772
merged: vlendec at samba.org-20070603070110-cuazddmzym63nrx9
parent: jpeach at samba.org-20070602211552-k2ixcuyxyo7lubnx
committer: vlendec at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Sun 2007-06-03 02:01:10 -0500
message:
vlendec at samba.org (r23313) 2007-06-03 01:54:51 -0500 (Sun, 03 Jun 2007)
Janitor for tridge:
we need to use tdb_wrap_open in both these backends to allow for
multiple opens. This is done for notify.tdb. Otherwise we die when a
2nd share with notify is setup
------------------------------------------------------------
revno: 5275.1.771
merged: jpeach at samba.org-20070602211552-k2ixcuyxyo7lubnx
parent: metze at samba.org-20070602091615-xqyv9sa9e5bvil52
committer: jpeach at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Sat 2007-06-02 16:15:52 -0500
message:
jpeach at samba.org (r23312) 2007-06-02 16:12:47 -0500 (Sat, 02 Jun 2007)
As per Volker, rename the "windbind:ads" parameter "winbind:rpc only".
=== added directory 'source/iniparser_build'
=== added file 'source/iniparser_build/dictionary.c'
--- a/source/iniparser_build/dictionary.c 1970-01-01 00:00:00 +0000
+++ b/source/iniparser_build/dictionary.c 2007-06-03 16:00:32 +0000
@@ -0,0 +1,7 @@
+/*
+ for someplatforms it's needed to inject replace.h into
+ the iniparser source code
+ --metze
+*/
+#include "lib/replace/replace.h"
+#include "iniparser/src/dictionary.c"
=== added file 'source/iniparser_build/iniparser.c'
--- a/source/iniparser_build/iniparser.c 1970-01-01 00:00:00 +0000
+++ b/source/iniparser_build/iniparser.c 2007-06-03 16:00:32 +0000
@@ -0,0 +1,7 @@
+/*
+ for someplatforms it's needed to inject replace.h into
+ the iniparser source code
+ --metze
+*/
+#include "lib/replace/replace.h"
+#include "iniparser/src/iniparser.c"
=== added file 'source/iniparser_build/strlib.c'
--- a/source/iniparser_build/strlib.c 1970-01-01 00:00:00 +0000
+++ b/source/iniparser_build/strlib.c 2007-06-03 16:00:32 +0000
@@ -0,0 +1,7 @@
+/*
+ for someplatforms it's needed to inject replace.h into
+ the iniparser source code
+ --metze
+*/
+#include "lib/replace/replace.h"
+#include "iniparser/src/strlib.c"
=== modified file 'REVISION'
--- a/REVISION 2007-06-02 09:16:15 +0000
+++ b/REVISION 2007-06-03 16:31:10 +0000
@@ -2,9 +2,9 @@
URL: file:///home/drizzt/jerry/src/svn/samba/branches/SAMBA_3_0
Repository Root: file:///home/drizzt/jerry/src/svn/samba
Repository UUID: 0c0555d6-39d7-0310-84fc-f1cc0bd64818
-Revision: 23309
+Revision: 23315
Node Kind: directory
Last Changed Author: metze
-Last Changed Rev: 23309
-Last Changed Date: 2007-06-02 04:10:08 -0500 (Sat, 02 Jun 2007)
+Last Changed Rev: 23315
+Last Changed Date: 2007-06-03 11:21:40 -0500 (Sun, 03 Jun 2007)
=== modified file 'source/Makefile.in'
--- a/source/Makefile.in 2007-06-02 23:26:13 +0000
+++ b/source/Makefile.in 2007-06-03 19:07:23 +0000
@@ -634,7 +634,7 @@
$(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ)
PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
- $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) @BUILD_INIPARSER@
+ $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ)
LIBSMBCLIENT_OBJ = libsmb/libsmbclient.o libsmb/libsmb_compat.o \
libsmb/libsmb_cache.o \
@@ -732,7 +732,7 @@
$(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
$(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \
$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(REGFIO_OBJ) $(READLINE_OBJ) \
- $(LDB_OBJ) $(LIBGPO_OBJ) $(INIPARSER_OBJ) $(DISPLAY_SEC_OBJ)
+ $(LDB_OBJ) $(LIBGPO_OBJ) $(DISPLAY_SEC_OBJ)
CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ) \
@@ -981,8 +981,8 @@
POPT_OBJ=popt/findme.o popt/popt.o popt/poptconfig.o \
popt/popthelp.o popt/poptparse.o
-INIPARSER_OBJ = iniparser/src/iniparser.o iniparser/src/dictionary.o \
- iniparser/src/strlib.o
+INIPARSER_OBJ = iniparser_build/iniparser.o iniparser_build/dictionary.o \
+ iniparser_build/strlib.o
TDBBACKUP_OBJ = lib/tdb/tools/tdbbackup.o $(LIBREPLACE_OBJ) \
$(TDBBASE_OBJ) $(SOCKET_WRAPPER_OBJ)
@@ -1561,7 +1561,7 @@
$(LDAP_LIBS) $(LIBS) -lcom_err \
@SONAMEFLAG@`basename $@`
-bin/pam_winbind. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ)
+bin/pam_winbind. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) @BUILD_INIPARSER@
@echo "Linking shared library $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ $(GPLIBS) \
@SONAMEFLAG@`basename $@`
=== modified file 'source/lib/dbwrap_tdb.c'
--- a/source/lib/dbwrap_tdb.c 2007-05-29 18:35:39 +0000
+++ b/source/lib/dbwrap_tdb.c 2007-06-03 07:01:10 +0000
@@ -21,7 +21,7 @@
#include "includes.h"
struct db_tdb_ctx {
- TDB_CONTEXT *tdb;
+ struct tdb_wrap *wtdb;
};
static NTSTATUS db_tdb_store(struct db_record *rec, TDB_DATA data, int flag);
@@ -36,7 +36,7 @@
hex_encode(data, (unsigned char *)data->key.dptr,
data->key.dsize)));
- if (tdb_chainunlock(ctx->tdb, data->key) != 0) {
+ if (tdb_chainunlock(ctx->wtdb->tdb, data->key) != 0) {
DEBUG(0, ("tdb_chainunlock failed\n"));
return -1;
}
@@ -78,7 +78,7 @@
TALLOC_FREE(keystr);
}
- if (tdb_chainlock(ctx->tdb, key) != 0) {
+ if (tdb_chainlock(ctx->wtdb->tdb, key) != 0) {
DEBUG(3, ("tdb_chainlock failed\n"));
TALLOC_FREE(result);
return NULL;
@@ -86,7 +86,7 @@
talloc_set_destructor(result, db_tdb_record_destr);
- value = tdb_fetch(ctx->tdb, key);
+ value = tdb_fetch(ctx->wtdb->tdb, key);
if (value.dptr == NULL) {
return result;
@@ -119,7 +119,7 @@
* anymore after it was stored.
*/
- return (tdb_store(ctx->tdb, rec->key, data, flag) == 0) ?
+ return (tdb_store(ctx->wtdb->tdb, rec->key, data, flag) == 0) ?
NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
}
@@ -129,13 +129,13 @@
struct db_tdb_ctx);
int res;
- res = tdb_delete(ctx->tdb, rec->key);
+ res = tdb_delete(ctx->wtdb->tdb, rec->key);
if (res == 0) {
return NT_STATUS_OK;
}
- return map_nt_error_from_tdb(tdb_error(ctx->tdb));
+ return map_nt_error_from_tdb(tdb_error(ctx->wtdb->tdb));
}
struct db_tdb_traverse_ctx {
@@ -171,7 +171,7 @@
ctx.db = db;
ctx.f = f;
ctx.private_data = private_data;
- return tdb_traverse(db_ctx->tdb, db_tdb_traverse_func, &ctx);
+ return tdb_traverse(db_ctx->wtdb->tdb, db_tdb_traverse_func, &ctx);
}
static NTSTATUS db_tdb_store_deny(struct db_record *rec, TDB_DATA data, int flag)
@@ -211,7 +211,7 @@
ctx.db = db;
ctx.f = f;
ctx.private_data = private_data;
- return tdb_traverse_read(db_ctx->tdb, db_tdb_traverse_read_func, &ctx);
+ return tdb_traverse_read(db_ctx->wtdb->tdb, db_tdb_traverse_read_func, &ctx);
}
static int db_tdb_get_seqnum(struct db_context *db)
@@ -219,17 +219,7 @@
{
struct db_tdb_ctx *db_ctx =
talloc_get_type_abort(db->private_data, struct db_tdb_ctx);
- return tdb_get_seqnum(db_ctx->tdb);
-}
-
-static int db_tdb_ctx_destr(struct db_tdb_ctx *ctx)
-{
- if (tdb_close(ctx->tdb) != 0) {
- DEBUG(0, ("Failed to close tdb: %s\n", strerror(errno)));
- return -1;
- }
-
- return 0;
+ return tdb_get_seqnum(db_ctx->wtdb->tdb);
}
struct db_context *db_open_tdb(TALLOC_CTX *mem_ctx,
@@ -252,14 +242,13 @@
goto fail;
}
- db_tdb->tdb = tdb_open_log(name, hash_size, tdb_flags,
- open_flags, mode);
- if (db_tdb->tdb == NULL) {
+ db_tdb->wtdb = tdb_wrap_open(db_tdb, name, hash_size, tdb_flags,
+ open_flags, mode);
+ if (db_tdb->wtdb == NULL) {
DEBUG(3, ("Could not open tdb: %s\n", strerror(errno)));
goto fail;
}
- talloc_set_destructor(db_tdb, db_tdb_ctx_destr);
result->fetch_locked = db_tdb_fetch_locked;
result->traverse = db_tdb_traverse;
result->traverse_read = db_tdb_traverse_read;
=== modified file 'source/nsswitch/winbindd_cache.c'
--- a/source/nsswitch/winbindd_cache.c 2007-06-01 18:46:00 +0000
+++ b/source/nsswitch/winbindd_cache.c 2007-06-02 21:15:52 +0000
@@ -133,9 +133,6 @@
static struct winbind_cache *get_cache(struct winbindd_domain *domain)
{
struct winbind_cache *ret = wcache;
-#ifdef HAVE_ADS
- struct winbindd_domain *our_domain = domain;
-#endif
/* We have to know what type of domain we are dealing with first. */
@@ -163,6 +160,8 @@
if (!domain->backend) {
#ifdef HAVE_ADS
+ struct winbindd_domain *our_domain = domain;
+
/* find our domain first so we can figure out if we
are joined to a kerberized domain */
@@ -171,7 +170,7 @@
if ((our_domain->active_directory || IS_DC)
&& domain->active_directory
- && lp_parm_bool(-1, "winbind", "ads", True)) {
+ && !lp_parm_bool(-1, "winbind", "rpc only", False)) {
DEBUG(5,("get_cache: Setting ADS methods for domain %s\n", domain->name));
domain->backend = &ads_methods;
} else {
More information about the samba-cvs
mailing list