Build status as of Sat Apr 4 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-04-03 00:00:10.0 + +++ /home/build/master/cache/broken_results.txt 2009-04-04 00:00:35.0 + @@ -1,21 +1,21 @@ -Build status as of Fri Apr 3 00:00:02 2009 +Build status as of Sat Apr 4 00:00:02 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 28 5 0 +ccache 31 6 0 distcc 0 0 0 -ldb 28 28 0 -libreplace 27 12 0 +ldb 31 31 0 +libreplace 31 13 0 lorikeet 0 0 0 -pidl 20 3 0 -ppp 11 0 0 -rsync27 11 0 +pidl 21 3 0 +ppp 13 0 0 +rsync31 12 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 26 17 0 -samba_3_master 27 25 0 -samba_4_0_test 28 27 2 -talloc 28 28 0 -tdb 26 8 0 +samba_3_current 29 17 0 +samba_3_master 28 25 0 +samba_4_0_test 31 29 4 +talloc 31 31 0 +tdb 29 10 0
svn commit: samba-web r1286 - in trunk/news: .
Author: jra Date: 2009-04-03 23:13:01 + (Fri, 03 Apr 2009) New Revision: 1286 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1286 Log: Fix the umlaut. Modified: trunk/news/samba_and_guis.html Changeset: Modified: trunk/news/samba_and_guis.html === --- trunk/news/samba_and_guis.html 2009-04-03 23:10:34 UTC (rev 1285) +++ trunk/news/samba_and_guis.html 2009-04-03 23:13:01 UTC (rev 1286) @@ -62,7 +62,7 @@ and authentication service that can be used by everyone and is developed as a community of equals. -Volker Lendecke, Jeremy Allison, Jim McDonough, and Lars M�ller +Volker Lendecke, Jeremy Allison, Jim McDonough, and Lars Müller Samba Team
svn commit: samba-web r1285 - in trunk/news: .
Author: jra Date: 2009-04-03 23:10:34 + (Fri, 03 Apr 2009) New Revision: 1285 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1285 Log: Added Lars. Jeremy. Modified: trunk/news/samba_and_guis.html Changeset: Modified: trunk/news/samba_and_guis.html === --- trunk/news/samba_and_guis.html 2009-04-03 20:51:59 UTC (rev 1284) +++ trunk/news/samba_and_guis.html 2009-04-03 23:10:34 UTC (rev 1285) @@ -62,7 +62,7 @@ and authentication service that can be used by everyone and is developed as a community of equals. -Volker Lendecke, Jeremy Allison, and Jim McDonough +Volker Lendecke, Jeremy Allison, Jim McDonough, and Lars M�ller Samba Team
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5192-ge2cd008
The branch, v3-3-test has been updated via e2cd00813c5221a03508249e5bb49e648befc734 (commit) via 4955e1610af3086cc7e8d0344313a124b23a4e31 (commit) from 962a92024dda7db06d07d6e736d79d25c5d8f40a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit e2cd00813c5221a03508249e5bb49e648befc734 Author: Volker Lendecke Date: Fri Apr 3 14:24:02 2009 -0700 Use cluster-aware procid_is_me instead of comparing pid's commit 4955e1610af3086cc7e8d0344313a124b23a4e31 Author: Volker Lendecke Date: Fri Apr 3 14:03:43 2009 -0700 Use procid_str in debug messages for better cluster-debuggability --- Summary of changes: source/locking/brlock.c |4 ++-- source/smbd/oplock.c| 28 +++- 2 files changed, 17 insertions(+), 15 deletions(-) Changeset truncated at 500 lines: diff --git a/source/locking/brlock.c b/source/locking/brlock.c index 032aaa5..cd9a203 100644 --- a/source/locking/brlock.c +++ b/source/locking/brlock.c @@ -41,11 +41,11 @@ static struct db_context *brlock_db; static void print_lock_struct(unsigned int i, struct lock_struct *pls) { - DEBUG(10,("[%u]: smbpid = %u, tid = %u, pid = %u, ", + DEBUG(10,("[%u]: smbpid = %u, tid = %u, pid = %s, ", i, (unsigned int)pls->context.smbpid, (unsigned int)pls->context.tid, - (unsigned int)procid_to_pid(&pls->context.pid) )); + procid_str(debug_ctx(), &pls->context.pid) )); DEBUG(10,("start = %.0f, size = %.0f, fnum = %d, %s %s\n", (double)pls->start, diff --git a/source/smbd/oplock.c b/source/smbd/oplock.c index 37747c7..a07d05d 100644 --- a/source/smbd/oplock.c +++ b/source/smbd/oplock.c @@ -412,8 +412,9 @@ static void process_oplock_async_level2_break_message(struct messaging_context * /* De-linearize incoming message. */ message_to_share_mode_entry(&msg, (char *)data->data); - DEBUG(10, ("Got oplock async level 2 break message from pid %d: %s/%lu\n", - (int)procid_to_pid(&src), file_id_string_tos(&msg.id), msg.share_file_id)); + DEBUG(10, ("Got oplock async level 2 break message from pid %s: " + "%s/%lu\n", procid_str(debug_ctx(), &src), + file_id_string_tos(&msg.id), msg.share_file_id)); fsp = initial_break_processing(msg.id, msg.share_file_id); @@ -455,7 +456,7 @@ static void process_oplock_async_level2_break_message(struct messaging_context * } /* Need to wait before sending a break message if we sent ourselves this message. */ - if (procid_to_pid(&src) == sys_getpid()) { + if (procid_is_me(&src)) { wait_before_sending_break(); } @@ -507,8 +508,9 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx, /* De-linearize incoming message. */ message_to_share_mode_entry(&msg, (char *)data->data); - DEBUG(10, ("Got oplock break message from pid %d: %s/%lu\n", - (int)procid_to_pid(&src), file_id_string_tos(&msg.id), msg.share_file_id)); + DEBUG(10, ("Got oplock break message from pid %s: %s/%lu\n", + procid_str(debug_ctx(), &src), file_id_string_tos(&msg.id), + msg.share_file_id)); fsp = initial_break_processing(msg.id, msg.share_file_id); @@ -562,7 +564,7 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx, } /* Need to wait before sending a break message if we sent ourselves this message. */ - if (procid_to_pid(&src) == sys_getpid()) { + if (procid_is_me(&src)) { wait_before_sending_break(); } @@ -621,8 +623,8 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx, pull_file_id_16((char *)data->data, &id); file_id = (unsigned long)IVAL(data->data, 16); - DEBUG(10, ("Got kernel oplock break message from pid %d: %s/%u\n", - (int)procid_to_pid(&src), file_id_string_tos(&id), + DEBUG(10, ("Got kernel oplock break message from pid %s: %s/%u\n", + procid_str(debug_ctx(), &src), file_id_string_tos(&id), (unsigned int)file_id)); fsp = initial_break_processing(id, file_id); @@ -713,9 +715,9 @@ static void process_oplock_break_response(struct messaging_context *msg_ctx, /* De-linearize incoming message. */ message_to_share_mode_entry(&msg, (char *)data->data); - DEBUG(10, ("Got oplock break response from pid %d: %s/%lu mid %u\n", - (int)procid_to_pid(&src), file_id_string_tos(&msg.id), msg.share_file_id, - (unsigned int)msg.op_mid)); + DEBUG(10, ("Got oplock bre
svn commit: samba-web r1284 - in trunk: . news
Author: deryck Date: 2009-04-03 20:51:59 + (Fri, 03 Apr 2009) New Revision: 1284 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1284 Log: Move Volker and Jeremy's statement to a static file for inclusion via a news posting (forthcoming). Also, add Jim's name to the signature on the statement. Added: trunk/news/samba_and_guis.html Modified: trunk/index.html Changeset: Modified: trunk/index.html === --- trunk/index.html2009-04-03 16:19:03 UTC (rev 1283) +++ trunk/index.html2009-04-03 20:51:59 UTC (rev 1284) @@ -19,68 +19,6 @@ Current Release -3 April 2009 -Samba and GUIs - -Krishna Ganugapati recently in an -http://howsoftwareisbuilt.com/2009/03/31/interview-with-krishna-ganugapati-vp-of-engineering-likewise-software/";>interview -pointed out that -Samba has no GUI style tools. Krishna is probably referring to Samba's -capability to be configured by editing the configuration in the smb.conf -file. - - -Even though command shell geeks may still prefer this method, the team - addresses the main goal of Samba to provide seamless interoperability - with Windows clients. So, in its best sense, the Microsoft Management - Console is the GUI. We provide the RPC-based infrastructure for Windows - administrators to configure Samba using the tools they are used to. - - Some of those RPC services were provided a couple of years ago by - Centeris, now renamed to - http://www.likewisesoftware.com";>Likewise, - the company Krishna is working for. Thanks for that, we hope there will be - more contributions to Samba like that from Likewise in the future! - - - -Michael Adam has done great work to make the registry-based configuration - happen. With Samba 3.2 and even more so with Samba 3.3 you can configure - everything you can not do via the MMC with your well-known regedit.exe - from Windows. This very well matches expectations of Windows administrators: - The normal day-to-day administration is done via the MMC, and when it comes - down to fine-tuning, you need to dive into the registry. - - For an introduction to the registry configuration, see Michael's http://www.samba.org/~obnox/presentations/linux-kongress-2008/lk2008-obnox.pdf";>paper, - presented at the Linux Kongress 2008, published in the proceedings with ISBN - 978-3-86541-300-0. - -Günther Deschner has developed a gtk-based utility to join a - domain. Screenshots can be found on http://samba.org/~gd/netdomjoin-gui/";>samba.org. This shipped with - Samba 3.2.0 and can be compiled easily wherever the gtk libraries are - available. See the http://sambaxp.org/files/SambaXP2008-DATA/01-07-Guenther_Deschner-joining_a_domain.pdf";>slides of Günther's 2008 SambaXP talk. - - - We also take issue with Likewise's claim - that pushing changes upstream into Samba is a challenge. - - The Samba project has many corporate contributors - who have found that working with the Open Source/Free Software - Community is preferable to developing a parallel - technology under their sole control. Companies - such as IBM, HP, Intel, Apple, Red Hat, Novell, Isilon, - Data Domain, ReadyNAS (now NetGear) and Veritas (now Symantec) have - worked with the Samba Team to create a shared, compelling file, print - and authentication service that can be used by - everyone and is developed as a community of equals. - -Volker Lendecke and Jeremy Allison -Samba Team - 1 April 2009 Samba 3.3.3 Available for Download Added: trunk/news/samba_and_guis.html === --- trunk/news/samba_and_guis.html 2009-04-03 16:19:03 UTC (rev 1283) +++ trunk/news/samba_and_guis.html 2009-04-03 20:51:59 UTC (rev 1284) @@ -0,0 +1,68 @@ + + Samba - opening windows to a wider world + + + +3 April 2009 +Samba and GUIs + +Krishna Ganugapati recently in an +http://howsoftwareisbuilt.com/2009/03/31/interview-with-krishna-ganugapati-vp-of-engineering-likewise-software/";>interview +pointed out that +Samba has no GUI style tools. Krishna is probably referring to Samba's +capability to be configured by editing the configuration in the smb.conf +file. + + +Even though command shell geeks may still prefer this method, the team + addresses the main goal of Samba to provide seamless interoperability + with Windows clients. So, in its best sense, the Microsoft Management + Console is the GUI. We provide the RPC-based infrastructure for Windows + administrators to configure Samba using the tools they are used to. + + Some of those RPC services were provided a couple of years ago by + Centeris,
svn commit: samba-web r1283 - in trunk: .
Author: obnox Date: 2009-04-03 16:19:03 + (Fri, 03 Apr 2009) New Revision: 1283 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1283 Log: Publish a comment on the main web site. Michael Modified: trunk/index.html Changeset: Modified: trunk/index.html === --- trunk/index.html2009-04-01 13:09:35 UTC (rev 1282) +++ trunk/index.html2009-04-03 16:19:03 UTC (rev 1283) @@ -19,6 +19,68 @@ Current Release +3 April 2009 +Samba and GUIs + +Krishna Ganugapati recently in an +http://howsoftwareisbuilt.com/2009/03/31/interview-with-krishna-ganugapati-vp-of-engineering-likewise-software/";>interview +pointed out that +Samba has no GUI style tools. Krishna is probably referring to Samba's +capability to be configured by editing the configuration in the smb.conf +file. + + +Even though command shell geeks may still prefer this method, the team + addresses the main goal of Samba to provide seamless interoperability + with Windows clients. So, in its best sense, the Microsoft Management + Console is the GUI. We provide the RPC-based infrastructure for Windows + administrators to configure Samba using the tools they are used to. + + Some of those RPC services were provided a couple of years ago by + Centeris, now renamed to + http://www.likewisesoftware.com";>Likewise, + the company Krishna is working for. Thanks for that, we hope there will be + more contributions to Samba like that from Likewise in the future! + + + +Michael Adam has done great work to make the registry-based configuration + happen. With Samba 3.2 and even more so with Samba 3.3 you can configure + everything you can not do via the MMC with your well-known regedit.exe + from Windows. This very well matches expectations of Windows administrators: + The normal day-to-day administration is done via the MMC, and when it comes + down to fine-tuning, you need to dive into the registry. + + For an introduction to the registry configuration, see Michael's http://www.samba.org/~obnox/presentations/linux-kongress-2008/lk2008-obnox.pdf";>paper, + presented at the Linux Kongress 2008, published in the proceedings with ISBN + 978-3-86541-300-0. + +Günther Deschner has developed a gtk-based utility to join a + domain. Screenshots can be found on http://samba.org/~gd/netdomjoin-gui/";>samba.org. This shipped with + Samba 3.2.0 and can be compiled easily wherever the gtk libraries are + available. See the http://sambaxp.org/files/SambaXP2008-DATA/01-07-Guenther_Deschner-joining_a_domain.pdf";>slides of Günther's 2008 SambaXP talk. + + + We also take issue with Likewise's claim + that pushing changes upstream into Samba is a challenge. + + The Samba project has many corporate contributors + who have found that working with the Open Source/Free Software + Community is preferable to developing a parallel + technology under their sole control. Companies + such as IBM, HP, Intel, Apple, Red Hat, Novell, Isilon, + Data Domain, ReadyNAS (now NetGear) and Veritas (now Symantec) have + worked with the Samba Team to create a shared, compelling file, print + and authentication service that can be used by + everyone and is developed as a community of equals. + +Volker Lendecke and Jeremy Allison +Samba Team + 1 April 2009 Samba 3.3.3 Available for Download
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-839-gdf29f49
The branch, master has been updated via df29f49eddbfcd5c6ac9a26d688a1a3f7a087da5 (commit) from 43372b27403f617897bab564c42eead4d64532e4 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit df29f49eddbfcd5c6ac9a26d688a1a3f7a087da5 Author: Günther Deschner Date: Tue Dec 9 13:25:59 2008 +0100 s3-samr: add support for setting password hashes via samr_SetUserInfo level 21. Guenther --- Summary of changes: source3/rpc_server/srv_samr_nt.c | 57 +++-- 1 files changed, 53 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index c60d904..a4bfe73 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -3667,8 +3667,9 @@ static bool set_user_info_20(struct samr_UserInfo20 *id20, set_user_info_21 / -static NTSTATUS set_user_info_21(TALLOC_CTX *mem_ctx, -struct samr_UserInfo21 *id21, +static NTSTATUS set_user_info_21(struct samr_UserInfo21 *id21, +TALLOC_CTX *mem_ctx, +DATA_BLOB *session_key, struct samu *pwd) { NTSTATUS status; @@ -3686,6 +3687,52 @@ static NTSTATUS set_user_info_21(TALLOC_CTX *mem_ctx, return NT_STATUS_ACCESS_DENIED; } + if (id21->fields_present & SAMR_FIELD_NT_PASSWORD_PRESENT) { + if (id21->nt_password_set) { + DATA_BLOB in, out; + + if ((id21->nt_owf_password.length != 16) || + (id21->nt_owf_password.size != 16)) { + return NT_STATUS_INVALID_PARAMETER; + } + + if (!session_key->length) { + return NT_STATUS_NO_USER_SESSION_KEY; + } + + in = data_blob_const(id21->nt_owf_password.array, 16); + out = data_blob_talloc_zero(mem_ctx, 16); + + sess_crypt_blob(&out, &in, session_key, false); + + pdb_set_nt_passwd(pwd, out.data, PDB_CHANGED); + pdb_set_pass_last_set_time(pwd, time(NULL), PDB_CHANGED); + } + } + + if (id21->fields_present & SAMR_FIELD_LM_PASSWORD_PRESENT) { + if (id21->lm_password_set) { + DATA_BLOB in, out; + + if ((id21->lm_owf_password.length != 16) || + (id21->lm_owf_password.size != 16)) { + return NT_STATUS_INVALID_PARAMETER; + } + + if (!session_key->length) { + return NT_STATUS_NO_USER_SESSION_KEY; + } + + in = data_blob_const(id21->lm_owf_password.array, 16); + out = data_blob_talloc_zero(mem_ctx, 16); + + sess_crypt_blob(&out, &in, session_key, false); + + pdb_set_lanman_passwd(pwd, out.data, PDB_CHANGED); + pdb_set_pass_last_set_time(pwd, time(NULL), PDB_CHANGED); + } + } + /* we need to separately check for an account rename first */ if (id21->account_name.string && @@ -4147,8 +4194,10 @@ NTSTATUS _samr_SetUserInfo(pipes_struct *p, break; case 21: - status = set_user_info_21(p->mem_ctx, - &info->info21, pwd); + status = set_user_info_21(&info->info21, + p->mem_ctx, + &p->server_info->user_session_key, + pwd); break; case 23: -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5190-g962a920
The branch, v3-3-test has been updated via 962a92024dda7db06d07d6e736d79d25c5d8f40a (commit) via 3420ce3f2a9c75b3e339d2ab439f6c8df326ab47 (commit) from b737a6202cc18bfab091d5f45a3c30e97828e927 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 962a92024dda7db06d07d6e736d79d25c5d8f40a Author: Günther Deschner Date: Fri Apr 3 12:50:50 2009 +0200 s3-nsswitch: Fix Bug #6238 2nd part. zero blob pointer in wbcLogoffUserParams. Patch from Rashid N. Achilov . Guenther (cherry picked from commit 43372b27403f617897bab564c42eead4d64532e4) commit 3420ce3f2a9c75b3e339d2ab439f6c8df326ab47 Author: Günther Deschner Date: Fri Apr 3 12:06:40 2009 +0200 s3-samr: try to to fix password_expired flag handling. Guenther --- Summary of changes: source/include/proto.h|6 ++ source/nsswitch/pam_winbind.c |1 + source/rpc_server/srv_samr_nt.c | 120 ++--- source/rpc_server/srv_samr_util.c | 87 ++- 4 files changed, 162 insertions(+), 52 deletions(-) Changeset truncated at 500 lines: diff --git a/source/include/proto.h b/source/include/proto.h index 794742c..ec8637b 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -8373,6 +8373,8 @@ ssize_t write_to_internal_pipe(struct pipes_struct *p, char *data, size_t n); /* The following definitions come from rpc_server/srv_samr_util.c */ +void copy_id18_to_sam_passwd(struct samu *to, +struct samr_UserInfo18 *from); void copy_id20_to_sam_passwd(struct samu *to, struct samr_UserInfo20 *from); void copy_id21_to_sam_passwd(const char *log_prefix, @@ -8380,8 +8382,12 @@ void copy_id21_to_sam_passwd(const char *log_prefix, struct samr_UserInfo21 *from); void copy_id23_to_sam_passwd(struct samu *to, struct samr_UserInfo23 *from); +void copy_id24_to_sam_passwd(struct samu *to, +struct samr_UserInfo24 *from); void copy_id25_to_sam_passwd(struct samu *to, struct samr_UserInfo25 *from); +void copy_id26_to_sam_passwd(struct samu *to, +struct samr_UserInfo26 *from); /* The following definitions come from rpc_server/srv_spoolss.c */ diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c index 46e142c..26ef1d4 100644 --- a/source/nsswitch/pam_winbind.c +++ b/source/nsswitch/pam_winbind.c @@ -2406,6 +2406,7 @@ static int _pam_delete_cred(pam_handle_t *pamh, int flags, user, "wbcLogoffUser"); wbcFreeMemory(error); wbcFreeMemory(logoff.blobs); + logoff.blobs = NULL; if (!WBC_ERROR_IS_OK(wbc_status)) { _pam_log(ctx, LOG_INFO, diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c index 7a131b3..a946d2e 100644 --- a/source/rpc_server/srv_samr_nt.c +++ b/source/rpc_server/srv_samr_nt.c @@ -3743,12 +3743,7 @@ static NTSTATUS set_user_info_18(struct samr_UserInfo18 *id18, pdb_set_pass_last_set_time(pwd, time(NULL), PDB_CHANGED); } - if (id18->password_expired) { - pdb_set_pass_last_set_time(pwd, 0, PDB_CHANGED); - } else { - /* FIXME */ - pdb_set_pass_last_set_time(pwd, time(NULL), PDB_CHANGED); - } + copy_id18_to_sam_passwd(pwd, id18); return pdb_update_sam_account(pwd); } @@ -3955,23 +3950,16 @@ static NTSTATUS set_user_info_23(TALLOC_CTX *mem_ctx, set_user_info_pw / -static bool set_user_info_pw(uint8 *pass, struct samu *pwd, -int level) +static bool set_user_info_pw(uint8 *pass, struct samu *pwd) { uint32 len = 0; char *plaintext_buf = NULL; uint32 acct_ctrl; - time_t last_set_time; - enum pdb_value_state last_set_state; DEBUG(5, ("Attempting administrator password change for user %s\n", pdb_get_username(pwd))); acct_ctrl = pdb_get_acct_ctrl(pwd); - /* we need to know if it's expired, because this is an admin change, not a - user change, so it's still expired when we're done */ - last_set_state = pdb_get_init_flags(pwd, PDB_PASSLASTSET); - last_set_time = pdb_get_pass_last_set_time(pwd); if (!decode_pw_buffer(talloc_tos(), pass, @@ -4014,29 +4002,38 @@ static bool set_user_info_pw(uint8 *pass, struct samu *pwd, memset(plaintext_buf, '\0', strlen(plaintext_buf)); - /* -* A level 25 change does reset the
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-644-g5b8fc38
The branch, v3-4-test has been updated via 5b8fc3858d3327056cd1ff9d2a47f6992825fcf2 (commit) from 4996d89d19655ab6f0d4656ea72d6bad52ba7d6d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 5b8fc3858d3327056cd1ff9d2a47f6992825fcf2 Author: Günther Deschner Date: Fri Apr 3 12:50:50 2009 +0200 s3-nsswitch: Fix Bug #6238 2nd part. zero blob pointer in wbcLogoffUserParams. Patch from Rashid N. Achilov . Guenther (cherry picked from commit 43372b27403f617897bab564c42eead4d64532e4) --- Summary of changes: nsswitch/pam_winbind.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c index 5feccb6..0d33f59 100644 --- a/nsswitch/pam_winbind.c +++ b/nsswitch/pam_winbind.c @@ -2406,6 +2406,7 @@ static int _pam_delete_cred(pam_handle_t *pamh, int flags, user, "wbcLogoffUser"); wbcFreeMemory(error); wbcFreeMemory(logoff.blobs); + logoff.blobs = NULL; if (!WBC_ERROR_IS_OK(wbc_status)) { _pam_log(ctx, LOG_INFO, -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-838-g43372b2
The branch, master has been updated via 43372b27403f617897bab564c42eead4d64532e4 (commit) from 7ee4f168d8b18eaeed9cbdbf2db17090b8d35961 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 43372b27403f617897bab564c42eead4d64532e4 Author: Günther Deschner Date: Fri Apr 3 12:50:50 2009 +0200 s3-nsswitch: Fix Bug #6238 2nd part. zero blob pointer in wbcLogoffUserParams. Patch from Rashid N. Achilov . Guenther --- Summary of changes: nsswitch/pam_winbind.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c index 5feccb6..0d33f59 100644 --- a/nsswitch/pam_winbind.c +++ b/nsswitch/pam_winbind.c @@ -2406,6 +2406,7 @@ static int _pam_delete_cred(pam_handle_t *pamh, int flags, user, "wbcLogoffUser"); wbcFreeMemory(error); wbcFreeMemory(logoff.blobs); + logoff.blobs = NULL; if (!WBC_ERROR_IS_OK(wbc_status)) { _pam_log(ctx, LOG_INFO, -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-643-g4996d89
The branch, v3-4-test has been updated via 4996d89d19655ab6f0d4656ea72d6bad52ba7d6d (commit) via d5bec253f7494dd74cce3acf59ddd417900e5ad3 (commit) from 24ff9b8dba8e4e0918b0aabf5cb8bacecfbc39d7 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 4996d89d19655ab6f0d4656ea72d6bad52ba7d6d Author: Volker Lendecke Date: Fri Apr 3 10:43:13 2009 +0200 Use cluster-aware procid_is_me instead of comparing pid's commit d5bec253f7494dd74cce3acf59ddd417900e5ad3 Author: Volker Lendecke Date: Fri Apr 3 10:42:43 2009 +0200 Use procid_str in debug messages for better cluster-debuggability --- Summary of changes: source3/locking/brlock.c |4 ++-- source3/smbd/oplock.c| 28 +++- 2 files changed, 17 insertions(+), 15 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index aa522ac..be2948c 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -41,11 +41,11 @@ static struct db_context *brlock_db; static void print_lock_struct(unsigned int i, struct lock_struct *pls) { - DEBUG(10,("[%u]: smbpid = %u, tid = %u, pid = %u, ", + DEBUG(10,("[%u]: smbpid = %u, tid = %u, pid = %s, ", i, (unsigned int)pls->context.smbpid, (unsigned int)pls->context.tid, - (unsigned int)procid_to_pid(&pls->context.pid) )); + procid_str(debug_ctx(), &pls->context.pid) )); DEBUG(10,("start = %.0f, size = %.0f, fnum = %d, %s %s\n", (double)pls->start, diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 2287028..427eb5d 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -376,8 +376,9 @@ void process_oplock_async_level2_break_message(struct messaging_context *msg_ctx /* De-linearize incoming message. */ message_to_share_mode_entry(&msg, (char *)data->data); - DEBUG(10, ("Got oplock async level 2 break message from pid %d: %s/%lu\n", - (int)procid_to_pid(&src), file_id_string_tos(&msg.id), msg.share_file_id)); + DEBUG(10, ("Got oplock async level 2 break message from pid %s: " + "%s/%lu\n", procid_str(debug_ctx(), &src), + file_id_string_tos(&msg.id), msg.share_file_id)); fsp = initial_break_processing(msg.id, msg.share_file_id); @@ -419,7 +420,7 @@ void process_oplock_async_level2_break_message(struct messaging_context *msg_ctx } /* Need to wait before sending a break message if we sent ourselves this message. */ - if (procid_to_pid(&src) == sys_getpid()) { + if (procid_is_me(&src)) { wait_before_sending_break(); } @@ -472,8 +473,9 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx, /* De-linearize incoming message. */ message_to_share_mode_entry(&msg, (char *)data->data); - DEBUG(10, ("Got oplock break message from pid %d: %s/%lu\n", - (int)procid_to_pid(&src), file_id_string_tos(&msg.id), msg.share_file_id)); + DEBUG(10, ("Got oplock break message from pid %s: %s/%lu\n", + procid_str(debug_ctx(), &src), file_id_string_tos(&msg.id), + msg.share_file_id)); fsp = initial_break_processing(msg.id, msg.share_file_id); @@ -526,7 +528,7 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx, } /* Need to wait before sending a break message if we sent ourselves this message. */ - if (procid_to_pid(&src) == sys_getpid()) { + if (procid_is_me(&src)) { wait_before_sending_break(); } @@ -586,8 +588,8 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx, pull_file_id_24((char *)data->data, &id); file_id = (unsigned long)IVAL(data->data, 24); - DEBUG(10, ("Got kernel oplock break message from pid %d: %s/%u\n", - (int)procid_to_pid(&src), file_id_string_tos(&id), + DEBUG(10, ("Got kernel oplock break message from pid %s: %s/%u\n", + procid_str(debug_ctx(), &src), file_id_string_tos(&id), (unsigned int)file_id)); fsp = initial_break_processing(id, file_id); @@ -688,9 +690,9 @@ static void process_oplock_break_response(struct messaging_context *msg_ctx, /* De-linearize incoming message. */ message_to_share_mode_entry(&msg, (char *)data->data); - DEBUG(10, ("Got oplock break response from pid %d: %s/%lu mid %u\n", - (int)procid_to_pid(&src), file_id_string_tos(&msg.id), msg.share_file_id, - (unsigned int)msg.op_mid)); + DEBUG(10, ("Got
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-837-g7ee4f16
The branch, master has been updated via 7ee4f168d8b18eaeed9cbdbf2db17090b8d35961 (commit) via b63cd72ae44ae9dcc56b8be95b52d6e47ae1c20f (commit) from 09265bcff5a2fac42f5abf34b8b439aa0a6998a1 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 7ee4f168d8b18eaeed9cbdbf2db17090b8d35961 Author: Volker Lendecke Date: Fri Apr 3 10:43:13 2009 +0200 Use cluster-aware procid_is_me instead of comparing pid's commit b63cd72ae44ae9dcc56b8be95b52d6e47ae1c20f Author: Volker Lendecke Date: Fri Apr 3 10:42:43 2009 +0200 Use procid_str in debug messages for better cluster-debuggability --- Summary of changes: source3/locking/brlock.c |4 ++-- source3/smbd/oplock.c| 28 +++- 2 files changed, 17 insertions(+), 15 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index aa522ac..be2948c 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -41,11 +41,11 @@ static struct db_context *brlock_db; static void print_lock_struct(unsigned int i, struct lock_struct *pls) { - DEBUG(10,("[%u]: smbpid = %u, tid = %u, pid = %u, ", + DEBUG(10,("[%u]: smbpid = %u, tid = %u, pid = %s, ", i, (unsigned int)pls->context.smbpid, (unsigned int)pls->context.tid, - (unsigned int)procid_to_pid(&pls->context.pid) )); + procid_str(debug_ctx(), &pls->context.pid) )); DEBUG(10,("start = %.0f, size = %.0f, fnum = %d, %s %s\n", (double)pls->start, diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index ce00397..6add9f5 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -375,8 +375,9 @@ void process_oplock_async_level2_break_message(struct messaging_context *msg_ctx /* De-linearize incoming message. */ message_to_share_mode_entry(&msg, (char *)data->data); - DEBUG(10, ("Got oplock async level 2 break message from pid %d: %s/%lu\n", - (int)procid_to_pid(&src), file_id_string_tos(&msg.id), msg.share_file_id)); + DEBUG(10, ("Got oplock async level 2 break message from pid %s: " + "%s/%lu\n", procid_str(debug_ctx(), &src), + file_id_string_tos(&msg.id), msg.share_file_id)); fsp = initial_break_processing(msg.id, msg.share_file_id); @@ -418,7 +419,7 @@ void process_oplock_async_level2_break_message(struct messaging_context *msg_ctx } /* Need to wait before sending a break message if we sent ourselves this message. */ - if (procid_to_pid(&src) == sys_getpid()) { + if (procid_is_me(&src)) { wait_before_sending_break(); } @@ -464,8 +465,9 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx, /* De-linearize incoming message. */ message_to_share_mode_entry(&msg, (char *)data->data); - DEBUG(10, ("Got oplock break message from pid %d: %s/%lu\n", - (int)procid_to_pid(&src), file_id_string_tos(&msg.id), msg.share_file_id)); + DEBUG(10, ("Got oplock break message from pid %s: %s/%lu\n", + procid_str(debug_ctx(), &src), file_id_string_tos(&msg.id), + msg.share_file_id)); fsp = initial_break_processing(msg.id, msg.share_file_id); @@ -518,7 +520,7 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx, } /* Need to wait before sending a break message if we sent ourselves this message. */ - if (procid_to_pid(&src) == sys_getpid()) { + if (procid_is_me(&src)) { wait_before_sending_break(); } @@ -571,8 +573,8 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx, pull_file_id_24((char *)data->data, &id); file_id = (unsigned long)IVAL(data->data, 24); - DEBUG(10, ("Got kernel oplock break message from pid %d: %s/%u\n", - (int)procid_to_pid(&src), file_id_string_tos(&id), + DEBUG(10, ("Got kernel oplock break message from pid %s: %s/%u\n", + procid_str(debug_ctx(), &src), file_id_string_tos(&id), (unsigned int)file_id)); fsp = initial_break_processing(id, file_id); @@ -667,9 +669,9 @@ static void process_oplock_break_response(struct messaging_context *msg_ctx, /* De-linearize incoming message. */ message_to_share_mode_entry(&msg, (char *)data->data); - DEBUG(10, ("Got oplock break response from pid %d: %s/%lu mid %u\n", - (int)procid_to_pid(&src), file_id_string_tos(&msg.id), msg.share_file_id, - (unsigned int)msg.op_mid)); + DEBUG(10, ("Got oplock
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5188-gb737a62
The branch, v3-3-test has been updated via b737a6202cc18bfab091d5f45a3c30e97828e927 (commit) from 612aabd85287e9049973d63d1234b1d2a743ccd8 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit b737a6202cc18bfab091d5f45a3c30e97828e927 Author: Günther Deschner Date: Fri Apr 3 09:57:53 2009 +0200 s3-nsswitch: Fix Bug #6238. Make sure wbcLogoffUserParams are properly initialized before freed. Fix inspired by patch from Rashid N. Achilov . Guenther (cherry picked from commit 09265bcff5a2fac42f5abf34b8b439aa0a6998a1) --- Summary of changes: source/nsswitch/pam_winbind.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c index 4c24d6a..46e142c 100644 --- a/source/nsswitch/pam_winbind.c +++ b/source/nsswitch/pam_winbind.c @@ -2318,6 +2318,8 @@ static int _pam_delete_cred(pam_handle_t *pamh, int flags, const char *user; wbcErr wbc_status = WBC_ERR_SUCCESS; + ZERO_STRUCT(logoff); + retval = _pam_winbind_init_context(pamh, flags, argc, argv, &ctx); if (retval) { goto out; @@ -2365,8 +2367,6 @@ static int _pam_delete_cred(pam_handle_t *pamh, int flags, wbc_flags = WBFLAG_PAM_KRB5 | WBFLAG_PAM_CONTACT_TRUSTDOM; - ZERO_STRUCT(logoff); - logoff.username = user; if (ccname) { -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-641-g24ff9b8
The branch, v3-4-test has been updated via 24ff9b8dba8e4e0918b0aabf5cb8bacecfbc39d7 (commit) from 2d53463aaf679de8ca03ae71db0e9582241cc1c7 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 24ff9b8dba8e4e0918b0aabf5cb8bacecfbc39d7 Author: Günther Deschner Date: Fri Apr 3 09:57:53 2009 +0200 s3-nsswitch: Fix Bug #6238. Make sure wbcLogoffUserParams are properly initialized before freed. Fix inspired by patch from Rashid N. Achilov . Guenther (cherry picked from commit 09265bcff5a2fac42f5abf34b8b439aa0a6998a1) --- Summary of changes: nsswitch/pam_winbind.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c index 62d72c2..5feccb6 100644 --- a/nsswitch/pam_winbind.c +++ b/nsswitch/pam_winbind.c @@ -2318,6 +2318,8 @@ static int _pam_delete_cred(pam_handle_t *pamh, int flags, const char *user; wbcErr wbc_status = WBC_ERR_SUCCESS; + ZERO_STRUCT(logoff); + retval = _pam_winbind_init_context(pamh, flags, argc, argv, &ctx); if (retval) { goto out; @@ -2365,8 +2367,6 @@ static int _pam_delete_cred(pam_handle_t *pamh, int flags, wbc_flags = WBFLAG_PAM_KRB5 | WBFLAG_PAM_CONTACT_TRUSTDOM; - ZERO_STRUCT(logoff); - logoff.username = user; if (ccname) { -- Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-835-g09265bc
Günther Deschner wrote: > The branch, master has been updated >via 09265bcff5a2fac42f5abf34b8b439aa0a6998a1 (commit) > from 621d40332aad9d99b14c45155308a394c31b98b5 (commit) > > http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master > > > - Log - > commit 09265bcff5a2fac42f5abf34b8b439aa0a6998a1 > Author: Günther Deschner > Date: Fri Apr 3 09:57:53 2009 +0200 > > s3-nsswitch: Fix Bug #6238. Make sure logoff is bla bla. Arg! That should read: Make sure wbcLogoffUserParams are properly initialized before freed. Need more coffee... -- Günther DeschnerGPG-ID: 8EE11688 Red Hat gdesch...@redhat.com Samba Team g...@samba.org
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-835-g09265bc
The branch, master has been updated via 09265bcff5a2fac42f5abf34b8b439aa0a6998a1 (commit) from 621d40332aad9d99b14c45155308a394c31b98b5 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 09265bcff5a2fac42f5abf34b8b439aa0a6998a1 Author: Günther Deschner Date: Fri Apr 3 09:57:53 2009 +0200 s3-nsswitch: Fix Bug #6238. Make sure logoff is bla bla. Fix inspired by patch from Rashid N. Achilov . Guenther --- Summary of changes: nsswitch/pam_winbind.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c index 62d72c2..5feccb6 100644 --- a/nsswitch/pam_winbind.c +++ b/nsswitch/pam_winbind.c @@ -2318,6 +2318,8 @@ static int _pam_delete_cred(pam_handle_t *pamh, int flags, const char *user; wbcErr wbc_status = WBC_ERR_SUCCESS; + ZERO_STRUCT(logoff); + retval = _pam_winbind_init_context(pamh, flags, argc, argv, &ctx); if (retval) { goto out; @@ -2365,8 +2367,6 @@ static int _pam_delete_cred(pam_handle_t *pamh, int flags, wbc_flags = WBFLAG_PAM_KRB5 | WBFLAG_PAM_CONTACT_TRUSTDOM; - ZERO_STRUCT(logoff); - logoff.username = user; if (ccname) { -- Samba Shared Repository