[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f8c34c4... s4:"samdb_set_password_sid" - clean up created objects correctly from 1788abb... s4:operational LDB module - cosmetic - reorder an attribute list http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f8c34c4df14cfb8509fe397d7d016f2468cfc026 Author: Matthias Dieter Wallnöfer Date: Sun Dec 13 16:13:34 2009 +0100 s4:"samdb_set_password_sid" - clean up created objects correctly - We should clean up such "helper" objects created in this function to don't have them around until "mem_ctx" is destroyed - Remove a from my view pointless comment "This is a password set, not change" since an external argument "user_change" decides this ("modify" or "(re)set") --- Summary of changes: source4/dsdb/common/util.c | 16 ++-- 1 files changed, 14 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index bfb2f0c..3aa415e 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -1934,12 +1934,15 @@ NTSTATUS samdb_set_password_sid(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, msg = ldb_msg_new(mem_ctx); if (msg == NULL) { ldb_transaction_cancel(ldb); + talloc_free(user_dn); return NT_STATUS_NO_MEMORY; } msg->dn = ldb_dn_copy(msg, user_dn); if (!msg->dn) { ldb_transaction_cancel(ldb); + talloc_free(user_dn); + talloc_free(msg); return NT_STATUS_NO_MEMORY; } @@ -1947,10 +1950,12 @@ NTSTATUS samdb_set_password_sid(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, user_dn, NULL, msg, new_password, lmNewHash, ntNewHash, - user_change, /* This is a password set, not change */ + user_change, reject_reason, _dominfo); if (!NT_STATUS_IS_OK(nt_status)) { ldb_transaction_cancel(ldb); + talloc_free(user_dn); + talloc_free(msg); return nt_status; } @@ -1958,16 +1963,23 @@ NTSTATUS samdb_set_password_sid(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, ret = samdb_replace(ldb, mem_ctx, msg); if (ret != LDB_SUCCESS) { ldb_transaction_cancel(ldb); + talloc_free(user_dn); + talloc_free(msg); return NT_STATUS_ACCESS_DENIED; } + talloc_free(msg); + ret = ldb_transaction_commit(ldb); if (ret != LDB_SUCCESS) { DEBUG(0,("Failed to commit transaction to change password on %s: %s\n", -ldb_dn_get_linearized(msg->dn), +ldb_dn_get_linearized(user_dn), ldb_errstring(ldb))); + talloc_free(user_dn); return NT_STATUS_TRANSACTION_ABORTED; } + + talloc_free(user_dn); return NT_STATUS_OK; } -- Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.108-54-g68a8ee9
The branch, master has been updated via 68a8ee99b128a5ec883600735626bdb3bbc9c503 (commit) from af6656f2844d8fd72204a70358c9d589dbe1bd34 (commit) http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master - Log - commit 68a8ee99b128a5ec883600735626bdb3bbc9c503 Author: Ronnie Sahlberg Date: Mon Dec 14 15:40:54 2009 +1100 remove the variable "disable when unhealthy" there is no rational need for a setting where we permanently mark nodes as disabled everytime an eventscript fails --- Summary of changes: include/ctdb_private.h |1 - server/ctdb_monitor.c |4 server/ctdb_tunables.c |1 - 3 files changed, 0 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/include/ctdb_private.h b/include/ctdb_private.h index 142bbd5..0118dab 100644 --- a/include/ctdb_private.h +++ b/include/ctdb_private.h @@ -112,7 +112,6 @@ struct ctdb_tunable { uint32_t rerecovery_timeout; uint32_t enable_bans; uint32_t deterministic_public_ips; - uint32_t disable_when_unhealthy; uint32_t reclock_ping_period; uint32_t no_ip_failback; uint32_t verbose_memory_names; diff --git a/server/ctdb_monitor.c b/server/ctdb_monitor.c index 0e5fbc2..54cdac1 100644 --- a/server/ctdb_monitor.c +++ b/server/ctdb_monitor.c @@ -138,10 +138,6 @@ static void ctdb_health_callback(struct ctdb_context *ctdb, int status, void *p) DEBUG(DEBUG_NOTICE,("monitor event failed - disabling node\n")); node->flags |= NODE_FLAGS_UNHEALTHY; ctdb->monitor->next_interval = 5; - if (ctdb->tunable.disable_when_unhealthy != 0) { - DEBUG(DEBUG_INFO, ("DISABLING node since it became unhealthy\n")); - node->flags |= NODE_FLAGS_DISABLED; - } ctdb_run_notification_script(ctdb, "unhealthy"); diff --git a/server/ctdb_tunables.c b/server/ctdb_tunables.c index 6f657e6..6eb1b43 100644 --- a/server/ctdb_tunables.c +++ b/server/ctdb_tunables.c @@ -47,7 +47,6 @@ static const struct { { "RerecoveryTimeout", 10, offsetof(struct ctdb_tunable, rerecovery_timeout) }, { "EnableBans", 1, offsetof(struct ctdb_tunable, enable_bans) }, { "DeterministicIPs", 1, offsetof(struct ctdb_tunable, deterministic_public_ips) }, - { "DisableWhenUnhealthy", 0, offsetof(struct ctdb_tunable, disable_when_unhealthy) }, { "ReclockPingPeriod", 60, offsetof(struct ctdb_tunable, reclock_ping_period) }, { "NoIPFailback", 0, offsetof(struct ctdb_tunable, no_ip_failback) }, { "VerboseMemoryNames", 0, offsetof(struct ctdb_tunable, verbose_memory_names) }, -- CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.108-57-g401f421
The branch, master has been updated via 401f421fa003d9515df15e759b50b56e0c67d69c (commit) via 1b4e7bb548976b99f122142b040494b6f9911962 (commit) via 0ea0e27d93398df997d3df9d8bf112358af3a4a5 (commit) from 68a8ee99b128a5ec883600735626bdb3bbc9c503 (commit) http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master - Log - commit 401f421fa003d9515df15e759b50b56e0c67d69c Author: Ronnie Sahlberg Date: Mon Dec 14 15:48:47 2009 +1100 cleanup: remove a tunable we no longer use in the eventscripts any more : EventScriptUnhealthyOnTimeout commit 1b4e7bb548976b99f122142b040494b6f9911962 Author: Rusty Russell Date: Thu Dec 10 20:35:54 2009 +1030 ctdb: don't print OUTPUT: for DISABLED scripts In other news, did you know ctime() returns a \n-terminated string? Signed-off-by: Rusty Russell commit 0ea0e27d93398df997d3df9d8bf112358af3a4a5 Author: Rusty Russell Date: Thu Dec 10 20:25:33 2009 +1030 eventscript: fix monitoring when killed by another script command Commit c1ba1392fe "eventscript: get rid of ctdb_control_event_script_finished altogether" was wrong: there is one case where we want to free the script without transferring their status to last_status. This happens because we always kill an running monitor command when we run any other command. This still isn't quite right (and never was): the callback will be called with status value 0, which might flip us to HEALTHY if we were unhealthy. This is conveniently fixed in my next set of patches :) Signed-off-by: Rusty Russell --- Summary of changes: include/ctdb_private.h |1 - server/ctdb_tunables.c |1 - server/eventscript.c | 21 ++--- tools/ctdb.c | 10 ++ 4 files changed, 20 insertions(+), 13 deletions(-) Changeset truncated at 500 lines: diff --git a/include/ctdb_private.h b/include/ctdb_private.h index 0118dab..a5a931f 100644 --- a/include/ctdb_private.h +++ b/include/ctdb_private.h @@ -104,7 +104,6 @@ struct ctdb_tunable { uint32_t tickle_update_interval; uint32_t script_timeout; uint32_t script_ban_count; /* ban after this many consec timeouts*/ - uint32_t script_unhealthy_on_timeout; /* don't ban on timeout; set node unhealthy */ uint32_t recovery_grace_period; uint32_t recovery_ban_period; uint32_t database_hash_size; diff --git a/server/ctdb_tunables.c b/server/ctdb_tunables.c index 6eb1b43..e737e20 100644 --- a/server/ctdb_tunables.c +++ b/server/ctdb_tunables.c @@ -39,7 +39,6 @@ static const struct { { "TickleUpdateInterval",20, offsetof(struct ctdb_tunable, tickle_update_interval) }, { "EventScriptTimeout", 30, offsetof(struct ctdb_tunable, script_timeout) }, { "EventScriptBanCount", 10, offsetof(struct ctdb_tunable, script_ban_count) }, - { "EventScriptUnhealthyOnTimeout", 0, offsetof(struct ctdb_tunable, script_unhealthy_on_timeout) }, { "RecoveryGracePeriod", 120, offsetof(struct ctdb_tunable, recovery_grace_period) }, { "RecoveryBanPeriod", 300, offsetof(struct ctdb_tunable, recovery_ban_period) }, { "DatabaseHashSize", 1, offsetof(struct ctdb_tunable, database_hash_size) }, diff --git a/server/eventscript.c b/server/eventscript.c index 1e74446..5bec0e0 100644 --- a/server/eventscript.c +++ b/server/eventscript.c @@ -514,11 +514,13 @@ static int event_script_destructor(struct ctdb_event_script_state *state) state->ctdb->current_monitor = NULL; } - /* Save our status as the last executed status. */ - talloc_free(state->ctdb->last_status[state->call]); - state->ctdb->last_status[state->call] = state->scripts; - if (state->current < state->ctdb->last_status[state->call]->num_scripts) { - state->ctdb->last_status[state->call]->num_scripts = state->current+1; + /* Save our scripts as the last executed status, if we have them. */ + if (state->scripts) { + talloc_free(state->ctdb->last_status[state->call]); + state->ctdb->last_status[state->call] = state->scripts; + if (state->current < state->ctdb->last_status[state->call]->num_scripts) { + state->ctdb->last_status[state->call]->num_scripts = state->current+1; + } } /* This is allowed to free us; talloc will prevent double free anyway, @@ -622,8 +624,13 @@ static int ctdb_event_script_callback_v(struct ctdb_context *ctdb, } /* Kill off any running monitor events to run this event. */ - talloc_free(ctdb->current_monitor); - ctdb->current_monitor = NULL; + if (ctdb->current_monitor) { + /* Discard script status so we don't save to last_stat
Build status as of Mon Dec 14 07:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-12-13 00:00:04.0 -0700 +++ /home/build/master/cache/broken_results.txt 2009-12-14 00:00:03.0 -0700 @@ -1,22 +1,22 @@ -Build status as of Sun Dec 13 07:00:02 2009 +Build status as of Mon Dec 14 07:00:02 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 5 1 0 +ccache 3 1 0 distcc 0 0 0 -ldb 35 35 0 +ldb 34 34 0 libreplace 2 1 0 lorikeet 0 0 0 pidl 23 23 0 -ppp 3 0 0 -rsync32 10 0 +ppp 2 0 0 +rsync33 12 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 32 31 0 -samba_3_master 33 25 4 -samba_3_next 33 32 2 -samba_4_0_test 35 32 0 -talloc 5 1 0 -tdb 5 1 0 +samba_3_current 1 1 0 +samba_3_master 32 23 4 +samba_3_next 32 31 2 +samba_4_0_test 34 31 0 +talloc 4 1 0 +tdb 4 1 0
[SCM] CTDB repository - branch master updated - ctdb-1.0.108-58-g5c8e56f
The branch, master has been updated via 5c8e56fc7a518e115bceac257867739283cf6a1e (commit) from 401f421fa003d9515df15e759b50b56e0c67d69c (commit) http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master - Log - commit 5c8e56fc7a518e115bceac257867739283cf6a1e Author: Ronnie Sahlberg Date: Mon Dec 14 15:53:23 2009 +1100 Rename the tunable EventScriptBanCount to EventScriptTimeoutCount since we no longer ban nodes when dodgy scripts continue to hang. We now only mark nodes as unhealthy if monitor events fail or timeout. Never ban. --- Summary of changes: include/ctdb_private.h |2 +- server/ctdb_monitor.c |4 ++-- server/ctdb_tunables.c |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/include/ctdb_private.h b/include/ctdb_private.h index a5a931f..e490b21 100644 --- a/include/ctdb_private.h +++ b/include/ctdb_private.h @@ -103,7 +103,7 @@ struct ctdb_tunable { uint32_t monitor_interval; uint32_t tickle_update_interval; uint32_t script_timeout; - uint32_t script_ban_count; /* ban after this many consec timeouts*/ + uint32_t script_timeout_count; /* allow dodgy scripts to hang this many times in a row before we mark the node unhealthy */ uint32_t recovery_grace_period; uint32_t recovery_ban_period; uint32_t database_hash_size; diff --git a/server/ctdb_monitor.c b/server/ctdb_monitor.c index 54cdac1..2bf5dcb 100644 --- a/server/ctdb_monitor.c +++ b/server/ctdb_monitor.c @@ -126,8 +126,8 @@ static void ctdb_health_callback(struct ctdb_context *ctdb, int status, void *p) if (status == -ETIME) { ctdb->event_script_timeouts++; - if (ctdb->event_script_timeouts > ctdb->tunable.script_ban_count) { - DEBUG(DEBUG_ERR, ("Maximum timeout count %u reached for eventscript. Making node unhealthy\n", ctdb->tunable.script_ban_count)); + if (ctdb->event_script_timeouts >= ctdb->tunable.script_timeout_count) { + DEBUG(DEBUG_ERR, ("Maximum timeout count %u reached for eventscript. Making node unhealthy\n", ctdb->tunable.script_timeout_count)); } else { /* We pretend this is OK. */ goto after_change_status; diff --git a/server/ctdb_tunables.c b/server/ctdb_tunables.c index e737e20..8722603 100644 --- a/server/ctdb_tunables.c +++ b/server/ctdb_tunables.c @@ -38,7 +38,7 @@ static const struct { { "MonitorInterval", 15, offsetof(struct ctdb_tunable, monitor_interval) }, { "TickleUpdateInterval",20, offsetof(struct ctdb_tunable, tickle_update_interval) }, { "EventScriptTimeout", 30, offsetof(struct ctdb_tunable, script_timeout) }, - { "EventScriptBanCount", 10, offsetof(struct ctdb_tunable, script_ban_count) }, + { "EventScriptTimeoutCount", 1, offsetof(struct ctdb_tunable, script_timeout_count) }, { "RecoveryGracePeriod", 120, offsetof(struct ctdb_tunable, recovery_grace_period) }, { "RecoveryBanPeriod", 300, offsetof(struct ctdb_tunable, recovery_ban_period) }, { "DatabaseHashSize", 1, offsetof(struct ctdb_tunable, database_hash_size) }, -- CTDB repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 8804b13... WHATSNEW: Update changes since Samba 3.5.0pre1. from d2453d9... s3: Fix a very embarrassing build failure http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 8804b13c96dd0d8334762f968a349d1e432a1acc Author: Karolin Seeger Date: Mon Dec 14 08:39:54 2009 +0100 WHATSNEW: Update changes since Samba 3.5.0pre1. Karolin --- Summary of changes: WHATSNEW.txt |5 + 1 files changed, 5 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 7dcafd5..9a18f60 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -116,6 +116,10 @@ o Jeremy Allison * Refactor reply_rmdir to use handle based code. +o Dan Cox +* BUG 2350: Add LDAP Alias Dereferencing support. + + o Günther Deschner * BUG 6929: Fix build with recent heimdal. * Fix several printing issues. @@ -163,6 +167,7 @@ o Karolin Seeger o Bo Yang * BUG 6879: Fix crash in Winbind. * Fix crash in free_file_list(). +* Give the user a chance to change password when password will expire soon. ## -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-stable updated
The branch, v3-5-stable has been updated via ea24a32... WHATSNEW: Update changes since Samba 3.5.0pre1. via 9b94aec... s3: Fix a very embarrassing build failure (cherry picked from commit d2453d9a944e2d8ecebeecb94014057dd4fc0fd6) via f364a3c... s3:docs: document ldap deref (cherry picked from commit 54d072b83c53f393253052efd5197b48fac61acb) via 66a64e4... s3: add LDAP Alias Dereferencing support via ab21c2c... s3: keep subsecond times on cross-filesystem moves and don't follow links (cherry picked from commit faccec7b97b469b170932f27d8b7e0baf985a909) via 32aa54b... s3:packaging: Fix version detection. via ae6e1fe... s3:packaging: Fix source dir. via 8805cb6... s3:packaging: Fix typo in comment. via 1980094... s3: check for PAM_RADIO_TYPE. via 6552778... s3: Fix build on non-linux platform. via 95d0192... s3: Give the user a chance to change password when password will expire soon. via 19ed997... s3:doc: make dos filetimes description less contradictory (cherry picked from commit 2a6391bc43cf2550731039bf158d561b307c9c58) via 3647eb0... s3: make sys_posix_fallocate more generic via 925e825... s3: allocate only "new" space, not "old" sparse space in the posix_fallocate path from 352adf3... WHATSNEW: Add changes since 3.5.0pre1. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable - Log - commit ea24a32d4511a643b26c4abd69e5c40ec924ac5d Author: Karolin Seeger Date: Mon Dec 14 08:39:54 2009 +0100 WHATSNEW: Update changes since Samba 3.5.0pre1. Karolin (cherry picked from commit 8804b13c96dd0d8334762f968a349d1e432a1acc) commit 9b94aec3d9415330a88aeff0261eab1f9c3aaae7 Author: Volker Lendecke Date: Sat Dec 12 16:58:31 2009 +0100 s3: Fix a very embarrassing build failure (cherry picked from commit d2453d9a944e2d8ecebeecb94014057dd4fc0fd6) commit f364a3cdfaf3f658f5f33d24a9ce55bf5ed0cf15 Author: Björn Jacke Date: Fri Dec 11 13:28:31 2009 +0100 s3:docs: document ldap deref (cherry picked from commit 54d072b83c53f393253052efd5197b48fac61acb) commit 66a64e4ebf56fc7eb61de25896a0a8adb7ec3d5d Author: Björn Jacke Date: Thu Dec 10 21:00:26 2009 +0100 s3: add LDAP Alias Dereferencing support Thanks to Dan Cox for initial patch for 3.0. This closes #2350. The default for "ldap deref" is "auto" which means the LDAP library's default behaviour will be used and samba does not set any dereferencing parameter by itself. (cherry picked from commit 8adbc166b230b37ff18ba70f2280a9a729240ff1) commit ab21c2c274f1a5d1e405da4be36c194a02141311 Author: Björn Jacke Date: Wed Dec 9 02:06:17 2009 +0100 s3: keep subsecond times on cross-filesystem moves and don't follow links (cherry picked from commit faccec7b97b469b170932f27d8b7e0baf985a909) commit 32aa54bec778f13f0c69d91f61a322c3739f6b84 Author: Karolin Seeger Date: Thu Dec 10 14:57:08 2009 +0100 s3:packaging: Fix version detection. Adapted from 728b01fc03. Thanks god I was not root! It would have delted /*! Karolin (cherry picked from commit 0604c696a05773a439538d88f1b45aa6637766a7) (cherry picked from commit fd30552aab88572b2d5944b9b87ee8ca76d29b35) commit ae6e1fee100e12b88cc258f4dfebfcbbf33bac06 Author: Karolin Seeger Date: Thu Dec 10 14:26:58 2009 +0100 s3:packaging: Fix source dir. Karolin (cherry picked from commit 85e79a2a03e8c1c6275363c39b0fa71283214562) (cherry picked from commit 1ed3172d10ca96816ec548996953579ec55da660) commit 8805cb66d802e16630440d0abdded526ac8891e6 Author: Karolin Seeger Date: Thu Dec 10 14:08:43 2009 +0100 s3:packaging: Fix typo in comment. Karolin (cherry picked from commit b5011ba2c897fa177f1e22dde075055b9ffd271d) (cherry picked from commit 3b812b134d819097df51bb20bdb4fd856f4ad00d) commit 1980094125fb02ebb81960d4632adace29c32d1f Author: Bo Yang Date: Thu Dec 10 19:29:24 2009 +0800 s3: check for PAM_RADIO_TYPE. Signed-off-by: Bo Yang (cherry picked from commit c7e3a2dc319cc6504356be7fa7970917404a69b5) (cherry picked from commit fa572721577732c1b5d1cd32de4479a34c895919) commit 6552778ed65a65268b14dc0ef88a0fd9da3e62b3 Author: Bo Yang Date: Thu Dec 10 17:20:03 2009 +0800 s3: Fix build on non-linux platform. Signed-off-by: Bo Yang (cherry picked from commit b386c3311d8c05ccbd075ab86be2ddace335b73b) (cherry picked from commit 9a522cd96d66f6a6cf5f483fb8928982bbe95ea4) commit 95d0192706b5f8caf2aa091a401aa6990d70986f Author: Bo Yang Date: Thu Dec 10 14:30:13 2009 +0800 s3: Give the user a chance to change password when password will expire soon. Signed-off-by: Bo Yang (cherry picked from commit f7723293a07d1b7a4f3476939590fa8db6080d06) (cherry picked from commit 7097f6101e52220f7ff0ef821efa5b1810b2604
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f740bdc... s3:docs: Fix 'make manpages3'. from f8c34c4... s4:"samdb_set_password_sid" - clean up created objects correctly http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f740bdc47bb53dc6d17e48e1ad9c6f5fdd9ff102 Author: Karolin Seeger Date: Mon Dec 14 08:58:50 2009 +0100 s3:docs: Fix 'make manpages3'. Karolin --- Summary of changes: docs-xml/smbdotconf/ldap/ldapderef.xml |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/ldap/ldapderef.xml b/docs-xml/smbdotconf/ldap/ldapderef.xml index e4868a6..d102f51 100644 --- a/docs-xml/smbdotconf/ldap/ldapderef.xml +++ b/docs-xml/smbdotconf/ldap/ldapderef.xml @@ -8,8 +8,8 @@ to use a certain alias dereferencing method. The default is auto, which means that the default setting of the ldap client library will be kept. Other possible values are - never, finding, - searching and always. Grab + never, finding, + searching and always. Grab your LDAP manual for more information. -- Samba Shared Repository