[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 95b56aa libcli/ldap: let ldap_full_packet() use asn1_peek_tag_needed_size() via 182a69c lib/util/asn1: add asn1_peek_tag_needed_size() and asn1_peek_full_tag() via e628bf1 libcli/util: let tstream_read_pdu_blob_* cope with variable length headers from 0b5a556 s4-kerberos Don't segfault if the password isn't specified in keytab generation http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 95b56aabcbfe2754a34eac627a6bc7226cbd3f17 Author: Stefan Metzmacher Date: Fri Sep 24 05:09:15 2010 +0200 libcli/ldap: let ldap_full_packet() use asn1_peek_tag_needed_size() This allows us to read a full packet without read byte after byte or possible read to much. metze commit 182a69c5be7706fbb542694c7be51d499b61c98d Author: Stefan Metzmacher Date: Thu Sep 23 18:10:28 2010 +0200 lib/util/asn1: add asn1_peek_tag_needed_size() and asn1_peek_full_tag() We need a way to ask for the length of a tag without having the full buffer yet. metze commit e628bf1081929684d888353101296cc17d9f3ae4 Author: Stefan Metzmacher Date: Wed Sep 22 20:31:06 2010 +0200 libcli/util: let tstream_read_pdu_blob_* cope with variable length headers metze --- Summary of changes: lib/util/asn1.c| 83 lib/util/asn1.h|2 + libcli/ldap/ldap_message.c |2 +- libcli/util/tstream.c | 18 +++--- 4 files changed, 99 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/asn1.c b/lib/util/asn1.c index 8f30cfe..c492334 100644 --- a/lib/util/asn1.c +++ b/lib/util/asn1.c @@ -489,6 +489,65 @@ bool asn1_peek_tag(struct asn1_data *data, uint8_t tag) return (b == tag); } +/* + * just get the needed size the tag would consume + */ +bool asn1_peek_tag_needed_size(struct asn1_data *data, uint8_t tag, size_t *size) +{ + off_t start_ofs = data->ofs; + uint8_t b; + size_t taglen = 0; + + if (data->has_error) { + return false; + } + + if (!asn1_read_uint8(data, &b)) { + data->ofs = start_ofs; + data->has_error = false; + return false; + } + + if (b != tag) { + data->ofs = start_ofs; + data->has_error = false; + return false; + } + + if (!asn1_read_uint8(data, &b)) { + data->ofs = start_ofs; + data->has_error = false; + return false; + } + + if (b & 0x80) { + int n = b & 0x7f; + if (!asn1_read_uint8(data, &b)) { + data->ofs = start_ofs; + data->has_error = false; + return false; + } + taglen = b; + while (n > 1) { + if (!asn1_read_uint8(data, &b)) { + data->ofs = start_ofs; + data->has_error = false; + return false; + } + taglen = (taglen << 8) | b; + n--; + } + } else { + taglen = b; + } + + *size = (data->ofs - start_ofs) + taglen; + + data->ofs = start_ofs; + data->has_error = false; + return true; +} + /* start reading a nested asn1 structure */ bool asn1_start_tag(struct asn1_data *data, uint8_t tag) { @@ -943,6 +1002,30 @@ NTSTATUS asn1_full_tag(DATA_BLOB blob, uint8_t tag, size_t *packet_size) if (size > blob.length) { return STATUS_MORE_ENTRIES; + } + + *packet_size = size; + return NT_STATUS_OK; +} + +NTSTATUS asn1_peek_full_tag(DATA_BLOB blob, uint8_t tag, size_t *packet_size) +{ + struct asn1_data asn1; + uint32_t size; + bool ok; + + ZERO_STRUCT(asn1); + asn1.data = blob.data; + asn1.length = blob.length; + + ok = asn1_peek_tag_needed_size(&asn1, tag, &size); + if (!ok) { + return STATUS_MORE_ENTRIES; + } + + if (size > blob.length) { + *packet_size = size; + return STATUS_MORE_ENTRIES; } *packet_size = size; diff --git a/lib/util/asn1.h b/lib/util/asn1.h index ded3244..266a9a3 100644 --- a/lib/util/asn1.h +++ b/lib/util/asn1.h @@ -79,6 +79,7 @@ bool asn1_peek(struct asn1_data *data, void *p, int len); bool asn1_read(struct asn1_data *data, void *p, int len); bool asn1_read_uint8(struct asn1_data *data, uint8_t *v); bool asn1_peek_uint8(struct asn1_data *data, uint8_t *v); +bool asn1_peek_tag_needed_size(struct asn1_data *data, uint8_t tag, size_t *size); bool asn1_
Build status as of Sun Sep 26 06:00:02 2010
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2010-09-25 00:00:07.0 -0600 +++ /home/build/master/cache/broken_results.txt 2010-09-26 00:00:10.0 -0600 @@ -1,4 +1,4 @@ -Build status as of Sat Sep 25 06:00:02 2010 +Build status as of Sun Sep 26 06:00:02 2010 Build counts: Tree Total Broken Panic @@ -16,7 +16,7 @@ samba_3_current 32 29 0 samba_3_master 32 27 0 samba_3_next 32 32 0 -samba_4_0_waf 35 31 0 +samba_4_0_waf 35 30 0 talloc 32 6 0 tdb 30 8 0
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 0b5a556 s4-kerberos Don't segfault if the password isn't specified in keytab generation from c680a42 upgradeprovision: fix a typo http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0b5a556b76f0d05457c1c370b0f81fba124190a3 Author: Andrew Bartlett Date: Sun Sep 26 12:34:58 2010 +1000 s4-kerberos Don't segfault if the password isn't specified in keytab generation Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Sun Sep 26 03:29:34 UTC 2010 on sn-devel-104 --- Summary of changes: source4/auth/kerberos/kerberos_util.c |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c index 37a5ae6..76edf0d 100644 --- a/source4/auth/kerberos/kerberos_util.c +++ b/source4/auth/kerberos/kerberos_util.c @@ -597,6 +597,13 @@ static krb5_error_code create_keytab(TALLOC_CTX *parent_ctx, /* Finally, do the dance to get the password to put in the entry */ password_s = ldb_msg_find_attr_as_string(msg, "secret", NULL); + + if (!password_s) { + /* There is no password here, so nothing to do */ + talloc_free(mem_ctx); + return 0; + } + if (add_old && kvno != 0) { old_secret = ldb_msg_find_attr_as_string(msg, "priorSecret", NULL); } else { -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via c680a42 upgradeprovision: fix a typo via 873bd98 upgradeprovision: Fix a bug with renamed entries via 43274c9 upgradeprovision: fix a bug with not updated links via a8f8f27 s4 provision: start with gpo of version 0 and be consistent between different policies via 76d87b7 s4 upgradeprovision: fix a bug with empty reference objects via 3c95d4d s4 upgradeprovision: Copy versionNumber if not present it helps to make gpo valid via dfa468f s4 provision: Make GPO folder group writable from 8a48ca4 s3: Remove talloc_autofree_context() from change_to_guest() http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit c680a42504f8a3924a594c0b8363665ab6b1f2f4 Author: Matthieu Patou Date: Sun Sep 26 04:58:37 2010 +0400 upgradeprovision: fix a typo commit 873bd989049e4953afb478ca5518984b26870326 Author: Matthieu Patou Date: Sun Sep 26 04:57:04 2010 +0400 upgradeprovision: Fix a bug with renamed entries The SD was not refetched for renamed entries, resulting with a try to add an additional SD when there was already one. commit 43274c9071ec357fe629fdfa7966a772d1844188 Author: Matthieu Patou Date: Sat Sep 25 07:36:12 2010 +0400 upgradeprovision: fix a bug with not updated links commit a8f8f277ff6c8dc9ea060e53c6debbd30dbd87f7 Author: Matthieu Patou Date: Tue Sep 7 17:57:52 2010 +0400 s4 provision: start with gpo of version 0 and be consistent between different policies commit 76d87b7fb51dfab8f85686bde7fed67701bc9092 Author: Matthieu Patou Date: Sat Sep 18 08:15:36 2010 +0400 s4 upgradeprovision: fix a bug with empty reference objects Thanks to lu...@eecs.qmul.ac.uk for poiting it to me commit 3c95d4d31347a2491d2c2f593f2e12f9a389e66c Author: Matthieu Patou Date: Tue Sep 7 17:50:39 2010 +0400 s4 upgradeprovision: Copy versionNumber if not present it helps to make gpo valid commit dfa468fd088b30ed1dfdbaabd6b569c600838706 Author: Matthieu Patou Date: Tue Sep 7 17:45:55 2010 +0400 s4 provision: Make GPO folder group writable The group of this folder is domain administrator and it seems sensible that all domain administrators have the right to modify the gpo (they have it at the NT ACLs level ...) --- Summary of changes: source4/scripting/bin/upgradeprovision | 34 +- source4/scripting/python/samba/provision.py |8 +++--- source4/setup/provision_group_policy.ldif |4 +- 3 files changed, 33 insertions(+), 13 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index 6697c82..c7dd4f8 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -88,7 +88,7 @@ hashAttrNotCopied = { "dn": 1, "whenCreated": 1, "whenChanged": 1, "distinguishedName": 1, "nTMixedDomain": 1, "showInAdvancedViewOnly": 1, "instanceType": 1, "msDS-Behavior-Version":1, "nextRid":1, "cn": 1, -"versionNumber":1, "lmPwdHistory":1, "pwdLastSet": 1, +"lmPwdHistory":1, "pwdLastSet": 1, "ntPwdHistory":1, "unicodePwd":1,"dBCSPwd":1, "supplementalCredentials":1, "gPCUserExtensionNames":1, "gPCMachineExtensionNames":1,"maxPwdAge":1, "secret":1, @@ -111,8 +111,8 @@ hashOverwrittenAtt = { "prefixMap": replace, "systemMayContain": replace, "rIDNextRID": add, "rIDUsedPool": never, "defaultSecurityDescriptor": replace + add, "isMemberOfPartialAttributeSet": delete, -"attributeDisplayNames": replace + add} - +"attributeDisplayNames": replace + add, +"versionNumber": add} backlinked = [] forwardlinked = set() @@ -813,7 +813,7 @@ def update_present(ref_samdb, samdb, basedn, listPresent, usns, invocationid): identic_rename(samdb, reference[0].dn) current = samdb.search(expression="dn=%s" % (str(dn)), base=basedn, scope=SCOPE_SUBTREE, -controls=["search_options:1:2"]) +controls=controls) delta = samdb.msg_diff(current[0], reference[0]) @@ -852,8 +852,17 @@ def update_present(ref_samdb, samdb, basedn, listPresent, usns, invocationid): # We have updated by provision usn information so let's exploit # replMetadataProperties if att in forwardlinked: +if current[0].get(): +curv
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8a48ca4 s3: Remove talloc_autofree_context() from change_to_guest() via 4ebbbdd s3: Remove talloc_autofree_context() from swat via bf6ca13 s3: Remove talloc_autofree_context() from smbpasswd via 77e96d3 s3: Remove talloc_autofree_context() from net_sam_provision() via 2b601d7 s3: Remove talloc_autofree_context() from lookup_unix_user_name() via 9b2d314 s3: Remove talloc_autofree_context() from pdb_init_ads() via 2d8b650 s3: Remove two talloc_autofree_context() calls via 997a64f s3: Remove talloc_autofree_context() from serverid_db() via 34c0b16 s3: Remove talloc_autofree_context() from serverid_parent_init() via 8c55a9b s3: Remove talloc_autofree_context() from messaging_tdb_parent_init() via c4efae7 s3: Remove talloc_autofree_context() from ctdb_read_req() via 8691960 s3: Remove talloc_autofree_context() from get_root_nt_token() from 69ef2b3 upgradeprovision: use the same case for hostname in reference provision as in the current provision http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8a48ca4e3f2509571f0910165c9e8763864e9c7a Author: Volker Lendecke Date: Sat Sep 25 16:31:18 2010 -0700 s3: Remove talloc_autofree_context() from change_to_guest() pass is freed at the exit of this routine commit 4ebbbdd011aae397c79cc5a83a729e547480c112 Author: Volker Lendecke Date: Sat Sep 25 16:30:06 2010 -0700 s3: Remove talloc_autofree_context() from swat In both cases, pass is freed immediately commit bf6ca13346e67107d821cec9edf4f767defa490e Author: Volker Lendecke Date: Sat Sep 25 16:28:21 2010 -0700 s3: Remove talloc_autofree_context() from smbpasswd In both cases, pwd is freed immediately commit 77e96d3229ea95d220a663aa99c7d376f3619d41 Author: Volker Lendecke Date: Sat Sep 25 16:27:04 2010 -0700 s3: Remove talloc_autofree_context() from net_sam_provision() commit 2b601d72d55bb6cbdd1e47b002782159e0e589bf Author: Volker Lendecke Date: Sat Sep 25 16:24:16 2010 -0700 s3: Remove talloc_autofree_context() from lookup_unix_user_name() pwd is freed in this routine immediately commit 9b2d3142c1751a55d942ee8cb6bdcdee713989c2 Author: Volker Lendecke Date: Sat Sep 25 16:23:11 2010 -0700 s3: Remove talloc_autofree_context() from pdb_init_ads() commit 2d8b65066e632c1a96b150e0cb5f7c361471ac31 Author: Volker Lendecke Date: Sat Sep 25 16:20:11 2010 -0700 s3: Remove two talloc_autofree_context() calls Both allocated blobs are freed in their routines commit 997a64f6fb11e19d78c0468d86c0c545a4e586d1 Author: Volker Lendecke Date: Sat Sep 25 16:02:04 2010 -0700 s3: Remove talloc_autofree_context() from serverid_db() If we needed an explicit tdb_close() in the destructor, we'd be hosed long ago. commit 34c0b166b6abd1d52e4c07a798f41a245d39a426 Author: Volker Lendecke Date: Sat Sep 25 15:59:06 2010 -0700 s3: Remove talloc_autofree_context() from serverid_parent_init() commit 8c55a9b459a7f54ab505954f2d1d66538dd98d1b Author: Volker Lendecke Date: Sat Sep 25 15:56:33 2010 -0700 s3: Remove talloc_autofree_context() from messaging_tdb_parent_init() commit c4efae77fae88163b119ac71e8ed3220fb1f73b4 Author: Volker Lendecke Date: Sat Sep 25 15:50:33 2010 -0700 s3: Remove talloc_autofree_context() from ctdb_read_req() commit 86919606c7bb9f80200799a23fb491a9bb7f2f14 Author: Volker Lendecke Date: Sat Sep 25 15:46:36 2010 -0700 s3: Remove talloc_autofree_context() from get_root_nt_token() The memcache_add_talloc() later on steals it anyway --- Summary of changes: source3/auth/token_util.c |2 +- source3/include/messages.h |2 +- source3/include/serverid.h |2 +- source3/lib/ctdbd_conn.c |3 ++- source3/lib/messages_local.c |5 ++--- source3/lib/serverid.c |9 - source3/libsmb/clikrb5.c |4 ++-- source3/passdb/pdb_ads.c |2 +- source3/passdb/util_unixsids.c |2 +- source3/smbd/server.c |4 ++-- source3/smbd/uid.c |2 +- source3/utils/net_sam.c|2 +- source3/utils/smbpasswd.c |4 ++-- source3/web/cgi.c |4 ++-- 14 files changed, 23 insertions(+), 24 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c index f88a88a..8666f88 100644 --- a/source3/auth/token_util.c +++ b/source3/auth/token_util.c @@ -109,7 +109,7 @@ struct security_token *get_root_nt_token( void ) uid_to_sid(&u_sid, pw->pw_uid); gid_to_sid(&g_sid, pw->pw_gid); - token = create_local_nt_token(talloc_autofree_context(), &u_sid, False, + token = create_local_nt_token(talloc_tos(),
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 69ef2b3 upgradeprovision: use the same case for hostname in reference provision as in the current provision via e956072 autobuild: added --retry option via e8fec1d s4-dns: the DNS/${HOSTNAME} SPN should be on the DNS account only via b8444b6 s4-provision: switch to dns-HOSTNAME instead of dns via 0079165 autobuild: enable ccache via d9a0546 autobuild: added --fix-whitespace option via 5d5ae09 autobuild: added --rebase-master and --push-master via 91b62a2 autobuild: added a EDITOR script to mark successful autobuilds via f7fb272 autobuild: added --rebase option via a09b241 script: added autobuild.py automatic build test script from f1b3c4d s4-possibleinferiors.py: Fix usage of 'paged_search' module for remote LDB connections http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 69ef2b37050d44394c4e68c315a5af0afe332656 Author: Matthieu Patou Date: Sat Sep 25 21:13:07 2010 +0400 upgradeprovision: use the same case for hostname in reference provision as in the current provision Autobuild-User: Andrew Tridgell Autobuild-Date: Sun Sep 26 01:21:52 UTC 2010 on sn-devel-104 commit e9560722ca01b3a2f23f5750292c0e6450141675 Author: Andrew Tridgell Date: Sat Sep 25 17:35:55 2010 -0700 autobuild: added --retry option this allows the build to auto retry if master changes commit e8fec1d3c6c9b8b08de45ad724fe1eedb22fba7d Author: Andrew Tridgell Date: Sat Sep 25 00:07:57 2010 -0700 s4-dns: the DNS/${HOSTNAME} SPN should be on the DNS account only commit b8444b64a32d698b01acce2a1307723cc69a472b Author: Andrew Tridgell Date: Fri Sep 24 23:25:49 2010 -0700 s4-provision: switch to dns-HOSTNAME instead of dns We now use a host specific account name for the DNS account, which is the account used for dynamic DNS updates. We also setup the servicePrincipalName for automatic update, and add both DNS/${DNSDOMAIN} and DNS/${DNSNAME} for compatibility with both the old and new SPNs Pair-Programmed-With: Andrew Bartlett commit 00791652f4a4894ecffbca38d1f9bb4584fb2635 Author: Andrew Tridgell Date: Sat Sep 25 16:32:55 2010 -0700 autobuild: enable ccache commit d9a054c4628dbf577c6525ad64f3ee3ef077 Author: Andrew Tridgell Date: Sat Sep 25 16:18:00 2010 -0700 autobuild: added --fix-whitespace option commit 5d5ae099d16d1902e4a85adec5b1e6a9085b6118 Author: Andrew Tridgell Date: Sat Sep 25 15:53:32 2010 -0700 autobuild: added --rebase-master and --push-master Pair-Programmed-With: Stefan Metzmacher commit 91b62a274411477f67f50f0f653dd17bf1e65c1d Author: Andrew Tridgell Date: Sat Sep 25 15:30:13 2010 -0700 autobuild: added a EDITOR script to mark successful autobuilds Pair-Programmed-With: Stefan Metzmacher commit f7fb272e953b743ca9830618af9b1c290701ffec Author: Andrew Tridgell Date: Sat Sep 25 14:09:11 2010 -0700 autobuild: added --rebase option this allows you to rebase on a URL before starting commit a09b241ebb04dbc0285e5bee0e67027e055f719a Author: Andrew Tridgell Date: Sat Sep 25 12:51:51 2010 -0700 script: added autobuild.py automatic build test script this can be used to run all tests in parallel, in free git clones --- Summary of changes: script/autobuild.py | 363 ++ script/commit_mark.sh| 14 + source4/scripting/python/samba/provision.py | 30 ++- source4/scripting/python/samba/upgradehelpers.py |2 +- source4/setup/provision_dns_add.ldif | 10 +- source4/setup/secrets_dns.ldif |5 +- source4/setup/secrets_self_join.ldif | 13 - source4/setup/spn_update_list|1 - 8 files changed, 411 insertions(+), 27 deletions(-) create mode 100755 script/autobuild.py create mode 100755 script/commit_mark.sh delete mode 100644 source4/setup/secrets_self_join.ldif Changeset truncated at 500 lines: diff --git a/script/autobuild.py b/script/autobuild.py new file mode 100755 index 000..4941562 --- /dev/null +++ b/script/autobuild.py @@ -0,0 +1,363 @@ +#!/usr/bin/env python +# run tests on all Samba subprojects and push to a git tree on success +# Copyright Andrew Tridgell 2010 +# released under GNU GPL v3 or later + +from subprocess import Popen, PIPE +import os, signal, tarfile, sys, time +from optparse import OptionParser + + +samba_master = os.getenv('SAMBA_MASTER', 'git://git.samba.org/samba.git') +samba_master_ssh = os.getenv('SAMBA_MASTER_SSH', 'git+ssh://git.samba.org/data/git/samba.git') + +cleanup_list = [] + +os.putenv('CC', "ccache gcc") + +tasks = { +"source3" : [ "./autogen.sh", + "./con
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f1b3c4d s4-possibleinferiors.py: Fix usage of 'paged_search' module for remote LDB connections via 1178560 s4-fsmo.py: Fix usage of 'paged_search' module for remote LDB connections via cf57771 s4-delete_object.py: Fix usage of 'paged_search' module for remote LDB connections via 04826b6 s4-sec_descriptor.py: Fix usage of 'paged_search' module for remote LDB connections via 7a7068f s4-ldap_schema.py: Remove unused LDB connection to GC port via 8780d29 s4-dsdb_schema_info.py: Fix usage of 'paged_search' module for remote LDB connections via 7e1e7b1 s4-ldapcmp: Fix usage of 'paged_search' module for remote LDB connections via 9e6fa85 s4-ldapcmp: Extend ldapcmp to be able to compare more than one context at a time from dda1dd6 s3: Avoid an explicit ZERO_STRUCT http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f1b3c4dd387ac04615c3443d5de1059d2dc59ba4 Author: Kamen Mazdrashki Date: Sun Sep 26 02:13:39 2010 +0300 s4-possibleinferiors.py: Fix usage of 'paged_search' module for remote LDB connections commit 11785600be99f3a5b6edeef6f9efe4898abeb3d8 Author: Kamen Mazdrashki Date: Sun Sep 26 00:21:19 2010 +0300 s4-fsmo.py: Fix usage of 'paged_search' module for remote LDB connections commit cf5777111616a2f5239b19b5b95974dd47136c48 Author: Kamen Mazdrashki Date: Sun Sep 26 00:20:20 2010 +0300 s4-delete_object.py: Fix usage of 'paged_search' module for remote LDB connections commit 04826b65f6699bb6455aa1f2800a26400567d339 Author: Kamen Mazdrashki Date: Sun Sep 26 00:18:35 2010 +0300 s4-sec_descriptor.py: Fix usage of 'paged_search' module for remote LDB connections commit 7a7068f2ed6a21e6eab06021a3262217fe0afaf8 Author: Kamen Mazdrashki Date: Sun Sep 26 00:13:39 2010 +0300 s4-ldap_schema.py: Remove unused LDB connection to GC port commit 8780d2934bee14664e44643f70c90b609acda6b0 Author: Kamen Mazdrashki Date: Sun Sep 26 00:11:08 2010 +0300 s4-dsdb_schema_info.py: Fix usage of 'paged_search' module for remote LDB connections commit 7e1e7b16f6c2184554c429e039227efd6c7ed839 Author: Kamen Mazdrashki Date: Sun Sep 26 00:10:24 2010 +0300 s4-ldapcmp: Fix usage of 'paged_search' module for remote LDB connections commit 9e6fa8553cb7ca7fece76646c30f7fcb2a86a83a Author: Kamen Mazdrashki Date: Sun Sep 26 02:25:03 2010 +0300 s4-ldapcmp: Extend ldapcmp to be able to compare more than one context at a time If no arguments given, ldapcmp will compare all NCs --- Summary of changes: .../samdb/ldb_modules/tests/possibleinferiors.py |8 +++- source4/dsdb/tests/python/dsdb_schema_info.py | 13 +++-- source4/dsdb/tests/python/ldap_schema.py |5 -- source4/dsdb/tests/python/sec_descriptor.py| 10 +++- source4/scripting/devel/ldapcmp| 58 source4/torture/drs/python/delete_object.py|5 +- source4/torture/drs/python/fsmo.py |5 +- 7 files changed, 65 insertions(+), 39 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py index 3324d4b..c1e935f 100755 --- a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py +++ b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py @@ -59,7 +59,13 @@ def uniq_list(alist): lp_ctx = sambaopts.get_loadparm() creds = credopts.get_credentials(lp_ctx) -db = Ldb(url, credentials=creds, lp=lp_ctx, options=["modules:paged_searches"]) + +ldb_options = [] +# use 'paged_search' module when connecting remotely +if url.lower().startswith("ldap://";): +ldb_options = ["modules:paged_searches"] + +db = Ldb(url, credentials=creds, lp=lp_ctx, options=ldb_options) # get the rootDSE res = db.search(base="", expression="", diff --git a/source4/dsdb/tests/python/dsdb_schema_info.py b/source4/dsdb/tests/python/dsdb_schema_info.py index ff3c7f9..893cd4c 100755 --- a/source4/dsdb/tests/python/dsdb_schema_info.py +++ b/source4/dsdb/tests/python/dsdb_schema_info.py @@ -203,11 +203,12 @@ if not "://" in ldb_url: ldb_url = "tdb://%s" % ldb_url else: ldb_url = "ldap://%s"; % ldb_url -# user 'paged_search' module when connecting remotely -ldb_options = ["modules:paged_searches"] +# use 'paged_search' module when connecting remotely +if ldb_url.lower().startswith("ldap://";): +ldb_options = ["modules:paged_searches"] ldb = SamDB(url=ldb_url, - lp=samba.tests.env_loadparm(), - session_info=system_session(), - credentials=samba.tests.cmdline_credentials, - options=ldb_options) +lp=samba.tests.env_loadparm(), +session_info=syste
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via dda1dd6 s3: Avoid an explicit ZERO_STRUCT via 6ee0d86 s3: Lift talloc_autofree_context() from make_auth_context_fixed() via 242e329 s3: Lift talloc_autofree_context() from make_auth_context_subsystem() via 2d8be31 s3: Lift talloc_autofree_context() from make_auth_context_text_list() via 61861e4 s3: Lift talloc_autofree_context() from make_auth_context() via b127445 s3: Fix a memleak in make_new_server_info_system() via 15a3afb s3: Remove talloc_autofree_context() from init_system_info() from e4591eb s3: Fix a typo http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit dda1dd63d3c463a9a26d85acf4a9f7cc53396613 Author: Volker Lendecke Date: Sat Sep 25 15:40:54 2010 -0700 s3: Avoid an explicit ZERO_STRUCT commit 6ee0d866c2d7dbdede8511fb906c10f6118fa87d Author: Volker Lendecke Date: Sat Sep 25 15:35:44 2010 -0700 s3: Lift talloc_autofree_context() from make_auth_context_fixed() commit 242e3296108f513b286787ac12ea768b9c4ed954 Author: Volker Lendecke Date: Sat Sep 25 15:31:29 2010 -0700 s3: Lift talloc_autofree_context() from make_auth_context_subsystem() commit 2d8be31e880bcd1b7444ffd45295cc9948079b6f Author: Volker Lendecke Date: Sat Sep 25 14:51:45 2010 -0700 s3: Lift talloc_autofree_context() from make_auth_context_text_list() commit 61861e4b7d37d5b483360c0e9faa3dd3a1d0e9f6 Author: Volker Lendecke Date: Sat Sep 25 14:50:46 2010 -0700 s3: Lift talloc_autofree_context() from make_auth_context() commit b12744513ec24a50cc838bc6273513d3ac3ddba9 Author: Volker Lendecke Date: Sat Sep 25 14:47:42 2010 -0700 s3: Fix a memleak in make_new_server_info_system() commit 15a3afbd192cb8c8e4a248aec8f98141af41b8c1 Author: Volker Lendecke Date: Sat Sep 25 14:47:31 2010 -0700 s3: Remove talloc_autofree_context() from init_system_info() --- Summary of changes: source3/auth/auth.c| 26 ++ source3/auth/auth_compat.c |5 - source3/auth/auth_ntlmssp.c|2 +- source3/auth/auth_util.c |4 +++- source3/include/proto.h|7 +-- source3/rpc_server/srv_netlog_nt.c |6 -- source3/smbd/negprot.c |2 +- source3/smbd/sesssetup.c | 10 -- 8 files changed, 40 insertions(+), 22 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/auth/auth.c b/source3/auth/auth.c index cabff53..790bfac 100644 --- a/source3/auth/auth.c +++ b/source3/auth/auth.c @@ -343,11 +343,12 @@ static int auth_context_destructor(void *ptr) Make a auth_info struct ***/ -static NTSTATUS make_auth_context(struct auth_context **auth_context) +static NTSTATUS make_auth_context(TALLOC_CTX *mem_ctx, + struct auth_context **auth_context) { struct auth_context *ctx; - ctx = talloc_zero(talloc_autofree_context(), struct auth_context); + ctx = talloc_zero(mem_ctx, struct auth_context); if (!ctx) { DEBUG(0,("make_auth_context: talloc failed!\n")); return NT_STATUS_NO_MEMORY; @@ -420,7 +421,9 @@ bool load_auth_module(struct auth_context *auth_context, Make a auth_info struct for the auth subsystem ***/ -static NTSTATUS make_auth_context_text_list(struct auth_context **auth_context, char **text_list) +static NTSTATUS make_auth_context_text_list(TALLOC_CTX *mem_ctx, + struct auth_context **auth_context, + char **text_list) { auth_methods *list = NULL; auth_methods *t = NULL; @@ -431,8 +434,11 @@ static NTSTATUS make_auth_context_text_list(struct auth_context **auth_context, return NT_STATUS_UNSUCCESSFUL; } - if (!NT_STATUS_IS_OK(nt_status = make_auth_context(auth_context))) + nt_status = make_auth_context(mem_ctx, auth_context); + + if (!NT_STATUS_IS_OK(nt_status)) { return nt_status; + } for (;*text_list; text_list++) { if (load_auth_module(*auth_context, *text_list, &t)) { @@ -449,7 +455,8 @@ static NTSTATUS make_auth_context_text_list(struct auth_context **auth_context, Make a auth_context struct for the auth subsystem ***/ -NTSTATUS make_auth_context_subsystem(struct auth_context **auth_context) +NTSTATUS make_auth_context_subsystem(TALLOC_CTX *mem_ctx, +struct auth_context **auth_context) { char **auth_method_list = NULL; NTSTATUS nt_status;
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via e4591eb s3: Fix a typo from a0d3ffb s3: Fix some 64-bit warnings http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e4591eb8c1e8f800da1304ac0321beb6db4a344f Author: Volker Lendecke Date: Sat Sep 25 15:44:55 2010 -0700 s3: Fix a typo --- Summary of changes: source3/auth/token_util.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c index 4385dc4..f88a88a 100644 --- a/source3/auth/token_util.c +++ b/source3/auth/token_util.c @@ -76,7 +76,7 @@ bool nt_token_check_domain_rid( struct security_token *token, uint32 rid ) Create a token for the root user to be used internally by smbd. This is similar to running under the context of the LOCAL_SYSTEM account in Windows. This is a read-only token. Do not modify it or free() it. - Create a copy if your need to change it. + Create a copy if you need to change it. **/ struct security_token *get_root_nt_token( void ) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a0d3ffb s3: Fix some 64-bit warnings from 0a18f89 pyteven: Fix build warnings. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a0d3ffbf924cf203fc8dc765954823375645f0b7 Author: Volker Lendecke Date: Sat Sep 25 14:59:42 2010 -0700 s3: Fix some 64-bit warnings --- Summary of changes: source3/registry/reg_parse.c |7 --- source3/registry/reg_parse_internal.c |3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/registry/reg_parse.c b/source3/registry/reg_parse.c index 388eecd..2fcdb41 100644 --- a/source3/registry/reg_parse.c +++ b/source3/registry/reg_parse.c @@ -587,7 +587,7 @@ int reg_parse_line(struct reg_parse* parser, const char* line) DEBUG(0, ("value \"%s\" parse error" "at line: %i pos: %li : %s", cbuf_gets(parser->valname, 0), parser->linenum, - pos-line, pos)); + (long int)(pos-line), pos)); return -3; } } @@ -602,7 +602,7 @@ done: if (!srprs_skipws(&pos) || !srprs_eol(&pos, NULL)) { DEBUG(0, ("trailing garbage at line: %i pos: %li : %s\n", - parser->linenum, pos-line, pos)); + parser->linenum, (long int)(pos-line), pos)); return -1; } return 0; @@ -789,7 +789,8 @@ handle_iconv_errno(int err, const char* obuf, size_t linenum, if (pos == *optr) { pos = MAX(obuf, *optr-60); } - DEBUG(0, ("Illegal multibyte sequence at line %lu: %s", linenum+1, pos)); + DEBUG(0, ("Illegal multibyte sequence at line %lu: %s", + (long unsigned)(linenum+1), pos)); assert(ilen > 0); do { diff --git a/source3/registry/reg_parse_internal.c b/source3/registry/reg_parse_internal.c index 3d3cf47..4734662 100644 --- a/source3/registry/reg_parse_internal.c +++ b/source3/registry/reg_parse_internal.c @@ -79,7 +79,8 @@ convert: reason="Illegal multibyte sequence"; break; } - DEBUG(0,("Conversion error: %s(%.80s) %li\n", reason, iptr, iptr-src)); + DEBUG(0,("Conversion error: %s(%.80s) %li\n", reason, iptr, +(long int)(iptr-src))); talloc_free(dst); return -1; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 0a18f89 pyteven: Fix build warnings. via 296ff48 Check in configure/Makefile for those projects that have waf as primary build system. via e68afdc pytevent: Add more tests. via ddb3c48 pytevent: Fill in client side fnuctions. via ba5d034 selftest: If a testsuite is killed by a signal, let selftest die. via 465cff7 tevent: Add infrastructure for python bindings. via 1f22b63 tevent: Switch to using waf by default. from e81db37 s3: Fix bug 7470 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0a18f89e8a1599bae4ac96b6f3ab358797881ef7 Author: Jelmer Vernooij Date: Thu Sep 23 17:40:35 2010 -0700 pyteven: Fix build warnings. commit 296ff486e41d309493c9ddb195578cb6355e2b36 Author: Jelmer Vernooij Date: Thu Sep 23 17:29:53 2010 -0700 Check in configure/Makefile for those projects that have waf as primary build system. commit e68afdc02f7ead1da8d0e11cf13a1845eebe7d48 Author: Jelmer Vernooij Date: Thu Sep 23 17:13:56 2010 -0700 pytevent: Add more tests. commit ddb3c48f1adf3e3202ad904ba9de4027c7e140df Author: Jelmer Vernooij Date: Thu Sep 23 16:50:36 2010 -0700 pytevent: Fill in client side fnuctions. commit ba5d034d5318d340aefa2b3bd2600c0cc43c934b Author: Jelmer Vernooij Date: Thu Sep 23 15:14:57 2010 -0700 selftest: If a testsuite is killed by a signal, let selftest die. commit 465cff7531731929b963085a13ef9a74100858e5 Author: Jelmer Vernooij Date: Thu Sep 23 14:28:02 2010 -0700 tevent: Add infrastructure for python bindings. commit 1f22b63b3453e7d8919dcbdd41ea62b34001754e Author: Jelmer Vernooij Date: Thu Sep 23 14:01:02 2010 -0700 tevent: Switch to using waf by default. --- Summary of changes: .gitignore | 11 +- lib/tevent/Makefile | 57 ++ lib/tevent/{autogen.sh => autogen-autotools.sh} |0 lib/tevent/autogen.sh | 15 +- lib/tevent/bindings.py | 62 ++ lib/tevent/configure| 14 + lib/tevent/pytevent.c | 762 +++ lib/tevent/wscript | 25 +- selftest/selftest.pl|4 +- source4/Makefile| 57 ++ source4/configure | 14 + source4/lib/ldb/Makefile| 57 ++ source4/lib/ldb/configure | 14 + 13 files changed, 1070 insertions(+), 22 deletions(-) create mode 100644 lib/tevent/Makefile copy lib/tevent/{autogen.sh => autogen-autotools.sh} (100%) mode change 100755 => 12 lib/tevent/autogen.sh create mode 100644 lib/tevent/bindings.py create mode 100755 lib/tevent/configure create mode 100644 lib/tevent/pytevent.c create mode 100644 source4/Makefile create mode 100755 source4/configure create mode 100644 source4/lib/ldb/Makefile create mode 100755 source4/lib/ldb/configure Changeset truncated at 500 lines: diff --git a/.gitignore b/.gitignore index 56bba7e..49b24a0 100644 --- a/.gitignore +++ b/.gitignore @@ -13,8 +13,12 @@ config.h config.h.in config.log config.status -configure -Makefile +source3/configure +source3/Makefile +lib/talloc/configure +lib/talloc/Makefile +lib/tdb/configure +lib/tdb/Makefile *.d *_err.c *_err.h @@ -83,7 +87,6 @@ source3/library-versions librpc/gen_ndr/*.* source3/librpc/gen_ndr/*.* source4/librpc/gen_ndr/*.* -source3/Makefile source3/nsswitch/*.so source3/pkgconfig/*.pc source3/proto_exists @@ -313,14 +316,12 @@ packaging/RHEL-CTDB/samba.spec packaging/RHEL/samba.spec packaging/RHEL/makerpms.sh source3/setup -lib/tevent/Makefile lib/tevent/tevent.so lib/tevent/libtevent.so* lib/tevent/libtevent.a lib/tdb/libtdb.so lib/tdb/tdb.so lib/tdb/libtdb.a -lib/tdb/Makefile lib/tdb/bin docs-xml/build/catalog.xml docs-xml/*/images/*.eps diff --git a/lib/tevent/Makefile b/lib/tevent/Makefile new file mode 100644 index 000..bf19ebe --- /dev/null +++ b/lib/tevent/Makefile @@ -0,0 +1,57 @@ +# simple makefile wrapper to run waf + +WAF=WAF_MAKE=1 ../../buildtools/bin/waf + +all: + $(WAF) build + +install: + $(WAF) install + +uninstall: + $(WAF) uninstall + +test: + $(WAF) test $(TEST_OPTIONS) + +testenv: + $(WAF) test --testenv $(TEST_OPTIONS) + +quicktest: + $(WAF) test --quick $(TEST_OPTIONS) + +dist: + $(WAF) dist + +distcheck: + $(WAF) distcheck + +clean: + $(WAF) clean + +distclean: + $(WAF) distclean + +reconfigure: configure + $(WAF) reconfigure + +show_waf_options: + $(WAF) --help + +# some compatibility make targets +everything: all + +testsuite: all + +check: test + +torture: all + +# this shou
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 2f08578 s3: Fix bug 7470 from 464666b talloc: Add a warning about talloc_autofree_context() and dlclose() http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 2f0857834e889a33b85e1c0aa46674fd0cd1a27c Author: Volker Lendecke Date: Sat Sep 25 10:56:58 2010 -0700 s3: Fix bug 7470 S_IREAD and S_IWRITE are not standard. Thanks to Joachim Schmitz for reporting! --- Summary of changes: source3/registry/reg_api_regf.c |2 +- source3/utils/net_rpc_registry.c |3 ++- source3/utils/profiles.c |3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/registry/reg_api_regf.c b/source3/registry/reg_api_regf.c index 8f249b5..20cd4fc 100644 --- a/source3/registry/reg_api_regf.c +++ b/source3/registry/reg_api_regf.c @@ -277,7 +277,7 @@ static WERROR backup_registry_key(struct registry_key_handle *krecord, /* open the registry filefail if the file already exists */ regfile = regfio_open(fname, (O_RDWR|O_CREAT|O_EXCL), - (S_IREAD|S_IWRITE)); + (S_IRUSR|S_IWUSR)); if (regfile == NULL) { DEBUG(0,("backup_registry_key: failed to open \"%s\" (%s)\n", fname, strerror(errno) )); diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c index cfc2a7e..787ecbf 100644 --- a/source3/utils/net_rpc_registry.c +++ b/source3/utils/net_rpc_registry.c @@ -1149,7 +1149,8 @@ static int rpc_registry_copy(struct net_context *c, int argc, const char **argv d_printf(_("ok\n")); d_printf(_("Opening %s"), argv[1]); - if ( !(outfile = regfio_open( argv[1], (O_RDWR|O_CREAT|O_TRUNC), (S_IREAD|S_IWRITE) )) ) { + if ( !(outfile = regfio_open( argv[1], (O_RDWR|O_CREAT|O_TRUNC), + (S_IRUSR|S_IWUSR) )) ) { d_fprintf(stderr, _("Failed to open %s for writing\n"),argv[1]); goto out; } diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c index f6f500a..4c46bba 100644 --- a/source3/utils/profiles.c +++ b/source3/utils/profiles.c @@ -278,7 +278,8 @@ int main( int argc, char *argv[] ) exit (1); } - if ( !(outfile = regfio_open( new_filename, (O_RDWR|O_CREAT|O_TRUNC), (S_IREAD|S_IWRITE) )) ) { + if ( !(outfile = regfio_open( new_filename, (O_RDWR|O_CREAT|O_TRUNC), + (S_IRUSR|S_IWUSR) )) ) { fprintf( stderr, "Failed to open new file %s!\n", new_filename ); fprintf( stderr, "Error was (%s)\n", strerror(errno) ); exit (1); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via e81db37 s3: Fix bug 7470 from 85ba790 ldb: mark the location of a lot more ldb requests http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e81db37a87b83b6ff10ab513eb4a4d06a2c20b17 Author: Volker Lendecke Date: Sat Sep 25 10:56:58 2010 -0700 s3: Fix bug 7470 S_IREAD and S_IWRITE are not standard. Thanks to Joachim Schmitz for reporting! --- Summary of changes: source3/registry/reg_api_regf.c |2 +- source3/utils/net_rpc_registry.c |3 ++- source3/utils/profiles.c |3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/registry/reg_api_regf.c b/source3/registry/reg_api_regf.c index 394e31a..b7a9522 100644 --- a/source3/registry/reg_api_regf.c +++ b/source3/registry/reg_api_regf.c @@ -278,7 +278,7 @@ static WERROR backup_registry_key(struct registry_key_handle *krecord, /* open the registry filefail if the file already exists */ regfile = regfio_open(fname, (O_RDWR|O_CREAT|O_EXCL), - (S_IREAD|S_IWRITE)); + (S_IRUSR|S_IWUSR)); if (regfile == NULL) { DEBUG(0,("backup_registry_key: failed to open \"%s\" (%s)\n", fname, strerror(errno) )); diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c index e10ba00..5b9f887 100644 --- a/source3/utils/net_rpc_registry.c +++ b/source3/utils/net_rpc_registry.c @@ -1267,7 +1267,8 @@ static int rpc_registry_copy(struct net_context *c, int argc, const char **argv d_printf(_("ok\n")); d_printf(_("Opening %s"), argv[1]); - if ( !(outfile = regfio_open( argv[1], (O_RDWR|O_CREAT|O_TRUNC), (S_IREAD|S_IWRITE) )) ) { + if ( !(outfile = regfio_open( argv[1], (O_RDWR|O_CREAT|O_TRUNC), + (S_IRUSR|S_IWUSR) )) ) { d_fprintf(stderr, _("Failed to open %s for writing\n"),argv[1]); goto out; } diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c index 35b8911..6c6c7fd 100644 --- a/source3/utils/profiles.c +++ b/source3/utils/profiles.c @@ -279,7 +279,8 @@ int main( int argc, char *argv[] ) exit (1); } - if ( !(outfile = regfio_open( new_filename, (O_RDWR|O_CREAT|O_TRUNC), (S_IREAD|S_IWRITE) )) ) { + if ( !(outfile = regfio_open( new_filename, (O_RDWR|O_CREAT|O_TRUNC), + (S_IRUSR|S_IWUSR) )) ) { fprintf( stderr, "Failed to open new file %s!\n", new_filename ); fprintf( stderr, "Error was (%s)\n", strerror(errno) ); exit (1); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 85ba790 ldb: mark the location of a lot more ldb requests via 5568fcd s4-dsdb: added tagging of requests in dsdb modules via f4893e7 ldb: added request location tracking via d72dbe8 s4-repl: make getncchanges a bit less verbose via c53210b s4-net: added --ipaddress option to net commands via 3d7a4cf s4-pynet: added server keyword to Net() initialisation via 805d942 s4-libnet: added server_address option in libnet context via a360428 s4-finddcs: allow override of server IP address via bd228f9 s4-repl: don't store repsFrom on DNs other than NC heads via 781796c s4-pycredentials: avoid a tallloc_free on ref via a1d5254 s4-repl: use namingContexts from rootDSE to initialise partition list via 3704467 s4-repl: force on WRIT_REP when we are a writable replica via 3aea12d s4-repl: use dreplsrv_partition_source_dsa_by_guid to find source dsa via ca847b5 torture: fixed a valgrind error in SMB2-CREATE from 99f0891 s4-dsdb: Fixed a call to the wrong ops function in dsdb_module_search_dn. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 85ba79063f35b5a073b3670b82daa2aa6dfb40bb Author: Andrew Tridgell Date: Fri Sep 24 12:50:13 2010 -0700 ldb: mark the location of a lot more ldb requests commit 5568fcd88b2a32ba389694ee35ab521af1ea7394 Author: Andrew Tridgell Date: Fri Sep 24 12:09:26 2010 -0700 s4-dsdb: added tagging of requests in dsdb modules this allows you to call dsdb_req_chain_debug() in gdb or when writing debug code to see the request chain commit f4893e7d33b7c9aaafba5ce8657972d3eb600257 Author: Andrew Tridgell Date: Fri Sep 24 12:07:16 2010 -0700 ldb: added request location tracking this is used to help debug async ldb requests. The ldb request handle now contains a location string and the parent request pointer. This allows us to print a backtrace of ldb requests in the dsdb modules. commit d72dbe847e0db605e950e6656d758cb60bf628a7 Author: Andrew Tridgell Date: Fri Sep 24 10:05:07 2010 -0700 s4-repl: make getncchanges a bit less verbose this should reduce some of the clutter in make test commit c53210bf0609de982d0b36f76198defc8a4502da Author: Andrew Tridgell Date: Thu Sep 23 19:51:36 2010 -0700 s4-net: added --ipaddress option to net commands this allows override of server IP address, bypassing NBT or DNS name resolution of DCs Pair-Programmed-With: Stefan Metzmacher commit 3d7a4cf5b68a1adcc4b7b53819ffc0c580e92da0 Author: Andrew Tridgell Date: Thu Sep 23 19:52:19 2010 -0700 s4-pynet: added server keyword to Net() initialisation this sets up server_address in the libnet context Pair-Programmed-With: Stefan Metzmacher commit 805d9425c2ee06e1695e451500d1ffbf90ca8e72 Author: Andrew Tridgell Date: Thu Sep 23 19:50:00 2010 -0700 s4-libnet: added server_address option in libnet context this is used by libnet_LookupDCs Pair-Programmed-With: Stefan Metzmacher commit a360428588467c29e8eb40b27a9db525d4c2ea96 Author: Andrew Tridgell Date: Thu Sep 23 19:49:12 2010 -0700 s4-finddcs: allow override of server IP address this will be used to implement --ipaddress option to net commands Pair-Programmed-With: Stefan Metzmacher commit bd228f98588919880ca3a9e4c1f23e17ce78aca5 Author: Andrew Tridgell Date: Thu Sep 23 19:48:03 2010 -0700 s4-repl: don't store repsFrom on DNs other than NC heads we don't want a refsFrom on the Rid Manage$ DN Pair-Programmed-With: Anatoliy Atanasov commit 781796c557025f4bf8c62b903acc1be64acc35b8 Author: Andrew Tridgell Date: Thu Sep 23 19:46:27 2010 -0700 s4-pycredentials: avoid a tallloc_free on ref with the new py object structure, we need to unlink not free commit a1d52540a377c587552bcc7d5cc085d3774e1c01 Author: Andrew Tridgell Date: Thu Sep 23 15:40:20 2010 -0700 s4-repl: use namingContexts from rootDSE to initialise partition list this is preferable to looking for the hasMasterNCs attribute on nTDSDSA objects. commit 370446769dc0fff752f9fb40c7dcf878cc5cd92e Author: Andrew Tridgell Date: Thu Sep 23 15:39:37 2010 -0700 s4-repl: force on WRIT_REP when we are a writable replica this ensures we always mark ourselves as writeable when we are not an RODC commit 3aea12d0ab70997355904aa6625fce6015657aa7 Author: Andrew Tridgell Date: Thu Sep 23 15:38:07 2010 -0700 s4-repl: use dreplsrv_partition_source_dsa_by_guid to find source dsa this avoids a list walk in the calling code commit ca847b593d83f7ce09473469bd79531fdc8d0359 Author: Andrew Tridgell Date: Thu Sep 23 15:33:36 2010 -0700 torture: fixed a valgrind error in SMB2-CREATE the lock structure had
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 99f0891 s4-dsdb: Fixed a call to the wrong ops function in dsdb_module_search_dn. from 8afb252 s3-waf: fix debug2html. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 99f0891944e8df91b98934b6c57f9c68dfed8722 Author: Nadezhda Ivanova Date: Sat Sep 25 10:19:11 2010 -0700 s4-dsdb: Fixed a call to the wrong ops function in dsdb_module_search_dn. --- Summary of changes: source4/dsdb/samdb/ldb_modules/util.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/dsdb/samdb/ldb_modules/util.c b/source4/dsdb/samdb/ldb_modules/util.c index 36f0ae9..a782001 100644 --- a/source4/dsdb/samdb/ldb_modules/util.c +++ b/source4/dsdb/samdb/ldb_modules/util.c @@ -79,7 +79,7 @@ int dsdb_module_search_dn(struct ldb_module *module, } else { const struct ldb_module_ops *ops = ldb_module_get_ops(module); SMB_ASSERT(dsdb_flags & DSDB_FLAG_OWN_MODULE); - ret = ops->modify(module, req); + ret = ops->search(module, req); } if (ret == LDB_SUCCESS) { ret = ldb_wait(req->handle, LDB_WAIT_ALL); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-stable updated
The branch, v3-5-stable has been updated via 2ee3b08 VERSION: Bump version number up to 3.5.6. via b82fab5 WHATSNEW: Prepare release notes for Samba 3.5.6. from fbfd370 WHATSNEW: Update release date. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable - Log - commit 2ee3b0822a8978725757548aafc7d7d2b7c115a1 Author: Karolin Seeger Date: Sat Sep 25 15:21:17 2010 +0200 VERSION: Bump version number up to 3.5.6. Karolin (cherry picked from commit dcb31fa3e3ebf2d5ca7517dc664ebc94df5d04d1) commit b82fab56639ce26015a9b8803c93b35c9ee676e1 Author: Karolin Seeger Date: Sat Sep 25 15:20:26 2010 +0200 WHATSNEW: Prepare release notes for Samba 3.5.6. Karolin (cherry picked from commit eb895e3b281ca3ece57e7c97f24a73a061daccda) --- Summary of changes: WHATSNEW.txt| 45 +++-- source3/VERSION |2 +- 2 files changed, 44 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 0f52691..4fea69b 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,4 +1,45 @@ = + Release Notes for Samba 3.5.6 + October 8, 2010 + = + + +This is the latest stable release of Samba 3.5. + +Major enhancements in Samba 3.5.6 include: + + +Changes since 3.5.5 +--- + + +o Jeremy Allison + + +## +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.5 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.5.5 September 14, 2010 = @@ -50,8 +91,8 @@ database (https://bugzilla.samba.org/). == -Release notes for older releases follow: - +-- + = Release Notes for Samba 3.5.4 diff --git a/source3/VERSION b/source3/VERSION index 795463c..5490542 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,7 +25,7 @@ SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=5 -SAMBA_VERSION_RELEASE=5 +SAMBA_VERSION_RELEASE=6 # Bug fix releases use a letter for the patch revision # -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via dcb31fa VERSION: Bump version number up to 3.5.6. via eb895e3 WHATSNEW: Prepare release notes for Samba 3.5.6. from cf36427 s3: Remove a global variable in bugfix for bug 7665 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit dcb31fa3e3ebf2d5ca7517dc664ebc94df5d04d1 Author: Karolin Seeger Date: Sat Sep 25 15:21:17 2010 +0200 VERSION: Bump version number up to 3.5.6. Karolin commit eb895e3b281ca3ece57e7c97f24a73a061daccda Author: Karolin Seeger Date: Sat Sep 25 15:20:26 2010 +0200 WHATSNEW: Prepare release notes for Samba 3.5.6. Karolin --- Summary of changes: WHATSNEW.txt| 45 +++-- source3/VERSION |2 +- 2 files changed, 44 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 0f52691..4fea69b 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,4 +1,45 @@ = + Release Notes for Samba 3.5.6 + October 8, 2010 + = + + +This is the latest stable release of Samba 3.5. + +Major enhancements in Samba 3.5.6 include: + + +Changes since 3.5.5 +--- + + +o Jeremy Allison + + +## +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.5 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.5.5 September 14, 2010 = @@ -50,8 +91,8 @@ database (https://bugzilla.samba.org/). == -Release notes for older releases follow: - +-- + = Release Notes for Samba 3.5.4 diff --git a/source3/VERSION b/source3/VERSION index 0594c9d..31bd843 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,7 +25,7 @@ SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=5 -SAMBA_VERSION_RELEASE=5 +SAMBA_VERSION_RELEASE=6 # Bug fix releases use a letter for the patch revision # -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via cf36427 s3: Remove a global variable in bugfix for bug 7665 via f9f5482 s3-libnetapi: Fix Bug #7665, memory leak in netapi connection manager. from 73a7100 s3: Fix the charset_pull routine http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit cf364274cbae996fbe186b2c2792b212f189e26a Author: Volker Lendecke Date: Tue Sep 21 15:41:23 2010 -0700 s3: Remove a global variable in bugfix for bug 7665 commit f9f54825238d4e30827dea897456ff8cf4e6730c Author: Günther Deschner Date: Mon Sep 20 21:05:37 2010 -0700 s3-libnetapi: Fix Bug #7665, memory leak in netapi connection manager. Guenther (cherry picked from commit 6f47a24bc55be0ea907594a748774675a105b5e3) --- Summary of changes: source3/lib/netapi/cm.c | 98 --- source3/lib/netapi/netapi_private.h |1 + 2 files changed, 69 insertions(+), 30 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index 3a624bf..97a5968 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -25,18 +25,58 @@ / / +struct client_ipc_connection { + struct client_ipc_connection *prev, *next; + struct cli_state *cli; + struct client_pipe_connection *pipe_connections; +}; + +struct client_pipe_connection { + struct client_pipe_connection *prev, *next; + struct rpc_pipe_client *pipe; +}; + +/ +/ + +static struct client_ipc_connection *ipc_cm_find( + struct libnetapi_private_ctx *priv_ctx, const char *server_name) +{ + struct client_ipc_connection *p; + + for (p = priv_ctx->ipc_connections; p; p = p->next) { + if (strequal(p->cli->desthost, server_name)) { + return p; + } + } + + return NULL; +} + +/ +/ + static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx, const char *server_name, - struct cli_state **cli) + struct client_ipc_connection **pp) { + struct libnetapi_private_ctx *priv_ctx = + (struct libnetapi_private_ctx *)ctx->private_data; struct user_auth_info *auth_info = NULL; struct cli_state *cli_ipc = NULL; + struct client_ipc_connection *p; - if (!ctx || !cli || !server_name) { + if (!ctx || !pp || !server_name) { return WERR_INVALID_PARAM; } - auth_info = user_auth_info_init(NULL); + p = ipc_cm_find(priv_ctx, server_name); + if (p) { + *pp = p; + return WERR_OK; + } + + auth_info = user_auth_info_init(ctx); if (!auth_info) { return WERR_NOMEM; } @@ -78,30 +118,29 @@ static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx, return WERR_CAN_NOT_COMPLETE; } - *cli = cli_ipc; + p = TALLOC_ZERO_P(ctx, struct client_ipc_connection); + if (p == NULL) { + return WERR_NOMEM; + } - return WERR_OK; -} + p->cli = cli_ipc; + DLIST_ADD(priv_ctx->ipc_connections, p); -/ -/ + *pp = p; -struct client_pipe_connection { - struct client_pipe_connection *prev, *next; - struct rpc_pipe_client *pipe; - struct cli_state *cli; -}; - -static struct client_pipe_connection *pipe_connections; + return WERR_OK; +} / / WERROR libnetapi_shutdown_cm(struct libnetapi_ctx *ctx) { - struct client_pipe_connection *p; + struct libnetapi_private_ctx *priv_ctx = + (struct libnetapi_private_ctx *)ctx->private_data; + struct client_ipc_connection *p; - for (p = pipe_connections; p; p = p->next) { + for (p = priv_ctx->ipc_connections; p; p = p->next) { cli_shutdown(p->cli); } @@ -111,19 +150,19 @@ WERROR libnetapi_shutdown_cm(struct libnetapi_ctx *ctx) / ***
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 73a7100 s3: Fix the charset_pull routine from 18516e0 s3: fix build on platforms without st_blocks and st_blksize stat struct members http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 73a7100a21a50873d09cef7a100ed75c4095863f Author: Volker Lendecke Date: Mon Sep 6 15:13:48 2010 +0200 s3: Fix the charset_pull routine In the push routine we do the SVAL, so we should do the SSVAL here. Fix bug #7531 (3.5.3 unusable on solaris 10). --- Summary of changes: lib/util/charset/charset.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h index 2c8aa41..c9425ef 100644 --- a/lib/util/charset/charset.h +++ b/lib/util/charset/charset.h @@ -242,7 +242,7 @@ static size_t CHARSETNAME ## _pull(void *cd, const char **inbuf, size_t *inbytes char **outbuf, size_t *outbytesleft) \ { \ while (*inbytesleft >= 1 && *outbytesleft >= 2) { \ - *(uint16*)(*outbuf) = to_ucs2[((unsigned char*)(*inbuf))[0]]; \ + SSVAL(*outbuf, 0, to_ucs2[((unsigned char*)(*inbuf))[0]]); \ (*inbytesleft) -= 1; \ (*outbytesleft) -= 2; \ (*inbuf) += 1; \ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 18516e0 s3: fix build on platforms without st_blocks and st_blksize stat struct members from 24f9210 Fix bug #7693 - smbd changing mode of files on rename http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 18516e062c9c4fc2a61a7ef7c8b173683c02e2e8 Author: Björn Jacke Date: Mon Jun 7 23:06:28 2010 +0200 s3: fix build on platforms without st_blocks and st_blksize stat struct members This fixes bug 7474. --- Summary of changes: source3/lib/system.c |9 + 1 files changed, 9 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/system.c b/source3/lib/system.c index a58d903..1ce635f 100644 --- a/source3/lib/system.c +++ b/source3/lib/system.c @@ -534,8 +534,17 @@ static void init_stat_ex_from_stat (struct stat_ex *dst, dst->st_ex_mtime = get_mtimespec(src); dst->st_ex_ctime = get_ctimespec(src); make_create_timespec(src, dst, fake_dir_create_times); +#ifdef HAVE_STAT_ST_BLKSIZE dst->st_ex_blksize = src->st_blksize; +#else + dst->st_ex_blksize = STAT_ST_BLOCKSIZE; +#endif + +#ifdef HAVE_STAT_ST_BLOCKS dst->st_ex_blocks = src->st_blocks; +#else + dst->st_ex_blocks = src->st_size / dst->st_ex_blksize + 1; +#endif #ifdef HAVE_STAT_ST_FLAGS dst->st_ex_flags = src->st_flags; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 24f9210 Fix bug #7693 - smbd changing mode of files on rename from 2ee2ea9 s3:smbd: Align change notify replies on 4-byte boundary http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 24f9210fe1e2280e08a7b2dd2cb33e7af4c1c002 Author: Jeremy Allison Date: Wed Sep 22 12:26:13 2010 -0700 Fix bug #7693 - smbd changing mode of files on rename When using "map archive", don't change the archive bit on renames or writes with UNIX extensions turned on. Jeremy. --- Summary of changes: source3/smbd/fileio.c | 13 +++-- source3/smbd/reply.c |5 +++-- 2 files changed, 10 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c index 1c27fef..9754b71 100644 --- a/source3/smbd/fileio.c +++ b/source3/smbd/fileio.c @@ -312,14 +312,15 @@ ssize_t write_file(struct smb_request *req, fsp->modified = True; if (SMB_VFS_FSTAT(fsp, &fsp->fsp_name->st) == 0) { - int dosmode; trigger_write_time_update(fsp); - dosmode = dos_mode(fsp->conn, fsp->fsp_name); - if ((lp_store_dos_attributes(SNUM(fsp->conn)) || - MAP_ARCHIVE(fsp->conn)) && - !IS_DOS_ARCHIVE(dosmode)) { - file_set_dosmode(fsp->conn, fsp->fsp_name, + if (!fsp->posix_open && + (lp_store_dos_attributes(SNUM(fsp->conn)) || + MAP_ARCHIVE(fsp->conn))) { + int dosmode = dos_mode(fsp->conn, fsp->fsp_name); + if (!IS_DOS_ARCHIVE(dosmode)) { + file_set_dosmode(fsp->conn, fsp->fsp_name, dosmode | aARCH, NULL, false); + } } /* diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index c9c80e8..e0ee8d2 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -5846,8 +5846,9 @@ NTSTATUS rename_internals_fsp(connection_struct *conn, "%s -> %s\n", smb_fname_str_dbg(fsp->fsp_name), smb_fname_str_dbg(smb_fname_dst))); - if (lp_map_archive(SNUM(conn)) || - lp_store_dos_attributes(SNUM(conn))) { + if (!lp_posix_pathnames() && + (lp_map_archive(SNUM(conn)) || + lp_store_dos_attributes(SNUM(conn { /* We must set the archive bit on the newly renamed file. */ if (SMB_VFS_STAT(conn, smb_fname_dst) == 0) { -- Samba Shared Repository