[SCM] CTDB repository - branch master updated - ctdb-1.10-170-ga16dc65

2011-03-14 Thread Michael Adam 
The branch, master has been updated
   via  a16dc65b4602da5ce2c16578bec2e7882aff240d (commit)
   via  52193b6692091e341ed7a81dbd9a61ae49a8aac5 (commit)
   via  be4b63ee18933524f780df5c313447e5ef0786d1 (commit)
   via  f28e636cc4a04ef982672d5f569ad6b6b963db1f (commit)
   via  f898ff21fa338358179e79381215b13a6bc77c53 (commit)
   via  69d34983a37b0324ff7610b8dfdcd8d13bf81c54 (commit)
   via  46381a3cb58ccc11422af8f7798c80ea8d72294f (commit)
   via  ab2711701999a5ecc23a36b3d9ba8e94f92e4c87 (commit)
   via  2559b2a45eb11834da3b0e0963e24351c8b7477f (commit)
   via  e58c8f51f27e468897af5210b80e5f5f45c3c4bb (commit)
   via  c9b65f3602f51bcbf0e6d82c12076c31e4aebe38 (commit)
   via  3cca0d4b48325d86de2cb0b44bb7811a30701352 (commit)
   via  df49ec44de80affa5ccc637dec12a20a26e8706e (commit)
   via  23631ffc152486aed9ce5b69a391e52bc4947833 (commit)
   via  3da1e2e30bf34622f08e6ecd5b8fe55684e5007a (commit)
   via  30aa55b3efc6fbd4078f93da386b6aeb337c1a0c (commit)
   via  cf57efd440ccc3db381386f4749bfcbf8ac5ecae (commit)
   via  b70bc141d84f7355d2c6c901961b7366db566980 (commit)
   via  680223074e992b32ccf6f42cb80c3fa93074fee7 (commit)
   via  4cebfa33db3c7effa087f753530c52b2dd8550e6 (commit)
   via  2038e745db33cc5c3b4e2db8a00a57ede03906a2 (commit)
   via  b9bdef46fedfbc543263b67cfee3e896773cd8e8 (commit)
   via  3addd28aa73883b3b05888e309d19db0eb67eab9 (commit)
   via  7bbb12695c24da25671f1c39a411295d35870d2c (commit)
   via  4f0ace982dbb5b4f9c035dbf4cb0ae74cd18d81b (commit)
   via  571683e7c48aeed8ce41c584d016ced7ff0d2e2d (commit)
   via  23b8c8c5fc8604ee0bd6da1f4b5152277eb5f1c0 (commit)
   via  91e6d36a190b1c9e4c8b18f7833e51c5c9a67574 (commit)
   via  c0668bfe0bb4e69988ae34d875568d08539e6fb9 (commit)
   via  53a39d0cc5ea251c2189ec8178ccb769fa046c43 (commit)
   via  0d997ec7e61a7bee2cb05456f9c7d5e6f7a44797 (commit)
   via  04c335f9195a5fd83c91a57d06b1e4eaa511844e (commit)
   via  5eee05c4d256c08f4ee60a1a69efda6844e39729 (commit)
   via  4d32908fdcec120426536a761e1d0be60f076198 (commit)
   via  4407e5a7fb045ce56b6d902f7116de663ea648cb (commit)
   via  e99834c1a2eea60f7f974c0689ae0a65cfe178ff (commit)
   via  d4ab790c1f679e833eb97816762fcfcee15ccb10 (commit)
   via  6c603f85726d2efac9710af7c4875ded2ca7230e (commit)
   via  731a6011ce4a1301f86eacb039955745f2b5d866 (commit)
   via  f19fe5b45748a6998c6950a5b1db7ec2c4468c1c (commit)
   via  0aff1b61dd1b683c6739478008a5b014b933df50 (commit)
   via  9bbedf786b26bb074f668b31f29a9032af958673 (commit)
   via  c11ca778ee90444c44dee0a629cd2eefa3a1f75e (commit)
   via  4079b8bf7a57a27a45d29784a1b0a414c778e552 (commit)
   via  945187d64cfc7bd30a0c3b0d548cbe582d95dde3 (commit)
   via  fb5d832104970320359b3e474eb291ca3d629380 (commit)
   via  dd2449c422f323f9b5485e45107a9cc5acc09e08 (commit)
   via  86c844fb08a7fd33e94f56b8d5e43278120e1162 (commit)
   via  455cc6616e10b7f09589f9b87cb60f591bb502b0 (commit)
   via  101be642e492a3a54231e2e3e6553a59380fe702 (commit)
   via  f5fb232117886186066ab3430fdd2307cba94960 (commit)
   via  3930c7796b72bbf275bbca8aaeceec3e705a964b (commit)
   via  bc4990e600c53433a924a0d70e3488a5a6bdc1ff (commit)
   via  49247df4a47a8a107fa7dd7b187e69e243e6bdbe (commit)
   via  136508e3f4dd0acc210dde938ad59ef38b63d3a1 (commit)
  from  6a4df8242ee4d095ff03229a168b83bcd84c8a7a (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -
commit a16dc65b4602da5ce2c16578bec2e7882aff240d
Author: Michael Adam ob...@samba.org
Date:   Fri Mar 11 16:05:44 2011 +0100

vacuum: fix a comment typo

commit 52193b6692091e341ed7a81dbd9a61ae49a8aac5
Author: Michael Adam ob...@samba.org
Date:   Fri Mar 11 15:57:45 2011 +0100

vacuum: use insert_record_into_delete_queue in 
ctdb_local_schedule_for_deletion.

This is to take advantage of the hash collision handling and logging
also in ctdb_local_schedule_for_deletion.

commit be4b63ee18933524f780df5c313447e5ef0786d1
Author: Michael Adam ob...@samba.org
Date:   Fri Mar 11 15:55:52 2011 +0100

vacuum: refactor insert_record_into_delete_queue out of 
ctdb_control_schedule_for_deletion

commit f28e636cc4a04ef982672d5f569ad6b6b963db1f
Author: Michael Adam ob...@samba.org
Date:   Fri Mar 11 14:57:15 2011 +0100

vacuum: raise a debug level from INFO to DEBUG

when overwriting an existing entry in the delete_queue.

commit f898ff21fa338358179e79381215b13a6bc77c53
Author: Michael Adam ob...@samba.org
Date:   Thu Feb 3 16:32:23 2011 +0100

ctdb_ltdb_store_server: honour the AUTOMATIC record flag

Do not delete empty records that carry this flag but store
them and schedule them for deletetion. Do not store the flag
in the ltdb though, since this is internal only and should not
be visible to

[SCM] CTDB repository - branch master updated - ctdb-1.10-173-g89f8169

2011-03-14 Thread Michael Adam 
The branch, master has been updated
   via  89f8169c24da96c1fdd0ac19b8a1e0e1df01a72a (commit)
   via  ad709e99bcad7a4884f2336663d161ba61307ae5 (commit)
   via  e02bbd915b7151c615ff64f09ad9abc9720bef7d (commit)
  from  a16dc65b4602da5ce2c16578bec2e7882aff240d (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -
commit 89f8169c24da96c1fdd0ac19b8a1e0e1df01a72a
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Mon Mar 14 09:55:28 2011 +1100

IP reallocation. If a public address is already hosted on the node when we 
startup, log a warning message but do not cause the recovery to fail.

CQ S1022356

Signed-off-by: Michael Adam ob...@samba.org

commit ad709e99bcad7a4884f2336663d161ba61307ae5
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Sun Mar 13 11:30:52 2011 +1100

Vacuuming: initialize a variable to avoid a harmless valgrind hit

Signed-off-by: Michael Adam ob...@samba.org

commit e02bbd915b7151c615ff64f09ad9abc9720bef7d
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Sat Mar 12 09:42:07 2011 +1100

Dont allow clients to connect to databases untile we are well past and 
through
the initial recovery phase

CQ S1022412

Signed-off-by: Michael Adam ob...@samba.org

---

Summary of changes:
 server/ctdb_ltdb_server.c |3 ++-
 server/ctdb_monitor.c |1 +
 server/ctdb_takeover.c|2 +-
 server/ctdb_vacuum.c  |3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
index 92fb0f6..fe061e7 100644
--- a/server/ctdb_ltdb_server.c
+++ b/server/ctdb_ltdb_server.c
@@ -1029,7 +1029,8 @@ int32_t ctdb_control_db_attach(struct ctdb_context *ctdb, 
TDB_DATA indata,
}
 
if (ctdb-recovery_mode == CTDB_RECOVERY_ACTIVE
- client-pid != ctdb-recoverd_pid) {
+ client-pid != ctdb-recoverd_pid
+ !ctdb-done_startup) {
struct ctdb_deferred_attach_context *da_ctx = 
talloc(client, struct ctdb_deferred_attach_context);
 
if (da_ctx == NULL) {
diff --git a/server/ctdb_monitor.c b/server/ctdb_monitor.c
index 02f7149..547dcc0 100644
--- a/server/ctdb_monitor.c
+++ b/server/ctdb_monitor.c
@@ -302,6 +302,7 @@ static void ctdb_wait_until_recovered(struct event_context 
*ev, struct timed_eve
   ctdb_start_monitoring: 
ctdb_recheck_persistent_health() OK\n));
 
DEBUG(DEBUG_NOTICE,(__location__  Recoveries finished. Running the 
\startup\ event.\n));
+   DEBUG(DEBUG_ERR,(__location__  Allow clients to attach to 
databases.\n));
event_add_timed(ctdb-ev, ctdb-monitor-monitor_context,
 timeval_current(),
 ctdb_check_health, ctdb);
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 1d6fe6e..3dac1f7 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -596,7 +596,7 @@ int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb,
DEBUG(DEBUG_CRIT,(__location__  takeoverip of IP %s is known 
to the kernel, 
  but we have no interface assigned, has 
someone manually configured it? Ignore for now.\n,
 ctdb_addr_to_str(vnn-public_address)));
-   return -1;
+   return 0;
}
 
if (vnn-pnn != ctdb-pnn  have_ip  vnn-pnn != -1) {
diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c
index 5bd2b0a..bdb7c40 100644
--- a/server/ctdb_vacuum.c
+++ b/server/ctdb_vacuum.c
@@ -1261,7 +1261,8 @@ int ctdb_vacuum_init(struct ctdb_db_context *ctdb_db)
ctdb_db-vacuum_handle = talloc(ctdb_db, struct ctdb_vacuum_handle);
CTDB_NO_MEMORY(ctdb_db-ctdb, ctdb_db-vacuum_handle);
 
-   ctdb_db-vacuum_handle-ctdb_db = ctdb_db;
+   ctdb_db-vacuum_handle-ctdb_db = ctdb_db;
+   ctdb_db-vacuum_handle-fast_path_count = 0;
 
event_add_timed(ctdb_db-ctdb-ev, ctdb_db-vacuum_handle, 
timeval_current_ofs(get_vacuum_interval(ctdb_db), 0), 


-- 
CTDB repository

[SCM] CTDB repository - branch 1.3 updated - ctdb-1.9.1-402-g4c7d18a

2011-03-14 Thread Michael Adam 
The branch, 1.3 has been updated
   via  4c7d18a5430c8178d85a84da48c20c5322046c88 (commit)
   via  9d6c6f2445a0221c19a384809f9c373a6aae9606 (commit)
   via  ce70adb83e9df4c68f702b8bb832fcc9f3d14dd4 (commit)
   via  da0505b7a9bdcd44f4f07b0f9448bcc00a9647d3 (commit)
   via  88410f052466234da81a913ff597966dfdd92ed8 (commit)
   via  03b3fe74880317574c1a0d53be7519abb8482409 (commit)
   via  eeb50ec76a1e2b5d32fa141536856c58e8a48c0d (commit)
   via  6e5a14ffd57be4842fd290170ace8781d4155ca6 (commit)
   via  8b6d839fbcaeefb98240c52d4b4ea8c6b0f41c0d (commit)
   via  fedb54a72e6228147bf366a2efc18f91ce9dd4c8 (commit)
   via  1cc2e859a9c9615e94f345a31dfcef1fe04b6ffe (commit)
   via  4107ed6c5c1e10807ac1ee0720dda2cc41660a1c (commit)
   via  4417cf00184cab61af11b4e550c16c67793ea038 (commit)
   via  a00dfaacd31bdf84b088eedda5f68ecd67543a64 (commit)
   via  82332b53612250241b5dfd2436f78145dd291c87 (commit)
   via  2c13b964763a7bb4d836878b72fe563925659b7e (commit)
   via  ff35eb22d4bc10ba6b543f677577c353f0226daf (commit)
   via  10f737b3aaec6047c8f1caac8568c4ad10c04bf0 (commit)
   via  b8f818126b4b5b4e288e52f2a493b079be24ed8d (commit)
   via  437ac7be514a07e1c8955958abef5bbc11a0ac88 (commit)
   via  ef2c1537eb8b210f1cc70f1f305e77add72547e5 (commit)
   via  fd13ac3657acff2205451ab160045fd8aa6b2bd3 (commit)
   via  41e133ece7607b0acb953baa2b132ac442b2 (commit)
   via  36e35e7e1851246721b9f666cc20bddb25a6bea1 (commit)
   via  e872201485718af6c8b6c6ef6946938b5f51eef1 (commit)
   via  238432747adc32056b7b8342eebe999170a20a88 (commit)
   via  17bfa615bf494621764c6bfe79fe78e7556ca2c0 (commit)
   via  a5fbb30563dbfb3b0e25ffc3c370154e00a3881e (commit)
   via  774685de7bae87a0365089efb8dfc43cb7d93282 (commit)
   via  1e320502e748df372933181b3782087488d81f90 (commit)
   via  729097e4fbbba5b877044ce5736ffb8e1cacc97f (commit)
   via  c3c3126f12e80b87a3d7e8aec69728db43c4636e (commit)
   via  0da4c823c60dd63dd9edb275d779c8d1ac472566 (commit)
   via  d0e1667736f4755fab87c355899458cd5dc9e0bc (commit)
   via  113a995f38a05e3c2debd5b7b69a1d11eb7ec23d (commit)
   via  1a860608a47f86db6ad0efd731c27116eafa6dd2 (commit)
   via  13c83ac65e4b92dbb6632cc6a46fa0992f5c8a7a (commit)
   via  5db075725d46df89c285700fb11dfcada22c5ce0 (commit)
   via  759643b524404f23108d1ae031a832052b8d4edc (commit)
   via  a3f7ff0357fc4c68311a4300086f24909f178d62 (commit)
   via  5a3a98e6833b250e5025b3a32995af141af9181c (commit)
   via  346101f5f7de32f668c5272f4e9425e7ed49451a (commit)
   via  fbe6307aea9b1f68b9b46721d271647487054e0c (commit)
   via  58a5fce9959b1c2f7a9f81b961b1ab795bd5423d (commit)
   via  b1ee082396656aaadfa4b5b791a6c9c87a2eb851 (commit)
   via  312fdab0905f6554c64d738c934d85fdd5428323 (commit)
   via  3ede4d95fcd7faea7cc6839c02cbad1613394505 (commit)
   via  b03487d941bdbf187879a61c5fc3d732ef8c95aa (commit)
   via  9c49b5b29da4a6c49a4b18f3f068f89361f4bf99 (commit)
   via  f95b9ff9481b4aa9d90cd07937b244d94b5af10c (commit)
   via  f67a69955e6170a90493545a6ec960db4ddcab22 (commit)
   via  799af2162c9b24ff9c2b1c0bcb77735f10277a80 (commit)
   via  b72e2efd61244b2dd4cbae4480ec931e3d91d405 (commit)
   via  4f9cb43b37a71b1fb246a65b9450dc48e9745d46 (commit)
   via  37c720fe116d009cd95fe2abf9d0f1aca5a8a00c (commit)
   via  7d5f22732095ded3bcf84492a59b7953221b2169 (commit)
   via  6142f369171f6d2efe7c7bfbbdf513109c5d3b42 (commit)
   via  02a00f70ad44aa7b069eadfd9abf3ffa9cfa9f78 (commit)
   via  c967a925cacd2b6ecba63b7c7b2d5bee885f57ab (commit)
   via  7aaa81110aca817cb21c0acada90e8dc7dc237fe (commit)
   via  10bf024474f30f9370d804ffad0319d34c58d433 (commit)
   via  626e8a23c9f8f782dcc27751696b72f2a05cce64 (commit)
   via  59d676ed07e2ebd38764f45eee7c67a73bf363ee (commit)
  from  76ee5f604c9adaaa7392842cfa2753bccb071e0f (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.3


- Log -
commit 4c7d18a5430c8178d85a84da48c20c5322046c88
Author: Michael Adam ob...@samba.org
Date:   Fri Mar 11 16:05:44 2011 +0100

vacuum: fix a comment typo

commit 9d6c6f2445a0221c19a384809f9c373a6aae9606
Author: Michael Adam ob...@samba.org
Date:   Fri Mar 11 15:57:45 2011 +0100

vacuum: use insert_record_into_delete_queue in 
ctdb_local_schedule_for_deletion.

This is to take advantage of the hash collision handling and logging
also in ctdb_local_schedule_for_deletion.

commit ce70adb83e9df4c68f702b8bb832fcc9f3d14dd4
Author: Michael Adam ob...@samba.org
Date:   Fri Mar 11 15:55:52 2011 +0100

vacuum: refactor insert_record_into_delete_queue out of 
ctdb_control_schedule_for_deletion

commit da0505b7a9bdcd44f4f07b0f9448bcc00a9647d3
Author: Michael Adam ob...@samba.org
Date:   Fri Mar 11 14:57:15 2011 +0100

vacuum: raise a debug

[SCM] CTDB repository - branch 1.3 updated - ctdb-1.9.1-405-g71fd639

2011-03-14 Thread Michael Adam 
The branch, 1.3 has been updated
   via  71fd639a730b8e643d9d4aef45154a110a3f9b0e (commit)
   via  7b338a87d22eec641e57d0454da7c998dff9d330 (commit)
   via  58e1fcf0880a60de2e51a593f530f2fc66732523 (commit)
  from  4c7d18a5430c8178d85a84da48c20c5322046c88 (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.3


- Log -
commit 71fd639a730b8e643d9d4aef45154a110a3f9b0e
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Mon Mar 14 09:55:28 2011 +1100

IP reallocation. If a public address is already hosted on the node when we 
startup, log a warning message but do not cause the recovery to fail.

CQ S1022356

Signed-off-by: Michael Adam ob...@samba.org

commit 7b338a87d22eec641e57d0454da7c998dff9d330
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Sun Mar 13 11:30:52 2011 +1100

Vacuuming: initialize a variable to avoid a harmless valgrind hit

Signed-off-by: Michael Adam ob...@samba.org

commit 58e1fcf0880a60de2e51a593f530f2fc66732523
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Sat Mar 12 09:42:07 2011 +1100

Dont allow clients to connect to databases untile we are well past and 
through
the initial recovery phase

CQ S1022412

Signed-off-by: Michael Adam ob...@samba.org

---

Summary of changes:
 server/ctdb_ltdb_server.c |3 ++-
 server/ctdb_monitor.c |1 +
 server/ctdb_takeover.c|2 +-
 server/ctdb_vacuum.c  |3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
index 92fb0f6..fe061e7 100644
--- a/server/ctdb_ltdb_server.c
+++ b/server/ctdb_ltdb_server.c
@@ -1029,7 +1029,8 @@ int32_t ctdb_control_db_attach(struct ctdb_context *ctdb, 
TDB_DATA indata,
}
 
if (ctdb-recovery_mode == CTDB_RECOVERY_ACTIVE
- client-pid != ctdb-recoverd_pid) {
+ client-pid != ctdb-recoverd_pid
+ !ctdb-done_startup) {
struct ctdb_deferred_attach_context *da_ctx = 
talloc(client, struct ctdb_deferred_attach_context);
 
if (da_ctx == NULL) {
diff --git a/server/ctdb_monitor.c b/server/ctdb_monitor.c
index f96dde4..820e082 100644
--- a/server/ctdb_monitor.c
+++ b/server/ctdb_monitor.c
@@ -304,6 +304,7 @@ static void ctdb_wait_until_recovered(struct event_context 
*ev, struct timed_eve
   ctdb_start_monitoring: 
ctdb_recheck_persistent_health() OK\n));
 
DEBUG(DEBUG_NOTICE,(__location__  Recoveries finished. Running the 
\startup\ event.\n));
+   DEBUG(DEBUG_ERR,(__location__  Allow clients to attach to 
databases.\n));
event_add_timed(ctdb-ev, ctdb-monitor-monitor_context,
 timeval_current(),
 ctdb_check_health, ctdb);
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 1d6fe6e..3dac1f7 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -596,7 +596,7 @@ int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb,
DEBUG(DEBUG_CRIT,(__location__  takeoverip of IP %s is known 
to the kernel, 
  but we have no interface assigned, has 
someone manually configured it? Ignore for now.\n,
 ctdb_addr_to_str(vnn-public_address)));
-   return -1;
+   return 0;
}
 
if (vnn-pnn != ctdb-pnn  have_ip  vnn-pnn != -1) {
diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c
index 5bd2b0a..bdb7c40 100644
--- a/server/ctdb_vacuum.c
+++ b/server/ctdb_vacuum.c
@@ -1261,7 +1261,8 @@ int ctdb_vacuum_init(struct ctdb_db_context *ctdb_db)
ctdb_db-vacuum_handle = talloc(ctdb_db, struct ctdb_vacuum_handle);
CTDB_NO_MEMORY(ctdb_db-ctdb, ctdb_db-vacuum_handle);
 
-   ctdb_db-vacuum_handle-ctdb_db = ctdb_db;
+   ctdb_db-vacuum_handle-ctdb_db = ctdb_db;
+   ctdb_db-vacuum_handle-fast_path_count = 0;
 
event_add_timed(ctdb_db-ctdb-ev, ctdb_db-vacuum_handle, 
timeval_current_ofs(get_vacuum_interval(ctdb_db), 0), 


-- 
CTDB repository

[SCM] Samba Shared Repository - branch master updated

2011-03-14 Thread Simo Sorce 
The branch, master has been updated
   via  a57c2b0 Fix public header not to include private (not installed) 
ones.
  from  72c1fe0 librpc/rpc: move DCERPC_ flags to rpc_common.h

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit a57c2b02f13569bce8e485c39924bce980a61403
Author: Simo Sorce i...@samba.org
Date:   Mon Mar 14 11:01:47 2011 -0400

Fix public header not to include private (not installed) ones.

Autobuild-User: Simo Sorce i...@samba.org
Autobuild-Date: Mon Mar 14 17:01:20 CET 2011 on sn-devel-104

---

Summary of changes:
 source4/auth/auth.h|1 +
 source4/auth/session.h |2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/auth/auth.h b/source4/auth/auth.h
index 0e0aa01..9eb3e7d 100644
--- a/source4/auth/auth.h
+++ b/source4/auth/auth.h
@@ -158,6 +158,7 @@ struct auth_critical_sizes {
 
 #include auth/session.h
 #include auth/system_session_proto.h
+#include libcli/security/security.h
 
 struct ldb_message;
 struct ldb_context;
diff --git a/source4/auth/session.h b/source4/auth/session.h
index 8ab6288..97a8aba 100644
--- a/source4/auth/session.h
+++ b/source4/auth/session.h
@@ -21,7 +21,7 @@
 #ifndef _SAMBA_AUTH_SESSION_H
 #define _SAMBA_AUTH_SESSION_H
 
-#include libcli/security/security.h
+#include librpc/gen_ndr/security.h
 #include librpc/gen_ndr/netlogon.h
 #include librpc/gen_ndr/auth.h
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-03-14 Thread Volker Lendecke 
The branch, master has been updated
   via  43e343b s3: This module needs rewriting...
  from  a57c2b0 Fix public header not to include private (not installed) 
ones.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 43e343be8142b26b690c30faabf259205098a008
Author: Volker Lendecke v...@samba.org
Date:   Mon Mar 14 16:17:49 2011 +0100

s3: This module needs rewriting...

Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Mon Mar 14 17:47:32 CET 2011 on sn-devel-104

---

Summary of changes:
 source3/modules/vfs_shadow_copy2.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_shadow_copy2.c 
b/source3/modules/vfs_shadow_copy2.c
index 2777907..93330f4 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -675,7 +675,7 @@ static char *shadow_copy2_realpath(vfs_handle_struct 
*handle,
copy[gmt - fname + 1] = '\0';
 
DEBUG(10, (calling NEXT_REALPATH with %s\n, copy));
-   SHADOW2_NEXT(REALPATH, (handle, fname), char *,
+   SHADOW2_NEXT(REALPATH, (handle, name), char *,
 NULL);
}
 SHADOW2_NEXT(REALPATH, (handle, name), char *, NULL);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-6-test updated

2011-03-14 Thread Jeremy Allison 
The branch, v3-6-test has been updated
   via  5b00811 s3: Fix bug 8009 - net rap session cannot get username
  from  557ac22 s3: Enhance error messages in idmap_tdb2_init_hwm

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -
commit 5b008119c3b7b995bc401c589ff68ad3deb3721b
Author: Volker Lendecke v...@samba.org
Date:   Mon Mar 14 10:35:23 2011 -0700

s3: Fix bug 8009 - net rap session cannot get username

Looking in [MS-RAP].pdf - these strings are always 4 bytes as an
offset in the rparam area, the string length is the size in the rdata area.
Se we must always return we have consumed 4 param bytes.

---

Summary of changes:
 source3/libsmb/clirap2.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clirap2.c b/source3/libsmb/clirap2.c
index a088397..20efca3 100644
--- a/source3/libsmb/clirap2.c
+++ b/source3/libsmb/clirap2.c
@@ -212,7 +212,7 @@ static size_t rap_getstringp(TALLOC_CTX *ctx, char *p, char 
**dest, char *r, uin
}
}
pull_string_talloc(ctx,src,0,dest,src,len,STR_ASCII);
-   return len;
+   return 4;
 }
 
 static char *make_header(char *param, uint16 apinum, const char *reqfmt, const 
char *datafmt)


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-6-test updated

2011-03-14 Thread Jeremy Allison 
The branch, v3-6-test has been updated
   via  4421c6f s3: This module needs rewriting...
  from  5b00811 s3: Fix bug 8009 - net rap session cannot get username

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -
commit 4421c6f45c260283adead0fd47d14e08ab904908
Author: Volker Lendecke v...@samba.org
Date:   Mon Mar 14 16:17:49 2011 +0100

s3: This module needs rewriting...

Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Mon Mar 14 17:47:32 CET 2011 on sn-devel-104
(cherry picked from commit 43e343be8142b26b690c30faabf259205098a008)

---

Summary of changes:
 source3/modules/vfs_shadow_copy2.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_shadow_copy2.c 
b/source3/modules/vfs_shadow_copy2.c
index 2777907..93330f4 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -675,7 +675,7 @@ static char *shadow_copy2_realpath(vfs_handle_struct 
*handle,
copy[gmt - fname + 1] = '\0';
 
DEBUG(10, (calling NEXT_REALPATH with %s\n, copy));
-   SHADOW2_NEXT(REALPATH, (handle, fname), char *,
+   SHADOW2_NEXT(REALPATH, (handle, name), char *,
 NULL);
}
 SHADOW2_NEXT(REALPATH, (handle, name), char *, NULL);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-03-14 Thread Volker Lendecke 
The branch, master has been updated
   via  746b299 s3: Fix the talloc hierarchy in shadow_copy2_connectpath
  from  43e343b s3: This module needs rewriting...

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 746b299ec1b11ea1e70c130b69a9a379ec478750
Author: Volker Lendecke v...@samba.org
Date:   Mon Mar 14 18:35:36 2011 +0100

s3: Fix the talloc hierarchy in shadow_copy2_connectpath

We have to return on talloc_tos() because we don't have a mem_ctx given to 
us.
So we have to create a separate temporary talloc context.

Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Mon Mar 14 19:21:11 CET 2011 on sn-devel-104

---

Summary of changes:
 source3/modules/vfs_shadow_copy2.c |   11 +--
 1 files changed, 9 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_shadow_copy2.c 
b/source3/modules/vfs_shadow_copy2.c
index 93330f4..e3c3f9f 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -684,7 +684,7 @@ static char *shadow_copy2_realpath(vfs_handle_struct 
*handle,
 static const char *shadow_copy2_connectpath(struct vfs_handle_struct *handle,
const char *fname)
 {
-   TALLOC_CTX *tmp_ctx = talloc_stackframe();
+   TALLOC_CTX *tmp_ctx;
const char *snapdir, *baseoffset, *basedir, *gmt_start;
size_t baselen;
char *ret;
@@ -695,7 +695,14 @@ static const char *shadow_copy2_connectpath(struct 
vfs_handle_struct *handle,
return handle-conn-connectpath;
}
 
-   fname = shadow_copy2_normalise_path(talloc_tos(), fname, gmt_start);
+/*
+ * We have to create a real temporary context because we have
+ * to put our result on talloc_tos(). Thus we can't use a
+ * talloc_stackframe() here.
+ */
+   tmp_ctx = talloc_new(talloc_tos());
+
+   fname = shadow_copy2_normalise_path(tmp_ctx, fname, gmt_start);
if (fname == NULL) {
TALLOC_FREE(tmp_ctx);
return NULL;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-6-test updated

2011-03-14 Thread Volker Lendecke 
The branch, v3-6-test has been updated
   via  059ee631 s3: Fix the talloc hierarchy in shadow_copy2_connectpath
  from  4421c6f s3: This module needs rewriting...

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -
commit 059ee6313fd28e965f62b0ec3ebf583d8aa06566
Author: Volker Lendecke v...@samba.org
Date:   Mon Mar 14 18:35:36 2011 +0100

s3: Fix the talloc hierarchy in shadow_copy2_connectpath

We have to return on talloc_tos() because we don't have a mem_ctx given to 
us.
So we have to create a separate temporary talloc context.

Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Mon Mar 14 19:21:11 CET 2011 on sn-devel-104
(cherry picked from commit 746b299ec1b11ea1e70c130b69a9a379ec478750)

---

Summary of changes:
 source3/modules/vfs_shadow_copy2.c |   11 +--
 1 files changed, 9 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_shadow_copy2.c 
b/source3/modules/vfs_shadow_copy2.c
index 93330f4..e3c3f9f 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -684,7 +684,7 @@ static char *shadow_copy2_realpath(vfs_handle_struct 
*handle,
 static const char *shadow_copy2_connectpath(struct vfs_handle_struct *handle,
const char *fname)
 {
-   TALLOC_CTX *tmp_ctx = talloc_stackframe();
+   TALLOC_CTX *tmp_ctx;
const char *snapdir, *baseoffset, *basedir, *gmt_start;
size_t baselen;
char *ret;
@@ -695,7 +695,14 @@ static const char *shadow_copy2_connectpath(struct 
vfs_handle_struct *handle,
return handle-conn-connectpath;
}
 
-   fname = shadow_copy2_normalise_path(talloc_tos(), fname, gmt_start);
+/*
+ * We have to create a real temporary context because we have
+ * to put our result on talloc_tos(). Thus we can't use a
+ * talloc_stackframe() here.
+ */
+   tmp_ctx = talloc_new(talloc_tos());
+
+   fname = shadow_copy2_normalise_path(tmp_ctx, fname, gmt_start);
if (fname == NULL) {
TALLOC_FREE(tmp_ctx);
return NULL;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-03-14 Thread Jeremy Allison 
The branch, master has been updated
   via  e818090 s3: Fix bug 8009 - net rap session cannot get username
  from  746b299 s3: Fix the talloc hierarchy in shadow_copy2_connectpath

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit e818090e245776ca1bcd362a47864eee35ed55ba
Author: Volker Lendecke v...@samba.org
Date:   Mon Mar 14 10:35:23 2011 -0700

s3: Fix bug 8009 - net rap session cannot get username

Looking in [MS-RAP].pdf - these strings are always 4 bytes as an
offset in the rparam area, the string length is the size in the rdata area.
Se we must always return we have consumed 4 param bytes.

Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Mon Mar 14 20:09:09 CET 2011 on sn-devel-104

---

Summary of changes:
 source3/libsmb/clirap2.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clirap2.c b/source3/libsmb/clirap2.c
index a088397..20efca3 100644
--- a/source3/libsmb/clirap2.c
+++ b/source3/libsmb/clirap2.c
@@ -212,7 +212,7 @@ static size_t rap_getstringp(TALLOC_CTX *ctx, char *p, char 
**dest, char *r, uin
}
}
pull_string_talloc(ctx,src,0,dest,src,len,STR_ASCII);
-   return len;
+   return 4;
 }
 
 static char *make_header(char *param, uint16 apinum, const char *reqfmt, const 
char *datafmt)


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-03-14 Thread Volker Lendecke 
The branch, master has been updated
   via  8dfa224 s3: Change tldap_entry_attributes to the array,count 
convention
  from  e818090 s3: Fix bug 8009 - net rap session cannot get username

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 8dfa224c1350a9cb3a2d35fae7721bebecfe7934
Author: Volker Lendecke v...@samba.org
Date:   Mon Mar 14 21:16:23 2011 +0100

s3: Change tldap_entry_attributes to the array,count convention

Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Mon Mar 14 22:02:35 CET 2011 on sn-devel-104

---

Summary of changes:
 source3/include/tldap.h  |5 +++--
 source3/lib/tldap.c  |5 +++--
 source3/lib/tldap_util.c |2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/tldap.h b/source3/include/tldap.h
index 6bd086b..36cbdce 100644
--- a/source3/include/tldap.h
+++ b/source3/include/tldap.h
@@ -108,8 +108,9 @@ int tldap_search(struct tldap_context *ld,
 TALLOC_CTX *mem_ctx, struct tldap_message ***entries,
 struct tldap_message ***refs);
 bool tldap_entry_dn(struct tldap_message *msg, char **dn);
-bool tldap_entry_attributes(struct tldap_message *msg, int *num_attributes,
-   struct tldap_attribute **attributes);
+bool tldap_entry_attributes(struct tldap_message *msg,
+   struct tldap_attribute **attributes,
+   int *num_attributes);
 
 struct tevent_req *tldap_add_send(TALLOC_CTX *mem_ctx,
  struct tevent_context *ev,
diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c
index 1dd380f..9523fde 100644
--- a/source3/lib/tldap.c
+++ b/source3/lib/tldap.c
@@ -1958,8 +1958,9 @@ bool tldap_entry_dn(struct tldap_message *msg, char **dn)
return true;
 }
 
-bool tldap_entry_attributes(struct tldap_message *msg, int *num_attributes,
-   struct tldap_attribute **attributes)
+bool tldap_entry_attributes(struct tldap_message *msg,
+   struct tldap_attribute **attributes,
+   int *num_attributes)
 {
if ((msg-dn == NULL)  (!tldap_parse_search_entry(msg))) {
return false;
diff --git a/source3/lib/tldap_util.c b/source3/lib/tldap_util.c
index 8f7ad88..52bacfd 100644
--- a/source3/lib/tldap_util.c
+++ b/source3/lib/tldap_util.c
@@ -28,7 +28,7 @@ bool tldap_entry_values(struct tldap_message *msg, const char 
*attribute,
struct tldap_attribute *attributes;
int i, num_attributes;
 
-   if (!tldap_entry_attributes(msg, num_attributes, attributes)) {
+   if (!tldap_entry_attributes(msg, attributes, num_attributes)) {
return false;
}
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-03-14 Thread Jelmer Vernooij 
The branch, master has been updated
   via  431853c Merge new lorikeet heimdal, revision 
85ed7247f515770c73b1f1ced1739f6ce19d75d2
  from  8dfa224 s3: Change tldap_entry_attributes to the array,count 
convention

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 431853c84644c02e6bff1b325af5e94d3b1eacc6
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Mar 14 23:06:40 2011 +0100

Merge new lorikeet heimdal, revision 
85ed7247f515770c73b1f1ced1739f6ce19d75d2

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Mon Mar 14 23:53:46 CET 2011 on sn-devel-104

---

Summary of changes:
 source4/heimdal/base/dict.c|2 +-
 source4/heimdal/base/heimbase.c|2 +-
 source4/heimdal/kdc/default_config.c   |6 +-
 source4/heimdal/kdc/kdc.h  |1 +
 source4/heimdal/lib/asn1/asn1parse.c   | 3955 +---
 source4/heimdal/lib/asn1/asn1parse.h   |  329 ++-
 source4/heimdal/lib/asn1/krb5.asn1 |4 +-
 source4/heimdal/lib/asn1/lex.c |   28 +-
 source4/heimdal/lib/com_err/lex.c  |   28 +-
 source4/heimdal/lib/com_err/parse.c| 2035 ---
 source4/heimdal/lib/com_err/parse.h|   92 +-
 source4/heimdal/lib/gssapi/gssapi/gssapi.h |   49 +
 source4/heimdal/lib/gssapi/gssapi/gssapi_oid.h |7 +
 source4/heimdal/lib/gssapi/gssapi_mech.h   |   62 +-
 .../heimdal/lib/gssapi/krb5/accept_sec_context.c   |1 +
 .../heimdal/lib/gssapi/krb5/import_sec_context.c   |2 +
 source4/heimdal/lib/gssapi/mech/gss_mech_switch.c  |   18 +
 source4/heimdal/lib/gssapi/mech/gss_mo.c   |2 +-
 source4/heimdal/lib/gssapi/mech/gss_oid.c  |7 +
 source4/heimdal/lib/gssapi/version-script.map  |6 +
 source4/heimdal/lib/hcrypto/rsa.c  |2 +-
 source4/heimdal/lib/hx509/cert.c   |8 +-
 source4/heimdal/lib/hx509/cms.c|4 +-
 source4/heimdal/lib/hx509/collector.c  |4 +-
 source4/heimdal/lib/hx509/crypto.c |   20 +-
 source4/heimdal/lib/hx509/keyset.c |2 +-
 source4/heimdal/lib/hx509/ks_keychain.c|4 +-
 source4/heimdal/lib/hx509/ks_mem.c |4 +-
 source4/heimdal/lib/hx509/ks_p11.c |6 +-
 source4/heimdal/lib/hx509/lex.yy.c |  129 +-
 source4/heimdal/lib/hx509/req.c|   24 +-
 source4/heimdal/lib/hx509/sel-gram.c   | 2150 ---
 source4/heimdal/lib/hx509/sel-gram.h   |   95 +-
 source4/heimdal/lib/hx509/sel-lex.c|   28 +-
 source4/heimdal/lib/hx509/version-script.map   |   26 +-
 source4/heimdal/lib/krb5/context.c |4 +-
 source4/heimdal/lib/krb5/crypto-aes.c  |   18 +-
 source4/heimdal/lib/krb5/crypto-algs.c |4 +-
 source4/heimdal/lib/krb5/crypto-arcfour.c  |   28 +-
 source4/heimdal/lib/krb5/crypto-des-common.c   |   12 +-
 source4/heimdal/lib/krb5/crypto-des.c  |   54 +-
 source4/heimdal/lib/krb5/crypto-des3.c |   24 +-
 source4/heimdal/lib/krb5/crypto-evp.c  |   18 +-
 source4/heimdal/lib/krb5/crypto-null.c |   10 +-
 source4/heimdal/lib/krb5/crypto-pk.c   |4 +-
 source4/heimdal/lib/krb5/crypto.c  |  162 +-
 source4/heimdal/lib/krb5/crypto.h  |   99 +-
 source4/heimdal/lib/krb5/get_cred.c|6 +-
 source4/heimdal/lib/krb5/keytab.c  |5 +-
 source4/heimdal/lib/krb5/krb5.h|2 +
 source4/heimdal/lib/krb5/pac.c |4 +-
 source4/heimdal/lib/krb5/plugin.c  |   14 +-
 source4/heimdal/lib/krb5/salt-aes.c|4 +-
 source4/heimdal/lib/krb5/salt.c|   10 +-
 source4/heimdal/lib/ntlm/ntlm.c|5 +-
 source4/rpc_server/backupkey/dcesrv_backupkey.c|   54 +-
 source4/torture/rpc/backupkey.c|2 +-
 57 files changed, 6935 insertions(+), 2750 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal/base/dict.c b/source4/heimdal/base/dict.c
index 2eb57aa..7522c8c 100644
--- a/source4/heimdal/base/dict.c
+++ b/source4/heimdal/base/dict.c
@@ -120,7 +120,7 @@ heim_dict_create(size_t size)
heim_release(dict);
return NULL;
 }
-
+
 dict-tab = calloc(dict-size, sizeof(dict-tab[0]));
 if (dict-tab == NULL) {
dict-size = 0;
diff --git a/source4/heimdal/base/heimbase.c b/source4/heimdal/base/heimbase.c
index 7031af9..0166871 100644
--- a/source4/heimdal/base/heimbase.c
+++

[SCM] Samba Shared Repository - branch v3-6-test updated

2011-03-14 Thread Jeremy Allison 
The branch, v3-6-test has been updated
   via  5f2aeb6 Re-enable base.tcondev test for S3, now we pass it 
correctly. (cherry picked from commit 349731fd32910e85558be1af645f891edd005a80)
   via  75ded34 Fix bug #8005 - smbtorture4 BASE-TCONDEV fails when tested 
on Samba
  from  059ee631 s3: Fix the talloc hierarchy in shadow_copy2_connectpath

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -
commit 5f2aeb6573de5f0df62ec773697901937494eb8e
Author: Jeremy Allison j...@samba.org
Date:   Mon Mar 14 16:05:55 2011 -0700

Re-enable base.tcondev test for S3, now we pass it correctly.
(cherry picked from commit 349731fd32910e85558be1af645f891edd005a80)

commit 75ded3491c11495cc106ba4f9f03a043a685d319
Author: Jeremy Allison j...@samba.org
Date:   Mon Mar 14 16:12:31 2011 -0700

Fix bug #8005 - smbtorture4 BASE-TCONDEV fails when tested on Samba

When pulling non-aligned ucs2 strings, we neglected to add in the
pad byte to the buffer length we've eaten. This caused the device
string in TCONX (which seems to be one of the few places that uses
non-aligned ucs2 strings) to be incorrectly read.

Volker please check.

Jeremy.
(cherry picked from commit e59a950c049679f0394ea41b463dbb9837eb5e63)

---

Summary of changes:
 source3/lib/charcnv.c |8 ++--
 source3/selftest/skip |1 -
 2 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 3b6dfc5..0b12635 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -1342,6 +1342,7 @@ bool push_utf8_talloc(TALLOC_CTX *ctx, char **dest, const 
char *src,
 size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t 
dest_len, size_t src_len, int flags)
 {
size_t ret;
+   size_t ucs2_align_len = 0;
 
if (dest_len == (size_t)-1) {
/* No longer allow dest_len of -1. */
@@ -1359,6 +1360,7 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const 
void *src, size_t dest_
src = (const void *)((const char *)src + 1);
if (src_len != (size_t)-1)
src_len--;
+   ucs2_align_len = 1;
}
 
if (flags  STR_TERMINATE) {
@@ -1394,7 +1396,7 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const 
void *src, size_t dest_
dest[0] = 0;
}
 
-   return src_len;
+   return src_len + ucs2_align_len;
 }
 
 /**
@@ -1420,6 +1422,7 @@ size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx,
 {
char *dest;
size_t dest_len;
+   size_t ucs2_align_len = 0;
 
*ppdest = NULL;
 
@@ -1438,6 +1441,7 @@ size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx,
src = (const void *)((const char *)src + 1);
if (src_len != (size_t)-1)
src_len--;
+   ucs2_align_len = 1;
}
 
if (flags  STR_TERMINATE) {
@@ -1503,7 +1507,7 @@ size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx,
}
 
*ppdest = dest;
-   return src_len;
+   return src_len + ucs2_align_len;
 }
 
 size_t pull_ucs2_fstring(char *dest, const void *src)
diff --git a/source3/selftest/skip b/source3/selftest/skip
index 61fa03a..02166a1 100644
--- a/source3/selftest/skip
+++ b/source3/selftest/skip
@@ -14,7 +14,6 @@ samba3.smbtorture_s3.*.utable
 samba3.smbtorture_s3.*.pipe_number
 samba3.smbtorture_s3.*.CHAIN1
 samba3.*base.charset
-samba3.*base.tcondev
 samba3.*raw.acls
 samba3.*raw.composite
 samba3.*raw.context


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-03-14 Thread Jeremy Allison 
The branch, master has been updated
   via  a6d07a8 Re-enable base.tcondev test for S3, now we pass it 
correctly.
   via  e59a950 Fix bug #8005 - smbtorture4 BASE-TCONDEV fails when tested 
on Samba
  from  431853c Merge new lorikeet heimdal, revision 
85ed7247f515770c73b1f1ced1739f6ce19d75d2

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit a6d07a8e69600853756f7a091456ba2489e53cbf
Author: Jeremy Allison j...@samba.org
Date:   Mon Mar 14 16:05:55 2011 -0700

Re-enable base.tcondev test for S3, now we pass it correctly.

Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Tue Mar 15 00:59:37 CET 2011 on sn-devel-104

commit e59a950c049679f0394ea41b463dbb9837eb5e63
Author: Jeremy Allison j...@samba.org
Date:   Mon Mar 14 16:12:31 2011 -0700

Fix bug #8005 - smbtorture4 BASE-TCONDEV fails when tested on Samba

When pulling non-aligned ucs2 strings, we neglected to add in the
pad byte to the buffer length we've eaten. This caused the device
string in TCONX (which seems to be one of the few places that uses
non-aligned ucs2 strings) to be incorrectly read.

Volker please check.

Jeremy.

---

Summary of changes:
 source3/lib/charcnv.c |8 ++--
 source3/selftest/skip |1 -
 2 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 6f1ced6..5b2149b 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -1225,6 +1225,7 @@ bool push_utf8_talloc(TALLOC_CTX *ctx, char **dest, const 
char *src,
 size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t 
dest_len, size_t src_len, int flags)
 {
size_t ret;
+   size_t ucs2_align_len = 0;
 
if (dest_len == (size_t)-1) {
/* No longer allow dest_len of -1. */
@@ -1242,6 +1243,7 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const 
void *src, size_t dest_
src = (const void *)((const char *)src + 1);
if (src_len != (size_t)-1)
src_len--;
+   ucs2_align_len = 1;
}
 
if (flags  STR_TERMINATE) {
@@ -1277,7 +1279,7 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const 
void *src, size_t dest_
dest[0] = 0;
}
 
-   return src_len;
+   return src_len + ucs2_align_len;
 }
 
 /**
@@ -1303,6 +1305,7 @@ size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx,
 {
char *dest;
size_t dest_len;
+   size_t ucs2_align_len = 0;
 
*ppdest = NULL;
 
@@ -1321,6 +1324,7 @@ size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx,
src = (const void *)((const char *)src + 1);
if (src_len != (size_t)-1)
src_len--;
+   ucs2_align_len = 1;
}
 
if (flags  STR_TERMINATE) {
@@ -1386,7 +1390,7 @@ size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx,
}
 
*ppdest = dest;
-   return src_len;
+   return src_len + ucs2_align_len;
 }
 
 size_t pull_ucs2_fstring(char *dest, const void *src)
diff --git a/source3/selftest/skip b/source3/selftest/skip
index 61fa03a..02166a1 100644
--- a/source3/selftest/skip
+++ b/source3/selftest/skip
@@ -14,7 +14,6 @@ samba3.smbtorture_s3.*.utable
 samba3.smbtorture_s3.*.pipe_number
 samba3.smbtorture_s3.*.CHAIN1
 samba3.*base.charset
-samba3.*base.tcondev
 samba3.*raw.acls
 samba3.*raw.composite
 samba3.*raw.context


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-03-14 Thread Andrew Tridgell 
The branch, master has been updated
   via  b2b41a5 libcli: protect access_check.h against double inclusion
   via  1404a9f waf: ensure that MAKEFLAGS is set before parsing it
   via  500c854 build: added simple header handling for our libraries
   via  af28fac s3-waf: enable public_headers_allow_broken
   via  4907695 build: removed mkdir of public headers directory
   via  fd328f8 build: added public_headers_allow_broken option
   via  7a57f72 s3-waf: enable public header building in s3
   via  0232964 waf: auto-create include paths if needed
   via  20ec0b6 waf: make mkdir_p() a bit more robust
   via  72ca88d build: fixed cflags for test_header
   via  b4d618c waf: build headers in separate 'headers' build group
   via  f303db5 build: force _SAMBA_BUILD_==4 to be true in public headers
   via  827d020 ldb: only install headers if we are not building as a 
private lib
   via  c56e3cc lib: don't install public headers if a private library
   via  f8655f4 waf: always generate public headers in the build tree
   via  c3f04a9 build: mark some private includes as OK in public headers
   via  7dc049e rpc: make ndr/ndr_svcctl.h public
   via  803136a s4-rpc: make common/proto.h public
   via  793ffea s4-policy: don't make s4 policy.h public
   via  bc99b62 ldb: use include  form for public headers
   via  6c6ab50 waf: build substituted public headers in build tree
   via  5ca9db0 lib: fixed header paths
   via  7293c37 talloc: use talloc.h not talloc.h
   via  7b948a3 tdb: use public_headers to install header files
   via  0a0ebd7 tdb: use system include style for system headers
   via  f2bcb70 waf: moved header file handling into its own module
   via  ba9ae79 build: added automated testing of our public headers
   via  dc42ad0 build: added include/public to the list of include paths
   via  a18a556 tevent: use public_headers for tevent.h
   via  e3e1ead talloc: use public_headers to install talloc.h and 
pytalloc.h
   via  03aebc2 wafsamba: keep a list of public headers
   via  1c0e539 wafsamba: don't follow symlinks outside the build tree
   via  59be726 wafsamba: added global_include option
   via  4f52bec build: install public headers in the build tree
   via  b7b2426 ldb: don't install ldb_wrap.h twice
   via  36b48ad build: added placeholder files for public header directories
   via  48ea48d s4-rpc: added public APIs for dce_call authentication
  from  a6d07a8 Re-enable base.tcondev test for S3, now we pass it 
correctly.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit b2b41a5087d2d20180a3dd7176d9978f2d677ab5
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Mar 15 14:05:42 2011 +1100

libcli: protect access_check.h against double inclusion

Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Tue Mar 15 05:07:01 CET 2011 on sn-devel-104

commit 1404a9fe72b2eeb116cfff778408f1671a8a4512
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Mar 15 13:56:46 2011 +1100

waf: ensure that MAKEFLAGS is set before parsing it

commit 500c854f792f4a72ef9ac1d100608d5cdc45e7fc
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Mar 15 13:09:30 2011 +1100

build: added simple header handling for our libraries

we don't need header munging for tdb/talloc etc

commit af28facc03809fabd11cd729685588d850d6ef3b
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Mar 8 16:44:17 2011 +1100

s3-waf: enable public_headers_allow_broken

commit 4907695012cb50bc63abdc799ca929263fab74a2
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Mar 8 16:43:49 2011 +1100

build: removed mkdir of public headers directory

not needed now that we have public_headers_allow_broken

commit fd328f8f81e48943462a6de8c9cd1b78624a1987
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Mar 8 16:42:42 2011 +1100

build: added public_headers_allow_broken option

the s3 waf build will use this to say that we should allow public
headers that contain references to non-public headers. In the s4 build
that is not allowed, but the s3 build does not yet have clean public
headers

commit 7a57f72ef46f37e90aaa05926636c57cdd91b4a4
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Mar 8 13:01:21 2011 +1100

s3-waf: enable public header building in s3

commit 023296423aab11dd2300f09f158e5234503b46c0
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Mar 4 17:11:33 2011 +1100

waf: auto-create include paths if needed

commit 20ec0b6629a35e40f97265b0fe6fdee4df274951
Author: Andrew Tridgell tri...@samba.org
Date:   Fri Mar 4 17:11:20 2011 +1100

waf: make mkdir_p() a bit more robust

commit 72ca88d6047e3dcce53c720db866171fb9963914
Author: Andrew Tridgell tri...@samba.org
Date:   Thu Mar 3 18:06:00 2011 +1100

build:

[SCM] Samba Shared Repository - branch master updated

2011-03-14 Thread Andrew Tridgell 
The branch, master has been updated
   via  7c83f69 s4-rpc: added dcesrv_call_account_name()
  from  b2b41a5 libcli: protect access_check.h against double inclusion

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 7c83f69383b1bd3e0c6be95b1b53cdc2d5957623
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Mar 15 14:43:24 2011 +1100

s4-rpc: added dcesrv_call_account_name()

this will be used by openchange

Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Tue Mar 15 06:14:00 CET 2011 on sn-devel-104

---

Summary of changes:
 source4/rpc_server/dcerpc_server.c |8 
 source4/rpc_server/dcerpc_server.h |5 +
 2 files changed, 13 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/rpc_server/dcerpc_server.c 
b/source4/rpc_server/dcerpc_server.c
index fa5f3e9..cd079da 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -1737,3 +1737,11 @@ _PUBLIC_ bool dcesrv_call_authenticated(struct 
dcesrv_call_state *dce_call)
level = 
security_session_user_level(dce_call-conn-auth_state.session_info, NULL);
return level = SECURITY_USER;
 }
+
+/**
+ * retrieve account_name for a dce_call
+ */
+_PUBLIC_ const char *dcesrv_call_account_name(struct dcesrv_call_state 
*dce_call)
+{
+   return 
dce_call-context-conn-auth_state.session_info-info-account_name;
+}
diff --git a/source4/rpc_server/dcerpc_server.h 
b/source4/rpc_server/dcerpc_server.h
index 6e513ac..024009a 100644
--- a/source4/rpc_server/dcerpc_server.h
+++ b/source4/rpc_server/dcerpc_server.h
@@ -393,5 +393,10 @@ _PUBLIC_ struct cli_credentials 
*dcesrv_call_credentials(struct dcesrv_call_stat
  */
 _PUBLIC_ bool dcesrv_call_authenticated(struct dcesrv_call_state *dce_call);
 
+/**
+ * retrieve account_name for a dce_call
+ */
+_PUBLIC_ const char *dcesrv_call_account_name(struct dcesrv_call_state 
*dce_call);
+
 
 #endif /* SAMBA_DCERPC_SERVER_H */


-- 
Samba Shared Repository