[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f6b7bd4 lib/util: consolidate module loading via 355b5e3 modules: standardise on samba_init_module as the hook symbol to resolve via a718b5a lib/util: Use only init_module_fn typedef in module loading via c894527 lib/util: Remove unused module loading functions via 7d33ec3 lib/util: consolidate module loading into common code via 040055b s3-module allow libreplace to provide dlopen replacement from 3fca66e samba-tool: add support for fixing broken backlinks in dbcheck http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f6b7bd4a01205e442d3aa06d8edc3634a12945b2 Author: Andrew Bartlett Date: Fri Sep 9 22:41:28 2011 +1000 lib/util: consolidate module loading Autobuild-User: Andrew Bartlett Autobuild-Date: Thu Oct 6 08:52:30 CEST 2011 on sn-devel-104 commit 355b5e3a831415d9bef97de4b2d83e353de4ab0f Author: Andrew Bartlett Date: Fri Sep 9 22:25:43 2011 +1000 modules: standardise on samba_init_module as the hook symbol to resolve commit a718b5a4f1ebfb63aec2f43b654d8e97f099fe85 Author: Andrew Bartlett Date: Fri Sep 9 22:18:42 2011 +1000 lib/util: Use only init_module_fn typedef in module loading commit c8945279e72aee5511739b2ce0d7ddd5535fd1cb Author: Andrew Bartlett Date: Fri Sep 9 22:10:12 2011 +1000 lib/util: Remove unused module loading functions commit 7d33ec3dfe78723d62f4941684060baeb9c4bda6 Author: Andrew Bartlett Date: Fri Sep 9 21:24:49 2011 +1000 lib/util: consolidate module loading into common code This creates a samba-modules private libary that handles the details. Andrew Bartlett commit 040055bb6a578516007ab6f56ebe2ee77b0f8605 Author: Andrew Bartlett Date: Fri Sep 9 20:29:32 2011 +1000 s3-module allow libreplace to provide dlopen replacement Given that we have replacement dlopen() etc, use this from libreplace. The dlerror() from libreplace gives a good error if the platform really does not have dlopen(). Andrew Bartlett --- Summary of changes: lib/util/modules.c | 240 +++ lib/util/samba_modules.h| 59 + lib/util/wscript_build |6 + source3/Makefile.in |2 +- source3/exports/modules-darwin.syms |2 +- source3/include/includes.h |2 +- source3/include/module.h| 28 source3/include/proto.h | 11 +-- source3/lib/module.c| 144 - source3/lib/util.c |9 ++ source3/m4/aclocal.m4 |2 +- source3/modules/perfcount_test.c|2 +- source3/wscript |2 +- source3/wscript_build |2 +- source4/auth/gensec/gensec_start.c |1 + source4/auth/gensec/wscript_build |2 +- source4/auth/ntlm/auth.c|1 + source4/auth/ntlm/wscript_build |2 +- source4/ntptr/ntptr_base.c |1 + source4/ntvfs/ntvfs_base.c |1 + source4/ntvfs/posix/pvfs_acl.c |1 + source4/ntvfs/posix/wscript_build |2 +- source4/ntvfs/sysdep/sys_lease.c|1 + source4/ntvfs/sysdep/sys_notify.c |1 + source4/ntvfs/wscript_build |2 +- source4/param/param.h | 32 - source4/param/share.c |1 + source4/param/util.c| 104 --- source4/param/wscript_build |2 +- source4/rpc_server/dcerpc_server.c |1 + source4/smbd/process_model.c|1 + source4/smbd/server.c |1 + source4/smbd/wscript_build |2 +- source4/torture/smbtorture.c|3 +- source4/torture/torture.c |1 + 35 files changed, 342 insertions(+), 332 deletions(-) create mode 100644 lib/util/modules.c create mode 100644 lib/util/samba_modules.h delete mode 100644 source3/include/module.h Changeset truncated at 500 lines: diff --git a/lib/util/modules.c b/lib/util/modules.c new file mode 100644 index 000..52a04be --- /dev/null +++ b/lib/util/modules.c @@ -0,0 +1,240 @@ +/* + Unix SMB/CIFS implementation. + Samba utility functions + Copyright (C) Jelmer Vernooij 2002-2003,2005-2007 + Copyright (C) Stefan (metze) Metzmacher 2003 + Copyright (C) Andrew Bartlett 2011 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program 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. S
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 3fca66e samba-tool: add support for fixing broken backlinks in dbcheck via d7f617e s4-dsdb: allow deletion of backlinks if DSDB_CONTROL_DBCHECK given via c2d70af s4-dsdb: added DSDB_CONTROL_DBCHECK via ea41860 ldb: support raw OIDs in control string parsing via b3476f0 ldb: fixed memory leak in control string parsing via 2d63789 s4-dsdb: allow groupType update on deleted objects via 8976e1d s4-rodc: use the rodc_replica flag on the partition via 2a2deeb s4-rodc: ensure we load replicated partitions for RODCs from e717af0 s4-dsdb: Do not assume that all deleted objects have an objectCategory and sAMAccountType http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3fca66e2b343c6386476a52832591ae4e435d6b2 Author: Andrew Tridgell Date: Thu Oct 6 14:21:41 2011 +1100 samba-tool: add support for fixing broken backlinks in dbcheck this allows dangling backlinks to be removed Pair-Programmed-With: Andrew Bartlett Autobuild-User: Andrew Tridgell Autobuild-Date: Thu Oct 6 07:08:35 CEST 2011 on sn-devel-104 commit d7f617e2e180eab6decb18e697f1e1294194a2cb Author: Andrew Tridgell Date: Thu Oct 6 14:21:02 2011 +1100 s4-dsdb: allow deletion of backlinks if DSDB_CONTROL_DBCHECK given Pair-Programmed-With: Andrew Bartlett commit c2d70af1a7b0a67283837a9f823158fd7f8db574 Author: Andrew Tridgell Date: Thu Oct 6 14:20:25 2011 +1100 s4-dsdb: added DSDB_CONTROL_DBCHECK this will be used for overrides by the dbcheck validator Pair-Programmed-With: Andrew Bartlett commit ea41860d32d38448e08cefd79d30ee1150317a9e Author: Andrew Tridgell Date: Thu Oct 6 14:19:24 2011 +1100 ldb: support raw OIDs in control string parsing this makes it possible to use a raw OID string on the command line or in python scripts Pair-Programmed-With: Andrew Bartlett commit b3476f00a621cf2d5d547ed479acf91b5cc0679c Author: Andrew Tridgell Date: Thu Oct 6 14:18:49 2011 +1100 ldb: fixed memory leak in control string parsing if parsing fails, free ctrl Pair-Programmed-With: Andrew Bartlett commit 2d63789e4869c147364d4e58c678a0c08b2e6859 Author: Andrew Tridgell Date: Thu Oct 6 12:31:21 2011 +1100 s4-dsdb: allow groupType update on deleted objects this allows dbcheck to fix groupType on objects that have been deleted Pair-Programmed-With: Andrew Bartlett commit 8976e1d50d6dc6633af82e05afe51ef41b61c66c Author: Andrew Tridgell Date: Thu Oct 6 11:24:28 2011 +1100 s4-rodc: use the rodc_replica flag on the partition this sets DSDB_REPL_FLAG_PARTIAL_REPLICA when replicating a RODC partition, which tells the replication code to map instanceType to remove the INSTANCE_TYPE_WRITE bit Pair-Programmed-With: Andrew Bartlett commit 2a2deeb3b43dcb11f2b604bdd20c1183e87522bb Author: Andrew Tridgell Date: Thu Oct 6 11:14:13 2011 +1100 s4-rodc: ensure we load replicated partitions for RODCs Pair-Programmed-With: Andrew Bartlett --- Summary of changes: lib/ldb/common/ldb_controls.c | 42 + lib/ldb/include/ldb_private.h |1 + source4/dsdb/pydsdb.c |1 + source4/dsdb/repl/drepl_out_helpers.c |4 +- source4/dsdb/repl/drepl_partitions.c | 89 +--- source4/dsdb/repl/drepl_service.h |2 +- source4/dsdb/samdb/ldb_modules/objectclass_attrs.c |3 +- source4/dsdb/samdb/ldb_modules/repl_meta_data.c|3 + source4/dsdb/samdb/ldb_modules/samldb.c|3 +- source4/dsdb/samdb/samdb.h |3 + source4/scripting/python/samba/dbchecker.py| 52 +++- source4/setup/schema_samba4.ldif |1 + 12 files changed, 129 insertions(+), 75 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/ldb/common/ldb_controls.c b/lib/ldb/common/ldb_controls.c index 3856167..42fabfc 100644 --- a/lib/ldb/common/ldb_controls.c +++ b/lib/ldb/common/ldb_controls.c @@ -428,6 +428,7 @@ struct ldb_control *ldb_parse_control_from_string(struct ldb_context *ldb, TALLO error_string = talloc_asprintf_append(error_string, " note: b = boolean, n = number, s = string, o = b64 binary blob"); ldb_set_errstring(ldb, error_string); talloc_free(error_string); + talloc_free(ctrl); return NULL; } ctrl->oid = LDB_CONTROL_VLV_REQ_OID; @@ -435,6 +436,7 @@ struct ldb_control *ldb_parse_control_from_string(struct ldb_context *ldb, TALLO
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e717af0 s4-dsdb: Do not assume that all deleted objects have an
objectCategory and sAMAccountType
via f55328a dsdb: Do not attempt to resolve conflicts on an RODC
via 5505418 dsdb: fix double-free in replication failure case on RODC
via 5c5d869 s4-dsdb Allow repl server to start even when no master NCs
are present
from 2d6571d Add missing com_err dependencies Signed-off-by: Jelmer
Vernooij
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e717af030146db7bc298a581b030cb7535614e0f
Author: Andrew Bartlett
Date: Fri Sep 30 14:33:38 2011 -0700
s4-dsdb: Do not assume that all deleted objects have an objectCategory and
sAMAccountType
Autobuild-User: Andrew Bartlett
Autobuild-Date: Thu Oct 6 03:43:13 CEST 2011 on sn-devel-104
commit f55328a295b4fb11bea8efcd73e3573deb21
Author: Andrew Bartlett
Date: Thu Sep 29 18:56:38 2011 -0700
dsdb: Do not attempt to resolve conflicts on an RODC
commit 55054182b2989c6432e20a61c9b281596d5682ef
Author: Andrew Bartlett
Date: Thu Sep 29 18:53:51 2011 -0700
dsdb: fix double-free in replication failure case on RODC
commit 5c5d86997593fd7ed9efc0f214f2e978c13083ac
Author: Andrew Bartlett
Date: Thu Sep 29 17:05:38 2011 -0700
s4-dsdb Allow repl server to start even when no master NCs are present
---
Summary of changes:
source4/dsdb/repl/drepl_partitions.c|8 +-
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 34 +++---
2 files changed, 30 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/repl/drepl_partitions.c
b/source4/dsdb/repl/drepl_partitions.c
index 934c75e..7c54245 100644
--- a/source4/dsdb/repl/drepl_partitions.c
+++ b/source4/dsdb/repl/drepl_partitions.c
@@ -63,14 +63,8 @@ WERROR dreplsrv_load_partitions(struct dreplsrv_service *s)
}
el = ldb_msg_find_element(res->msgs[0], "hasMasterNCs");
- if (!el) {
- DEBUG(1,("Finding hasMasterNCs element in root_res failed:
%s\n",
-ldb_errstring(s->samdb)));
- talloc_free(tmp_ctx);
- return WERR_DS_DRA_INTERNAL_ERROR;
- }
- for (i=0; inum_values; i++) {
+ for (i=0; el && inum_values; i++) {
struct ldb_dn *pdn;
struct dreplsrv_partition *p;
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 7a64242..fff542a 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -2560,7 +2560,7 @@ static int replmd_rename_callback(struct ldb_request
*req, struct ldb_reply *are
lpcfg_dnsdomain(lp_ctx),
ldb_dn_get_linearized(olddn));
ret = ldb_module_send_referral(req, referral);
- talloc_free(ac);
+ talloc_free(ares);
return ldb_module_done(req, NULL, NULL, ret);
}
@@ -2931,14 +2931,14 @@ static int replmd_delete(struct ldb_module *module,
struct ldb_request *req)
}
msg->elements[el_count++].flags = LDB_FLAG_MOD_ADD;
- ret = ldb_msg_add_empty(msg, "objectCategory",
LDB_FLAG_MOD_DELETE, NULL);
+ ret = ldb_msg_add_empty(msg, "objectCategory",
LDB_FLAG_MOD_REPLACE, NULL);
if (ret != LDB_SUCCESS) {
talloc_free(tmp_ctx);
ldb_module_oom(module);
return ret;
}
- ret = ldb_msg_add_empty(msg, "sAMAccountType",
LDB_FLAG_MOD_DELETE, NULL);
+ ret = ldb_msg_add_empty(msg, "sAMAccountType",
LDB_FLAG_MOD_REPLACE, NULL);
if (ret != LDB_SUCCESS) {
talloc_free(tmp_ctx);
ldb_module_oom(module);
@@ -3286,7 +3286,7 @@ static int replmd_op_add_callback(struct ldb_request
*req, struct ldb_reply *are
const struct ldb_val *rmd_value, *omd_value;
struct replPropertyMetaDataBlob omd, rmd;
enum ndr_err_code ndr_err;
- bool rename_incoming_record;
+ bool rename_incoming_record, rodc;
struct replPropertyMetaData1 *rmd_name, *omd_name;
if (ares->error != LDB_ERR_ENTRY_ALREADY_EXISTS) {
@@ -3295,7 +3295,31 @@ static int replmd_op_add_callback(struct ldb_request
*req, struct ldb_reply *are
return replmd_op_callback(req, ares);
}
- /*
+ ret = samdb_rodc(ldb_module_get_ctx(ar->module), &rodc);
+ if (ret != LDB_SUCCESS) {
+ return ret;
+ }
+ /*
+* we have a conflict, and need to decide if we will keep the
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2d6571d Add missing com_err dependencies Signed-off-by: Jelmer
Vernooij
from 63319c1 s4-auth: fixed formatting of some DEBUG() lines
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2d6571d2e576ea628f8c16545d977431bc22e791
Author: Ewoud Kohl van Wijngaarden
Date: Thu Oct 6 00:36:46 2011 +0200
Add missing com_err dependencies
Signed-off-by: Jelmer Vernooij
Autobuild-User: Jelmer Vernooij
Autobuild-Date: Thu Oct 6 02:10:21 CEST 2011 on sn-devel-104
---
Summary of changes:
auth/kerberos/wscript_build |2 +-
nsswitch/wscript_build |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/kerberos/wscript_build b/auth/kerberos/wscript_build
index 1070770..2421b16 100644
--- a/auth/kerberos/wscript_build
+++ b/auth/kerberos/wscript_build
@@ -1,3 +1,3 @@
bld.SAMBA_SUBSYSTEM('KRB5_PAC',
source='gssapi_pac.c kerberos_pac.c',
-deps='gssapi_krb5 krb5 ndr-krb5pac')
+deps='gssapi_krb5 krb5 ndr-krb5pac com_err')
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 298da06..4e353d3 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -33,7 +33,7 @@ if bld.CONFIG_SET('WITH_PAM_MODULES') and
bld.CONFIG_SET('HAVE_PAM_START'):
if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
bld.SAMBA_LIBRARY('winbind_krb5_locator',
source='winbind_krb5_locator.c',
- deps='wbclient krb5',
+ deps='wbclient krb5 com_err',
realname='winbind_krb5_locator.so')
bld.SAMBA_SUBSYSTEM('WB_REQTRANS',
--
Samba Shared Repository
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 233f708 Link team pic from 2011; resize picture from 090d5a4 Add some more space between icon and text http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 233f708ed767338257bc26606bb3bc86d5f2382b Author: Lars Müller Date: Wed Oct 5 17:03:31 2011 +0200 Link team pic from 2011; resize picture --- Summary of changes: images/team2011-IMG_5607.JPG | Bin 0 -> 148097 bytes team/index.html |7 --- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 images/team2011-IMG_5607.JPG Changeset truncated at 500 lines: diff --git a/images/team2011-IMG_5607.JPG b/images/team2011-IMG_5607.JPG new file mode 100644 index 000..c44fdc2 Binary files /dev/null and b/images/team2011-IMG_5607.JPG differ diff --git a/team/index.html b/team/index.html index 6e6c783..000602a 100755 --- a/team/index.html +++ b/team/index.html @@ -11,16 +11,17 @@ actively doing Git checkins is approximately 10 - 15 people. Of course, there is always room to help. Here is a photo of some of us at the http://sambaXP.org/";>sambaXP - conference for users and developers in May 2009: + conference for users and developers in May 2011: - - + + Photos from + 2009, 2008, 2007, 2005, -- Samba Website Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 63319c1 s4-auth: fixed formatting of some DEBUG() lines
from f93fd12 Fix bug #8507 - smbd doesn't correctly honor the "force
create mode" bits from a cifsfs create.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 63319c169fdc599ffb5ade023b371815159d0fdd
Author: Andrew Tridgell
Date: Wed Oct 5 17:07:51 2011 +1100
s4-auth: fixed formatting of some DEBUG() lines
Autobuild-User: Andrew Tridgell
Autobuild-Date: Wed Oct 5 09:45:15 CEST 2011 on sn-devel-104
---
Summary of changes:
source4/auth/credentials/credentials_secrets.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/auth/credentials/credentials_secrets.c
b/source4/auth/credentials/credentials_secrets.c
index 86e31f4..d86032a 100644
--- a/source4/auth/credentials/credentials_secrets.c
+++ b/source4/auth/credentials/credentials_secrets.c
@@ -209,7 +209,7 @@ _PUBLIC_ NTSTATUS
cli_credentials_set_machine_account(struct cli_credentials *cr
SECRETS_PRIMARY_DOMAIN_DN,
filter, &error_string);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Could not find machine account in secrets database:
%s: %s", nt_errstr(status), error_string));
+ DEBUG(1, ("Could not find machine account in secrets database:
%s: %s\n", nt_errstr(status), error_string));
talloc_free(error_string);
}
return status;
@@ -238,7 +238,7 @@ NTSTATUS cli_credentials_set_krbtgt(struct cli_credentials
*cred,
SECRETS_PRINCIPALS_DN,
filter, &error_string);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Could not find krbtgt (master Kerberos) account in
secrets database: %s: %s", nt_errstr(status), error_string));
+ DEBUG(1, ("Could not find krbtgt (master Kerberos) account in
secrets database: %s: %s\n", nt_errstr(status), error_string));
talloc_free(error_string);
}
return status;
@@ -269,7 +269,7 @@ _PUBLIC_ NTSTATUS
cli_credentials_set_stored_principal(struct cli_credentials *c
SECRETS_PRINCIPALS_DN, filter,
&error_string);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Could not find %s principal in secrets database: %s:
%s", serviceprincipal, nt_errstr(status), error_string));
+ DEBUG(1, ("Could not find %s principal in secrets database: %s:
%s\n", serviceprincipal, nt_errstr(status), error_string));
}
return status;
}
--
Samba Shared Repository
