Build status as of Fri Jan 15 07:00:05 2010

2010-01-14 Thread build 
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2010-01-14 
00:00:44.0 -0700
+++ /home/build/master/cache/broken_results.txt 2010-01-15 00:00:06.0 
-0700
@@ -1,22 +1,22 @@
-Build status as of Thu Jan 14 07:00:04 2010
+Build status as of Fri Jan 15 07:00:05 2010
 
 Build counts:
 Tree Total  Broken Panic 
 build_farm   0  0  0 
 ccache   0  0  0 
 distcc   0  0  0 
-ldb  29 29 0 
+ldb  30 30 0 
 libreplace   0  0  0 
 lorikeet 0  0  0 
-pidl 0  0  0 
+pidl 1  1  0 
 ppp  0  0  0 
-rsync0  0  0 
+rsync1  0  0 
 samba-docs   0  0  0 
 samba-web0  0  0 
-samba_3_current 27 27 2 
-samba_3_master 27 25 5 
-samba_3_next 27 27 5 
-samba_4_0_test 29 28 0 
-talloc   1  0  0 
-tdb  1  0  0 
+samba_3_current 28 28 2 
+samba_3_master 28 27 5 
+samba_3_next 28 27 5 
+samba_4_0_test 30 29 1 
+talloc   2  0  0 
+tdb  2  0  0

[SCM] CTDB repository - branch master updated - ctdb-1.0.113-2-g037e64e

2010-01-14 Thread Ronnie Sahlberg 
The branch, master has been updated
   via  037e64e1900f09e699d5fce50df2850f26f47f91 (commit)
   via  c79c2da69bc352f509e7fca4b9172a4b7f23c0f8 (commit)
  from  4bcb07c412260147cd926452287885d05b2344c1 (commit)

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


- Log -
commit 037e64e1900f09e699d5fce50df2850f26f47f91
Author: Ronnie Sahlberg 
Date:   Fri Jan 15 16:01:51 2010 +1100

document the in-memory ringbuffer for logging and the commands
used to set it up and manage it.

commit c79c2da69bc352f509e7fca4b9172a4b7f23c0f8
Author: Ronnie Sahlberg 
Date:   Fri Jan 15 15:38:56 2010 +1100

Make the size of the in memory ringbuffer for keeping the recent log 
messages
configureable using --log-ringbuf-size=.

Add an entry in the sysconfig file to set this persistently.

---

Summary of changes:
 common/ctdb_logging.c  |   25 ++-
 config/ctdb.init   |1 +
 config/ctdb.sysconfig  |7 +
 doc/ctdb.1 |  501 ---
 doc/ctdb.1.html|  157 ---
 doc/ctdb.1.xml |   24 +++
 doc/ctdbd.1|   17 ++-
 doc/ctdbd.1.html   |   97 ++
 doc/ctdbd.1.xml|   28 +++
 include/ctdb_private.h |4 +
 server/ctdbd.c |1 +
 11 files changed, 454 insertions(+), 408 deletions(-)


Changeset truncated at 500 lines:

diff --git a/common/ctdb_logging.c b/common/ctdb_logging.c
index 64507f4..ea4d271 100644
--- a/common/ctdb_logging.c
+++ b/common/ctdb_logging.c
@@ -24,7 +24,8 @@
 #include "../include/ctdb_private.h"
 #include "../include/ctdb.h"
 
-#define MAX_LOG_ENTRIES 50
+int log_ringbuf_size;
+
 #define MAX_LOG_SIZE 128
 
 static int first_entry;
@@ -37,7 +38,7 @@ struct ctdb_log_entry {
 };
 
 
-static struct ctdb_log_entry log_entries[MAX_LOG_ENTRIES];
+static struct ctdb_log_entry *log_entries;
 
 /*
  * this function logs all messages for all levels to a ringbuffer
@@ -46,6 +47,14 @@ static void log_ringbuffer_v(const char *format, va_list ap)
 {
int ret;
 
+   if (log_entries == NULL && log_ringbuf_size != 0) {
+   /* Hope this works. We cant log anything if it doesnt anyway */
+   log_entries = malloc(sizeof(struct ctdb_log_entry) * 
log_ringbuf_size);
+   }
+   if (log_entries == NULL) {
+   return;
+   }
+
log_entries[last_entry].message[0] = '\0';
 
ret = vsnprintf(&log_entries[last_entry].message[0], MAX_LOG_SIZE, 
format, ap);
@@ -57,13 +66,13 @@ static void log_ringbuffer_v(const char *format, va_list ap)
log_entries[last_entry].t = timeval_current();
 
last_entry++;
-   if (last_entry >= MAX_LOG_ENTRIES) {
+   if (last_entry >= log_ringbuf_size) {
last_entry = 0;
}
if (first_entry == last_entry) {
first_entry++;
}
-   if (first_entry >= MAX_LOG_ENTRIES) {
+   if (first_entry >= log_ringbuf_size) {
first_entry = 0;
}
 }
@@ -100,9 +109,13 @@ static void ctdb_collect_log(struct ctdb_context *ctdb, 
struct ctdb_get_log_addr
struct tm *tm;
char tbuf[100];
 
+   if (log_entries == NULL) {
+   break;
+   }
+
if (log_entries[tmp_entry].level > log_addr->level) {
tmp_entry++;
-   if (tmp_entry >= MAX_LOG_ENTRIES) {
+   if (tmp_entry >= log_ringbuf_size) {
tmp_entry = 0;
}
continue;
@@ -116,7 +129,7 @@ static void ctdb_collect_log(struct ctdb_context *ctdb, 
struct ctdb_get_log_addr
}
 
tmp_entry++;
-   if (tmp_entry >= MAX_LOG_ENTRIES) {
+   if (tmp_entry >= log_ringbuf_size) {
tmp_entry = 0;
}
}
diff --git a/config/ctdb.init b/config/ctdb.init
index 2e25cf1..96ffb1e 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -102,6 +102,7 @@ build_ctdb_options () {
 maybe_set "--no-lmaster" "$CTDB_CAPABILITY_LMASTER"   "no"
 maybe_set "--lvs --single-public-ip" "$CTDB_LVS_PUBLIC_IP"
 maybe_set "--script-log-level"   "$CTDB_SCRIPT_LOG_LEVEL"
+maybe_set "--log-ringbuf-size"   "$CTDB_LOG_RINGBUF_SIZE"
 maybe_set "--syslog" "$CTDB_SYSLOG"   "yes"
 maybe_set "--max-persistent-check-errors" 
"$CTDB_MAX_PERSISTENT_CHECK_ERRORS"
 }
diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig
index bc31001..68d0bf6 100644
--- a/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@ -208,6 +208,13 @@ CTDB_DEBUGLEVEL=ERR
 # "-1" means wait forever.
 # CTDB_MAX_PERSISTENT_CHECK_ERRORS=0
 
+# All log entries up to level 9 are also collected into a in-m

[SCM] Samba Shared Repository - branch master updated

2010-01-14 Thread Kai Blin 
The branch, master has been updated
   via  5c016ad... s4 selftest: Ignore more winbind test known to fail
  from  9d881f4... s4-smbtorture: add setup_schannel_netlogon_pipe() 
function.

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


- Log -
commit 5c016ad88e366db31e78db885b3a6edcbdec1e0c
Author: Kai Blin 
Date:   Fri Jan 15 02:08:35 2010 +0100

s4 selftest: Ignore more winbind test known to fail

---

Summary of changes:
 source4/selftest/knownfail |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail
index 0c3fd7c..df9eb72 100644
--- a/source4/selftest/knownfail
+++ b/source4/selftest/knownfail
@@ -51,6 +51,8 @@ samba4.winbind.struct.*.SHOW_SEQUENCE # Not yet working 
in winbind
 samba4.winbind.struct.*.GETPWENT  # Not yet working in winbind
 samba4.winbind.struct.*.SETPWENT  # Not yet working in winbind
 samba4.winbind.struct.*.LOOKUP_NAME_SID   # Not yet working in winbind
+samba4.winbind.struct.*.NETBIOS_NAME
+samba4.winbind.struct.*.LIST_GROUPS
 ^samba4.*base.delaywrite.*update of write time and SMBwrite truncate$
 ^samba4.*base.delaywrite.*update of write time and SMBwrite truncate expand$
 ^samba4.*base.delaywrite.*delayed update of write time 3a$


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2010-01-14 Thread Günther Deschner 
The branch, master has been updated
   via  9d881f4... s4-smbtorture: add setup_schannel_netlogon_pipe() 
function.
  from  6653cc4... Fix bug #7036 - net rpc getsid fails in hardened windows 
environments.

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


- Log -
commit 9d881f4cfbeddf0f4c66d0986f6fc9168f4891b0
Author: Günther Deschner 
Date:   Fri Jan 15 00:25:06 2010 +0100

s4-smbtorture: add setup_schannel_netlogon_pipe() function.

Guenther

---

Summary of changes:
 source4/torture/rpc/samr.c |   59 ++-
 1 files changed, 25 insertions(+), 34 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 8b466e8..0e76017 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -2951,6 +2951,29 @@ static bool test_SetPassword_level(struct dcerpc_pipe *p,
return ret;
 }
 
+static bool setup_schannel_netlogon_pipe(struct torture_context *tctx,
+struct cli_credentials *credentials,
+struct dcerpc_pipe **p)
+{
+   struct dcerpc_binding *b;
+
+   torture_assert_ntstatus_ok(tctx, torture_rpc_binding(tctx, &b),
+   "failed to get rpc binding");
+
+   /* We have to use schannel, otherwise the SamLogonEx fails
+* with INTERNAL_ERROR */
+
+   b->flags &= ~DCERPC_AUTH_OPTIONS;
+   b->flags |= DCERPC_SCHANNEL | DCERPC_SIGN | DCERPC_SCHANNEL_128;
+
+   torture_assert_ntstatus_ok(tctx,
+   dcerpc_pipe_connect_b(tctx, p, b, &ndr_table_netlogon,
+ credentials, tctx->ev, tctx->lp_ctx),
+   "failed to bind to netlogon");
+
+   return true;
+}
+
 static bool test_SetPassword_pwdlastset(struct dcerpc_pipe *p,
struct torture_context *tctx,
uint32_t acct_flags,
@@ -2960,7 +2983,6 @@ static bool test_SetPassword_pwdlastset(struct 
dcerpc_pipe *p,
struct cli_credentials 
*machine_credentials)
 {
int s = 0, q = 0, f = 0, l = 0, z = 0;
-   struct dcerpc_binding *b;
bool ret = true;
int delay = 5;
bool set_levels[] = { false, true };
@@ -2981,7 +3003,6 @@ static bool test_SetPassword_pwdlastset(struct 
dcerpc_pipe *p,
SAMR_FIELD_NT_PASSWORD_PRESENT | SAMR_FIELD_LM_PASSWORD_PRESENT 
| SAMR_FIELD_EXPIRED_FLAG,
SAMR_FIELD_NT_PASSWORD_PRESENT | SAMR_FIELD_LM_PASSWORD_PRESENT 
| SAMR_FIELD_LAST_PWD_CHANGE | SAMR_FIELD_EXPIRED_FLAG
};
-   NTSTATUS status;
struct dcerpc_pipe *np = NULL;
 
if (torture_setting_bool(tctx, "samba3", false)) {
@@ -2990,27 +3011,7 @@ static bool test_SetPassword_pwdlastset(struct 
dcerpc_pipe *p,
delay);
}
 
-   status = torture_rpc_binding(tctx, &b);
-   if (!NT_STATUS_IS_OK(status)) {
-   ret = false;
-   return ret;
-   }
-
-   /* We have to use schannel, otherwise the SamLogonEx fails
-* with INTERNAL_ERROR */
-
-   b->flags &= ~DCERPC_AUTH_OPTIONS;
-   b->flags |= DCERPC_SCHANNEL | DCERPC_SIGN | DCERPC_SCHANNEL_128;
-
-   status = dcerpc_pipe_connect_b(tctx, &np, b,
-  &ndr_table_netlogon,
-  machine_credentials, tctx->ev, 
tctx->lp_ctx);
-
-   if (!NT_STATUS_IS_OK(status)) {
-   torture_warning(tctx, "RPC pipe connect as domain member 
failed: %s\n", nt_errstr(status));
-   ret = false;
-   return ret;
-   }
+   torture_assert(tctx, setup_schannel_netlogon_pipe(tctx, 
machine_credentials, &np), "");
 
/* set to 1 to enable testing for all possible opcode
   (SetUserInfo, SetUserInfo2, QueryUserInfo, QueryUserInfo2)
@@ -3660,7 +3661,6 @@ static bool test_Password_badpwdcount_wrap(struct 
dcerpc_pipe *p,
struct samr_DomInfo1 info1, _info1;
struct samr_DomInfo12 info12, _info12;
bool ret = true;
-   struct dcerpc_binding *b;
struct dcerpc_pipe *np;
int i;
 
@@ -3696,16 +3696,7 @@ static bool test_Password_badpwdcount_wrap(struct 
dcerpc_pipe *p,
},
};
 
-   /* setup netlogon schannel pipe */
-
-   torture_assert_ntstatus_ok(tctx, torture_rpc_binding(tctx, &b), "failed 
to obtain rpc binding");
-
-   b->flags &= ~DCERPC_AUTH_OPTIONS;
-   b->flags |= DCERPC_SCHANNEL | DCERPC_SIGN | DCERPC_SCHANNEL_128;
-
-   torture_assert_ntstatus_ok(tctx, dcerpc_pipe_connect_b(tctx, &np, b, 
&ndr_table_netlogon,
-  
machine_credentials, tctx->ev, tctx->lp_ctx),
-

[SCM] Samba Shared Repository - branch master updated

2010-01-14 Thread Jeremy Allison 
The branch, master has been updated
   via  6653cc4... Fix bug #7036 - net rpc getsid fails in hardened windows 
environments.
  from  33a4739... s4-torture: Migrate ntp_signd test to tsocket.

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


- Log -
commit 6653cc43233381a941cdd85550f04b087fe880ff
Author: Jeremy Allison 
Date:   Thu Jan 14 15:39:30 2010 -0800

Fix bug #7036 - net rpc getsid fails in hardened windows environments.

Fix suggested by dave.daughe...@centrify.com.

---

Summary of changes:
 source3/utils/net_rpc.c |8 +++-
 1 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 762af71..3b72506 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -607,6 +607,12 @@ static NTSTATUS rpc_getsid_internals(struct net_context *c,
 
 int net_rpc_getsid(struct net_context *c, int argc, const char **argv)
 {
+   int conn_flags = NET_FLAGS_PDC;
+
+   if (!c->opt_user_specified) {
+   conn_flags |= NET_FLAGS_ANONYMOUS;
+   }
+
if (c->display_usage) {
d_printf(_("Usage:\n"
   "net rpc getsid\n"
@@ -615,7 +621,7 @@ int net_rpc_getsid(struct net_context *c, int argc, const 
char **argv)
}
 
return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id,
-  NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC,
+  conn_flags,
   rpc_getsid_internals,
   argc, argv);
 }


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2010-01-14 Thread Stefan Metzmacher 
The branch, master has been updated
   via  33a4739... s4-torture: Migrate ntp_signd test to tsocket.
  from  3c42e11... Part 4 of bug #7028 - include scannedonly VFS module

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


- Log -
commit 33a4739090416c98a4f4d1a2dc6b25bc8afdba85
Author: Andreas Schneider 
Date:   Thu Jan 14 12:57:56 2010 +0100

s4-torture: Migrate ntp_signd test to tsocket.

Signed-off-by: Stefan Metzmacher 

---

Summary of changes:
 source4/torture/ntp/ntp_signd.c |  286 ++-
 1 files changed, 160 insertions(+), 126 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/ntp/ntp_signd.c b/source4/torture/ntp/ntp_signd.c
index e38ab4e..7635632 100644
--- a/source4/torture/ntp/ntp_signd.c
+++ b/source4/torture/ntp/ntp_signd.c
@@ -22,77 +22,45 @@
 #include "includes.h"
 #include "torture/smbtorture.h"
 #include 
-#include "lib/socket/socket.h"
 #include "lib/stream/packet.h"
+#include "lib/tsocket/tsocket.h"
+#include "libcli/util/tstream.h"
 #include "torture/rpc/rpc.h"
 #include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
 #include "librpc/gen_ndr/ndr_ntp_signd.h"
 #include "param/param.h"
+#include "system/network.h"
 
 #define TEST_MACHINE_NAME "ntpsigndtest"
 
-struct signd_client_socket {
-   struct socket_context *sock;
-   
-   /* the fd event */
-   struct tevent_fd *fde;
-   
-   NTSTATUS status;
-   DATA_BLOB request, reply;
-   
-   struct packet_context *packet;
-   
-   size_t partial_read;
-};
+struct signd_client_state {
+   struct tsocket_address *local_address;
+   struct tsocket_address *remote_address;
 
-static NTSTATUS signd_client_full_packet(void *private_data, DATA_BLOB data)
-{
-   struct signd_client_socket *signd_client = 
talloc_get_type(private_data, struct signd_client_socket);
-   talloc_steal(signd_client, data.data);
-   signd_client->reply = data;
-   signd_client->reply.length -= 4;
-   signd_client->reply.data += 4;
-   return NT_STATUS_OK;
-}
+   struct tstream_context *tstream;
+   struct tevent_queue *send_queue;
 
-static void signd_client_error_handler(void *private_data, NTSTATUS status)
-{
-   struct signd_client_socket *signd_client = 
talloc_get_type(private_data, struct signd_client_socket);
-   signd_client->status = status;
-}
+   uint8_t request_hdr[4];
+   struct iovec request_iov[2];
 
-/*
-  handle fd events on a signd_client_socket
-*/
-static void signd_client_socket_handler(struct tevent_context *ev, struct 
tevent_fd *fde,
-uint16_t flags, void *private_data)
-{
-   struct signd_client_socket *signd_client = 
talloc_get_type(private_data, struct signd_client_socket);
-   if (flags & TEVENT_FD_READ) {
-   packet_recv(signd_client->packet);
-   return;
-   }
-   if (flags & TEVENT_FD_WRITE) {
-   packet_queue_run(signd_client->packet);
-   return;
-   }
-   /* not reached */
-   return;
-}
+   DATA_BLOB reply;
 
-/* A torture test to show that the unix domain socket protocol is
- * operating correctly, and the signatures are as expected */
+   NTSTATUS status;
+};
 
-static bool test_ntp_signd(struct torture_context *tctx, 
+/*
+ * A torture test to show that the unix domain socket protocol is
+ * operating correctly, and the signatures are as expected
+ */
+static bool test_ntp_signd(struct torture_context *tctx,
   struct dcerpc_pipe *p,
   struct cli_credentials *credentials)
 {
struct netlogon_creds_CredentialState *creds;
TALLOC_CTX *mem_ctx = talloc_new(tctx);
 
-   NTSTATUS status;
struct netr_ServerReqChallenge r;
struct netr_ServerAuthenticate3 a;
struct netr_Credential credentials1, credentials2, credentials3;
@@ -105,12 +73,18 @@ static bool test_ntp_signd(struct torture_context *tctx,
struct signed_reply signed_reply;
DATA_BLOB sign_req_blob;
 
-   struct signd_client_socket *signd_client;
-   char *signd_socket_address;
+   struct signd_client_state *signd_client;
+   struct tevent_req *req;
+   char *unix_address;
+   int sys_errno;
+
+   NTSTATUS status;
 
struct MD5Context ctx;
uint8_t sig[16];
enum ndr_err_code ndr_err;
+   bool ok;
+   int rc;
 
machine_name = cli_credentials_get_workstation(credentials);
 
@@ -148,101 +122,161 @@ static bool test_ntp_signd(struct torture_context *tctx,
 
status = dcerpc_netr_ServerAuthenticate3(p, tctx, &a);
torture_assert_ntstatus_ok(tctx, status, "ServerAuthenticate3");
-   torture_assert(tctx

[SCM] Samba Shared Repository - branch master updated

2010-01-14 Thread Jeremy Allison 
The branch, master has been updated
   via  3c42e11... Part 4 of bug #7028 - include scannedonly VFS module
  from  e635b00... s3-libsmbclient: Fix crash bug in SMBC_parse_path().

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


- Log -
commit 3c42e11ff398d0307a480d49191aae3bf9869cd9
Author: Olivier Sessink 
Date:   Thu Jan 14 12:13:14 2010 -0800

Part 4 of bug #7028 - include scannedonly VFS module

Fix some issues with handling names ending in '/'.

---

Summary of changes:
 source3/modules/vfs_scannedonly.c |   21 -
 1 files changed, 8 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_scannedonly.c 
b/source3/modules/vfs_scannedonly.c
index ff16d78..20fe57d 100644
--- a/source3/modules/vfs_scannedonly.c
+++ b/source3/modules/vfs_scannedonly.c
@@ -153,12 +153,6 @@ static char *cachefile_name_f_fullpath(TALLOC_CTX *ctx,
return cachefile;
 }
 
-static char *path_plus_name(TALLOC_CTX *ctx, const char *base,
-   const char *filename)
-{
-   return talloc_asprintf(ctx, "%s%s", base,filename);
-}
-
 static char *construct_full_path(TALLOC_CTX *ctx, vfs_handle_struct * handle,
 const char *somepath, bool ending_slash)
 {
@@ -179,10 +173,10 @@ static char *construct_full_path(TALLOC_CTX *ctx, 
vfs_handle_struct * handle,
}
/* vfs_GetWd() seems to return a path with a slash */
if (ending_slash) {
-   return talloc_asprintf(ctx, "%s%s/",
+   return talloc_asprintf(ctx, "%s/%s/",
   vfs_GetWd(ctx, handle->conn),tmp);
}
-   return talloc_asprintf(ctx, "%s%s",
+   return talloc_asprintf(ctx, "%s/%s",
   vfs_GetWd(ctx, handle->conn),tmp);
 }
 
@@ -450,7 +444,7 @@ static bool scannedonly_allow_access(vfs_handle_struct * 
handle,
while (dire) {
char *fpath2;
struct smb_filename *smb_fname2;
-   fpath2 = path_plus_name(ctx,base_name, dire->d_name);
+   fpath2 = talloc_asprintf(ctx, "%s%s", 
base_name,dire->d_name);
DEBUG(SCANNEDONLY_DEBUG,
  ("scannedonly_allow_access in loop, "
   "found %s\n", fpath2));
@@ -520,6 +514,8 @@ static SMB_STRUCT_DIR 
*scannedonly_opendir(vfs_handle_struct * handle,
} else {
sDIR->base = name_w_ending_slash(sDIR, fname);
}
+   DEBUG(SCANNEDONLY_DEBUG,
+   ("scannedonly_opendir, fname=%s, 
base=%s\n",fname,sDIR->base));
sDIR->DIR = DIRp;
sDIR->notify_loop_done = 0;
return (SMB_STRUCT_DIR *) sDIR;
@@ -554,8 +550,7 @@ static SMB_STRUCT_DIRENT 
*scannedonly_readdir(vfs_handle_struct *handle,
   "skip to next entry\n", result->d_name));
return scannedonly_readdir(handle, dirp, NULL);
}
-
-   tmp = path_plus_name(ctx,sDIR->base, result->d_name);
+   tmp = talloc_asprintf(ctx, "%s%s", sDIR->base, result->d_name);
DEBUG(SCANNEDONLY_DEBUG,
  ("scannedonly_readdir, check access to %s (sbuf=%p)\n",
   tmp,sbuf));
@@ -844,7 +839,7 @@ static int scannedonly_rmdir(vfs_handle_struct * handle, 
const char *path)
}
/* stat the file and see if it is a
   special file */
-   fullpath = path_plus_name(ctx,path_w_slash,
+   fullpath = talloc_asprintf(ctx, "%s%s", path_w_slash,
  dire->d_name);
create_synthetic_smb_fname(ctx, fullpath,NULL,NULL,
   &smb_fname);
@@ -873,7 +868,7 @@ static int scannedonly_rmdir(vfs_handle_struct * handle, 
const char *path)
if (ISDOT(dire->d_name) || ISDOTDOT(dire->d_name)) {
continue;
}
-   fullpath = path_plus_name(ctx,path_w_slash,
+   fullpath = talloc_asprintf(ctx, "%s%s", path_w_slash,
  dire->d_name);
create_synthetic_smb_fname(ctx, fullpath,NULL,NULL,
   &smb_fname);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2010-01-14 Thread Günther Deschner 
The branch, master has been updated
   via  e635b00... s3-libsmbclient: Fix crash bug in SMBC_parse_path().
   via  d95ad11... s4-smbtorture: add rather simple libsmbclient torture 
testsuite.
  from  8573471... s3:auth: fix account unlock regression introduced with 
fix for bug #4347

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


- Log -
commit e635b0074c55e0376495abe940355aa7b04f0b70
Author: Günther Deschner 
Date:   Thu Jan 14 19:34:26 2010 +0100

s3-libsmbclient: Fix crash bug in SMBC_parse_path().

Patch from Tim Waugh .
This resolves https://bugzilla.redhat.com/show_bug.cgi?id=552658

LIBSMBCLIENT-OPENDIR torture test checks this as well.

Guenther

commit d95ad11bc583c99f9bf8faeac7935880da19684b
Author: Günther Deschner 
Date:   Tue Jan 12 17:42:00 2010 +0100

s4-smbtorture: add rather simple libsmbclient torture testsuite.

Guenther

---

Summary of changes:
 source3/libsmb/libsmb_path.c|2 +-
 source3/samba4.m4   |1 +
 source4/configure.ac|1 +
 source4/torture/config.mk   |1 +
 source4/torture/libsmbclient/config.m4  |   34 
 source4/torture/libsmbclient/config.mk  |   15 ++
 source4/torture/libsmbclient/libsmbclient.c |  220 +++
 source4/torture/torture.c   |8 +
 8 files changed, 281 insertions(+), 1 deletions(-)
 create mode 100644 source4/torture/libsmbclient/config.m4
 create mode 100644 source4/torture/libsmbclient/config.mk
 create mode 100644 source4/torture/libsmbclient/libsmbclient.c


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/libsmb_path.c b/source3/libsmb/libsmb_path.c
index 9d2eafc..64a956d 100644
--- a/source3/libsmb/libsmb_path.c
+++ b/source3/libsmb/libsmb_path.c
@@ -308,7 +308,7 @@ SMBC_parse_path(TALLOC_CTX *ctx,
if (!*pp_server) {
return -1;
}
-   *pp_server[wl] = '\0';
+   (*pp_server)[wl] = '\0';
return 0;
}
 
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index e4b2a0a..fbc19f1 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -136,6 +136,7 @@ SMB_ENABLE(wbinfo, NO)
 
 m4_include(lib/tls/config.m4)
 m4_include(torture/libnetapi/config.m4)
+m4_include(torture/libsmbclient/config.m4)
 
 dnl m4_include(auth/kerberos/config.m4)
 m4_include(auth/gensec/config.m4)
diff --git a/source4/configure.ac b/source4/configure.ac
index 3f10419..eab1be6 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -117,6 +117,7 @@ SMB_INCLUDED_LIB_PKGCONFIG(LIBLDB, ldb = 
LDB_REQUIRED_VERSION,
 
 m4_include(lib/tls/config.m4)
 m4_include(torture/libnetapi/config.m4)
+m4_include(torture/libsmbclient/config.m4)
 
 dnl m4_include(auth/kerberos/config.m4)
 m4_include(auth/gensec/config.m4)
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 7976df2..d51ec68 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -90,6 +90,7 @@ $(eval $(call 
proto_header_template,$(torturesrcdir)/raw/proto.h,$(TORTURE_RAW_O
 mkinclude smb2/config.mk
 mkinclude winbind/config.mk
 mkinclude libnetapi/config.mk
+mkinclude libsmbclient/config.mk
 
 [SUBSYSTEM::TORTURE_NDR]
 PRIVATE_DEPENDENCIES = torture SERVICE_SMB
diff --git a/source4/torture/libsmbclient/config.m4 
b/source4/torture/libsmbclient/config.m4
new file mode 100644
index 000..a53b4d6
--- /dev/null
+++ b/source4/torture/libsmbclient/config.m4
@@ -0,0 +1,34 @@
+###
+# start SMB_EXT_LIB_LIBSMBCLIENT
+# check for libsmbclient.h and -lsmbclient
+
+use_libsmbclient=auto
+AC_ARG_ENABLE(libsmbclient,
+AS_HELP_STRING([--enable-libsmbclient],[Turn on libsmbclient support 
(default=auto)]),
+[if test x$enable_libsmbclient = xno; then
+use_libsmbclient=no
+fi])
+
+
+#if test x$use_libsmbclient = xauto && pkg-config --exists libsmbclient; then
+#  SMB_EXT_LIB_FROM_PKGCONFIG(LIBSMBCLIENT, libsmbclient < 0.1,
+# 
[use_libsmbclient=yes],
+# 
[use_libsmbclient=no])
+#fi
+
+SMB_ENABLE(TORTURE_LIBSMBCLIENT,NO)
+if test x$use_libsmbclient != xno; then
+   AC_CHECK_HEADERS(libsmbclient.h)
+   AC_CHECK_LIB_EXT(smbclient, SMBCLIENT_LIBS, smbc_new_context)
+   AC_CHECK_LIB_EXT(smbclient, SMBCLIENT_LIBS, 
smbc_getOptionNoAutoAnonymousLogin)
+   if test x"$ac_cv_header_libsmbclient_h" = x"yes" -a 
x"$ac_cv_lib_ext_smbclient_smbc_new_context" = x"yes" -a 
x"$ac_cv_lib_ext_smbclient_smbc_getOptionNoAutoAnonymousLogin" = x"yes"; then
+   AC_DEFINE(ENABLE_LIBSMBCLIENT,1,[Whether we have libsmbclient 
on the host system])
+   SMB_ENABLE(SMBCLIENT,YES)
+

[SCM] Samba Shared Repository - branch master updated

2010-01-14 Thread Michael Adam 
The branch, master has been updated
   via  8573471... s3:auth: fix account unlock regression introduced with 
fix for bug #4347
  from  743adfd... s3 selftest: Enable the WINBIND-STRUCT tests

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


- Log -
commit 8573471154d63644bc581d0b6a80f73927ca3e93
Author: Michael Adam 
Date:   Thu Jan 14 14:24:35 2010 +0100

s3:auth: fix account unlock regression introduced with fix for bug #4347

By an oversight, the patchset for #4347 made the unlocking of a locked
account after the lockout duration ineffective.
Thanks to Björn for finding this!

Michael

---

Summary of changes:
 source3/auth/auth_sam.c |   12 +---
 1 files changed, 5 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index 1dd8fc9..01b2517 100644
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.c
@@ -369,7 +369,6 @@ static NTSTATUS check_sam_security(const struct 
auth_context *auth_context,
DATA_BLOB user_sess_key = data_blob_null;
DATA_BLOB lm_sess_key = data_blob_null;
bool updated_autolock = False, updated_badpw = False;
-   uint32_t acct_ctrl;
const char *username;
const uint8_t *nt_pw;
const uint8_t *lm_pw;
@@ -399,22 +398,21 @@ static NTSTATUS check_sam_security(const struct 
auth_context *auth_context,
return NT_STATUS_NO_SUCH_USER;
}
 
-   acct_ctrl = pdb_get_acct_ctrl(sampass);
username = pdb_get_username(sampass);
nt_pw = pdb_get_nt_passwd(sampass);
lm_pw = pdb_get_lanman_passwd(sampass);
 
/* see if autolock flag needs to be updated */
-   if (acct_ctrl & ACB_NORMAL)
+   if (pdb_get_acct_ctrl(sampass) & ACB_NORMAL)
pdb_update_autolock_flag(sampass, &updated_autolock);
/* Quit if the account was locked out. */
-   if (acct_ctrl & ACB_AUTOLOCK) {
+   if (pdb_get_acct_ctrl(sampass) & ACB_AUTOLOCK) {
DEBUG(3,("check_sam_security: Account for user %s was locked 
out.\n", username));
return NT_STATUS_ACCOUNT_LOCKED_OUT;
}
 
nt_status = sam_password_ok(auth_context, mem_ctx,
-   username, acct_ctrl, lm_pw, nt_pw,
+   username, pdb_get_acct_ctrl(sampass), 
lm_pw, nt_pw,
user_info, &user_sess_key, &lm_sess_key);
 
/* Notify passdb backend of login success/failure. If not 
@@ -426,7 +424,7 @@ static NTSTATUS check_sam_security(const struct 
auth_context *auth_context,
bool increment_bad_pw_count = false;
 
if (NT_STATUS_EQUAL(nt_status,NT_STATUS_WRONG_PASSWORD) && 
-   acct_ctrl & ACB_NORMAL &&
+   pdb_get_acct_ctrl(sampass) & ACB_NORMAL &&
NT_STATUS_IS_OK(update_login_attempts_status)) 
{
increment_bad_pw_count =
@@ -457,7 +455,7 @@ static NTSTATUS check_sam_security(const struct 
auth_context *auth_context,
goto done;
}
 
-   if ((acct_ctrl & ACB_NORMAL) &&
+   if ((pdb_get_acct_ctrl(sampass) & ACB_NORMAL) &&
(pdb_get_bad_password_count(sampass) > 0)){
pdb_set_bad_password_count(sampass, 0, PDB_CHANGED);
pdb_set_bad_password_time(sampass, 0, PDB_CHANGED);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2010-01-14 Thread Kai Blin 
The branch, master has been updated
   via  743adfd... s3 selftest: Enable the WINBIND-STRUCT tests
   via  cf38a1f... s3 test: Fix WINBINDD-STRUCT tests
   via  89e6eac... s3 selftest: Fix LOOKUP_SID test.
   via  e95c04f... s3 selftest: Fix WINBINDD_LIST_GROUPS test
   via  932d4a8... s3 winbindd: Return number of groups in data.num_entries 
for WINBINDD_LIST_GROUPS
   via  a4f21d5... s3 selftest: Allow the enumeration of users and groups
   via  a6015a8... s3 selftest: Fix the WINBINDD_GETDCNAMEe test.
   via  36db924... s3 winbindd: Get WINBINDD_CHECK_MACHACC torture test to 
work again.
  from  b1d2bb3... s4:provision_users.ldif - Add a comment that some 
objects under "Users" are now located elsewhere

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


- Log -
commit 743adfda911e9123132fcc0d599080d869f419ab
Author: Kai Blin 
Date:   Wed Jan 13 13:58:20 2010 +0100

s3 selftest: Enable the WINBIND-STRUCT tests

commit cf38a1f850dd3712e7cd71364cc86ecba7871d03
Author: Kai Blin 
Date:   Thu Jan 14 13:21:44 2010 +0100

s3 test: Fix WINBINDD-STRUCT tests

The struct-based tests are working in make selftest, make them work in plain
"make test" as well.

commit 89e6eac290da6457b1d2259c32759d2b8a2b481b
Author: Kai Blin 
Date:   Wed Jan 13 16:46:17 2010 +0100

s3 selftest: Fix LOOKUP_SID test.

WINBINDD_LIST_USERS does not give a domain name if we're a DC and the user 
is
from our domain.

commit e95c04f0f19a6e00251f9eceb94c519a0f91b308
Author: Kai Blin 
Date:   Wed Jan 13 16:02:00 2010 +0100

s3 selftest: Fix WINBINDD_LIST_GROUPS test

If there's no groups in the database, there are no entries in extra_data. 
This
caused WINBINDD_LIST_GROUPS test to fail. Use the fact that
WINBINDD_LIST_GROUPS now reports the number of groups in data.num_entries to
identify the "no groups" case.

commit 932d4a874bb79ad76b95b43491b223d766ab4196
Author: Kai Blin 
Date:   Wed Jan 13 15:59:57 2010 +0100

s3 winbindd: Return number of groups in data.num_entries for 
WINBINDD_LIST_GROUPS

This allows to test if there's something wrong with the group list in
extra_data or if there's simply no groups in the database.

Volker, please check.

commit a4f21d5dc886b708d401a32d2208c316b537b07f
Author: Kai Blin 
Date:   Wed Jan 13 15:21:14 2010 +0100

s3 selftest: Allow the enumeration of users and groups

This fixes the WINBINDD_GETPWENT test.

commit a6015a858d9658730c0cc9b963ad86a740dd4bb8
Author: Kai Blin 
Date:   Wed Jan 13 14:49:26 2010 +0100

s3 selftest: Fix the WINBINDD_GETDCNAMEe test.

The WINBINDD_GETDCNAME test expected an NSS_STATUS_SUCCESS return from all
calls. However, this does not apply for BUILTIN and the DC's own domain.
Make the test work again by skipping those two.

commit 36db924446b8c6a1627e9abb22f774240678851a
Author: Kai Blin 
Date:   Wed Jan 13 14:10:33 2010 +0100

s3 winbindd: Get WINBINDD_CHECK_MACHACC torture test to work again.

WINBINDD_CHECK_MACHACC used to report an NTSTATUS error and appropriate 
error
strings. Make this work again.

---

Summary of changes:
 selftest/target/Samba3.pm  |2 +
 source3/script/tests/selftest.sh   |3 +
 source3/script/tests/test_posix_s3.sh  |2 +-
 source3/winbindd/winbindd_check_machine_acct.c |5 ++-
 source3/winbindd/winbindd_list_groups.c|4 +-
 source4/torture/winbind/struct_based.c |   63 ++--
 6 files changed, 60 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index e1e5210..0e16022 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -479,6 +479,8 @@ sub provision($$)
winbindd:socket dir = $wbsockdir
idmap uid = 10-20
idmap gid = 10-20
+   winbind enum users = yes
+   winbind enum groups = yes
 
 #  min receivefile size = 4000
 
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index c952ef2..91052a7 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -244,6 +244,8 @@ cat >$SERVERCONFFILEextra_data.data = result;
response->length += len;
 
diff --git a/source4/torture/winbind/struct_based.c 
b/source4/torture/winbind/struct_based.c
index de1507a..560fa43 100644
--- a/source4/torture/winbind/struct_based.c
+++ b/source4/torture/winbind/struct_based.c
@@ -166,10 +166,10 @@ static bool torture_winbind_struct_netbios_name(struct 
torture_context *torture)
DO_STRUCT_REQ_REP(WINBINDD_NETBIOS_NAME, NULL, &rep);
 
expected = torture_setting_string(torture,
-

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

2010-01-14 Thread Karolin Seeger 
The branch, v3-5-test has been updated
   via  fd04e3a... Fix bug #7033 - SMBrmdir call always returns true, even 
on failure to delete a directory.
  from  3b9cdab... s3: Fix a winbind segfault in "trusted_domains"

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


- Log -
commit fd04e3a2b74dbd31c7574355c73779626c10070e
Author: Jeremy Allison 
Date:   Wed Jan 13 14:36:37 2010 -0800

Fix bug #7033 - SMBrmdir call always returns true, even on failure to 
delete a directory.

There is a codepath missing to propagate back error returns from the rmdir
POSIX call inside close_directory when delete on close is set. This means 
doing
an rmdir on a Windows command line will always report success, even when the
directory was not deleted. This fix adds that codepath back into Samba.

(This fix contains both ce8dcbe91ba0252140a0e4f84ea4bc746259ddde and
105f876eb447e6839b9b19c2d264c4a168cf0cc9 from master).

Jeremy.

---

Summary of changes:
 source3/smbd/close.c |8 ++--
 source3/smbd/reply.c |8 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 05c3c70..fa83e16 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -924,6 +924,7 @@ static NTSTATUS close_directory(struct smb_request *req, 
files_struct *fsp,
struct share_mode_lock *lck = NULL;
bool delete_dir = False;
NTSTATUS status = NT_STATUS_OK;
+   NTSTATUS status1 = NT_STATUS_OK;
 
/*
 * NT can set delete_on_close of the last open
@@ -1022,9 +1023,9 @@ static NTSTATUS close_directory(struct smb_request *req, 
files_struct *fsp,
fsp, NT_STATUS_OK);
}
 
-   status = fd_close(fsp);
+   status1 = fd_close(fsp);
 
-   if (!NT_STATUS_IS_OK(status)) {
+   if (!NT_STATUS_IS_OK(status1)) {
DEBUG(0, ("Could not close dir! fname=%s, fd=%d, err=%d=%s\n",
  fsp_str_dbg(fsp), fsp->fh->fd, errno,
  strerror(errno)));
@@ -1042,6 +1043,9 @@ static NTSTATUS close_directory(struct smb_request *req, 
files_struct *fsp,
 
  out:
TALLOC_FREE(lck);
+   if (NT_STATUS_IS_OK(status) && !NT_STATUS_IS_OK(status1)) {
+   status = status1;
+   }
return status;
 }
 
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index b2d98bf..b6316aa 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -5368,8 +5368,12 @@ void reply_rmdir(struct smb_request *req)
goto out;
}
 
-   close_file(req, fsp, NORMAL_CLOSE);
-   reply_outbuf(req, 0, 0);
+   status = close_file(req, fsp, NORMAL_CLOSE);
+   if (!NT_STATUS_IS_OK(status)) {
+   reply_nterror(req, status);
+   } else {
+   reply_outbuf(req, 0, 0);
+   }
 
dptr_closepath(sconn, smb_dname->base_name, req->smbpid);
 


-- 
Samba Shared Repository

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

2010-01-14 Thread Karolin Seeger 
The branch, v3-5-test has been updated
   via  3b9cdab... s3: Fix a winbind segfault in "trusted_domains"
  from  dbbe7c5... Fix bug #7034 - vfs_cap causes signal 11 (SIGSEGV) 
(cherry picked from commit ca847952054f5bbde1d40ad4260589b6fcc9721d)

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


- Log -
commit 3b9cdab89672576ddfe6f7c2be54169fb4dd7634
Author: Volker Lendecke 
Date:   Wed Jan 13 12:20:26 2010 +0100

s3: Fix a winbind segfault in "trusted_domains"

We have to initialize domain->backend by calling "get_cache" before doing a
query

Thanks to Christian Ambach to find this :-)
(cherry picked from commit 026b2306223dffeb627800b3cb6f55d89ad6)

Fix bug #7037.

---

Summary of changes:
 source3/winbindd/winbindd_cache.c |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cache.c 
b/source3/winbindd/winbindd_cache.c
index 68972dd..81970d4 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -2715,15 +2715,16 @@ static NTSTATUS trusted_domains(struct winbindd_domain 
*domain,
old_status = domain->online;
trusts->count = 0;
trusts->array = NULL;
-   if (domain->online) {
-   goto do_query;
-   }
 
cache = get_cache(domain);
if (!cache || !cache->tdb) {
goto do_query;
}
 
+   if (domain->online) {
+   goto do_query;
+   }
+
retval = wcache_tdc_fetch_list(&dom_list, &num_domains);
if (!retval || !num_domains || !dom_list) {
TALLOC_FREE(dom_list);


-- 
Samba Shared Repository

svn commit: samba-web r1357 - in trunk: . history

2010-01-14 Thread kseeger 
Author: kseeger
Date: 2010-01-14 04:49:38 -0700 (Thu, 14 Jan 2010)
New Revision: 1357

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1357

Log:
Announce Samba 3.3.10
Karolin
Added:
   trunk/history/samba-3.3.10.html
Modified:
   trunk/header_columns.html
   trunk/history/header_history.html
   trunk/index.html


Changeset:
Modified: trunk/header_columns.html
===
--- trunk/header_columns.html   2010-01-12 10:54:31 UTC (rev 1356)
+++ trunk/header_columns.html   2010-01-14 11:49:38 UTC (rev 1357)
@@ -127,9 +127,9 @@
 
 Historical
 
-Samba 3.3.9 
(gzipped)
-Release Notes 3.3.9
-Signature 
3.3.9
+Samba 3.3.10 
(gzipped)
+Release Notes 
3.3.10
+Signature 
3.3.10
 
 Samba 3.2.15 
(gzipped)
 Release Notes 
3.2.15

Modified: trunk/history/header_history.html
===
--- trunk/history/header_history.html   2010-01-12 10:54:31 UTC (rev 1356)
+++ trunk/history/header_history.html   2010-01-14 11:49:38 UTC (rev 1357)
@@ -82,6 +82,7 @@
 samba-3.4.2
 samba-3.4.1
 samba-3.4.0
+samba-3.3.10
 samba-3.3.9
 samba-3.3.8
 samba-3.3.7

Added: trunk/history/samba-3.3.10.html
===
--- trunk/history/samba-3.3.10.html (rev 0)
+++ trunk/history/samba-3.3.10.html 2010-01-14 11:49:38 UTC (rev 1357)
@@ -0,0 +1,116 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+http://www.w3.org/1999/xhtml";>
+
+
+Samba - Release Notes Archive
+
+
+
+
+   Samba 3.3.10 Available for Download
+
+
+
+   ==
+   Release Notes for Samba 3.3.10
+January 14, 2010
+   ==
+
+
+This is the latest bugfix release of the Samba 3.3 series.
+
+Major enhancements in Samba 3.3.10 include:
+
+   o Fix changing of ACLs on writable file with "dos filemode=yes" (bug #5202).
+   o Fix smbd crashes in dns_register_smbd_reply (bug #6696).
+   o Fix Winbind crashes when queried from nss (bug #6889).
+   o Fix Winbind crash when retrieving empty group members (bug #7014).
+   o Fix interdomain trusts with Win2008R2 (bug #6697).
+
+
+##
+Changes
+###
+
+Changes since 3.3.9
+---
+
+
+o   Michael Adam 
+* BUG 6910: Fix "idmap backend" with multiple LDAP servers specified.
+
+
+o   Jeremy Allison 
+* BUG 5202: Fix changing of ACLs on writable file with "dos filemode=yes".
+* BUG 6696: Fix smbd crashes (signal 11) in dns_register_smbd_reply.
+* BUG 6828: Fix infinite timeout when byte lock held outside of Samba.
+* BUG 6829: Fix special characters in smbclient output.
+* BUG 6867: trans2findnext returns reply_nterror(req, ntstatus) in a
+  directory with a lot of files.
+* BUG 6875: Fix operations on OS/2 clients.
+* BUG 6880: Fix listing of workgroup servers.
+* BUG 6939: Fix long filenames when "mangling method = hash" is set.
+* BUG 7005: "mangling method = hash" truncates files with dot '. '
+  character.
+
+
+o   Olaf Flebbe 
+* BUG 6805: Correctly handle aio_error() and errno.
+
+
+o   Günther Deschner 
+* BUG 6697: Fix interdomain trusts with Win2008R2.
+* BUG 6868: Support building of cifs.upcall with Heimdal as well with MIT.
+* BUG 6889: Fix Winbind crashes when queried from nss.
+* BUG 6929: Fix build with recent Heimdal.
+* Fix the build of the winbind krb5 locator plugin.
+* Fix compile of winbind_krb5_locator with recent Heimdal versions.
+* Fix the build on Mac OS X 10.6.2.
+
+
+o   Jeff Layton 
+* BUG 6810: Backport support for finding alternate credcaches.
+* Use pid value from kernel to determine KRB5CCNAME to use in cifs.upcall.
+
+
+o   Volker Lendecke 
+* BUG 6338: 'net rpc trustdom list' always displays "none".
+* BUG 6793: Fix segfault in winbindd_pam_auth.
+* BUG 6850: Fix shadow copy display on Windows 7.
+* BUG 6973: Fix a segfault in 'net'.
+* Fix the build of cifs.upcall.
+
+
+o   Jim McDonough 
+* BUG 7014: Fix Winbind crash when retrieving empty group members.
+
+
+o   Stefan Metzmacher 
+* BUG 6157: Restore Samba 3.0.x behavior and use the first "uid" value.
+* BUG 6642: Fix opening the quota magic file.
+* BUG 6856: Fix the build of the GPFS VFS module with headers only.
+* BUG 6919: Fix remote quota management.
+
+
+o   Timothy Miller 
+* BUG 6696: Fix smbd crashes when using mdns (not avahi) support.
+
+
+o   Andrew Tridgell 
+* BUG 6918: Fix krb5 build problem on Ubuntu Karmic.
+
+
+o

[SCM] Samba Shared Repository - branch master updated

2010-01-14 Thread Matthias Dieter Wallnöfer 
The branch, master has been updated
   via  b1d2bb3... s4:provision_users.ldif - Add a comment that some 
objects under "Users" are now located elsewhere
   via  face5d3... s4:provision_users.ldif - Add objects for IIS
   via  9ac39b6... s4:provision_users.ldif - Add additional BUILTIN objects
   via  2a05dd6... s4:provision_users.ldif - add the restant part of the 
objects needing for RODC support
   via  7135705... s4:provision_users.ldif - Fix up errors on existing 
entries
   via  81053e9... s4:provision_users.ldif - Simple reordering
   via  a0d7f3e... s4:provision_users.ldif - Remove system objects from the 
wrong place
   via  40bc48d... s4:SAMR RPC - Fix the criteria for group searches
  from  c663af8... s4-idl: get rid of the operation specific DRS options 
flags

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


- Log -
commit b1d2bb3e51bdee1dd32d97af8d502adc374acefb
Author: Matthias Dieter Wallnöfer 
Date:   Wed Jan 13 17:39:28 2010 +0100

s4:provision_users.ldif - Add a comment that some objects under "Users" are 
now located elsewhere

This is needed due to the new RID/SID distribution system

commit face5d3030b6d2c7dfbe6e2cb36a2e59e9efde67
Author: Matthias Dieter Wallnöfer 
Date:   Sun Jan 10 14:20:09 2010 +0100

s4:provision_users.ldif - Add objects for IIS

Some WSPP locations point out that beginning with Windows Server 2008 
they're
also per default present.

Compared against Windows Server 2008

commit 9ac39b659f00dc3737dff5be021cd0aefa0dc39e
Author: Matthias Dieter Wallnöfer 
Date:   Mon Jan 11 22:12:01 2010 +0100

s4:provision_users.ldif - Add additional BUILTIN objects

Compared against Windows Server 2008

commit 2a05dd6fcc9ccbebeeebcb66407ae2e49d626307
Author: Matthias Dieter Wallnöfer 
Date:   Mon Jan 11 22:01:42 2010 +0100

s4:provision_users.ldif - add the restant part of the objects needing for 
RODC support

RODC = Read Only Domain Controllers

Compared against Windows Server 2008

commit 71357053bb2b0695cbbf4661529fc81db3c8e4fd
Author: Matthias Dieter Wallnöfer 
Date:   Mon Jan 11 21:57:32 2010 +0100

s4:provision_users.ldif - Fix up errors on existing entries

Compared against Windows Server 2008

commit 81053e9124057915402ddedb1b7b087516349829
Author: Matthias Dieter Wallnöfer 
Date:   Mon Jan 11 21:44:18 2010 +0100

s4:provision_users.ldif - Simple reordering

Sorted according the SID - easier for later enhancements.

commit a0d7f3e3442d8baa23af0c0e74b3707eedc2158d
Author: Matthias Dieter Wallnöfer 
Date:   Mon Jan 11 21:36:40 2010 +0100

s4:provision_users.ldif - Remove system objects from the wrong place

Objects like the "Cryptographic Operators", "Event Log Readers" don't belong
here but into the builtin domain.

commit 40bc48dfa909fe8eda7e1c4ae072dc298d20e978
Author: Matthias Dieter Wallnöfer 
Date:   Tue Jan 12 22:16:36 2010 +0100

s4:SAMR RPC - Fix the criteria for group searches

This should match the MS-SAMR documentation (section 3.1.5.5.1.1)

---

Summary of changes:
 source4/rpc_server/samr/dcesrv_samr.c |8 +-
 source4/setup/provision_users.ldif|  211 +
 2 files changed, 137 insertions(+), 82 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/rpc_server/samr/dcesrv_samr.c 
b/source4/rpc_server/samr/dcesrv_samr.c
index 1621003..7de2377 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -521,11 +521,11 @@ static NTSTATUS 
dcesrv_samr_info_DomGeneralInformation(struct samr_domain_state
info->num_users = samdb_search_count(state->sam_ctx, state->domain_dn,
 "(objectClass=user)");
info->num_groups = samdb_search_count(state->sam_ctx, state->domain_dn,
- 
"(&(objectClass=group)(sAMAccountType=%u))",
- ATYPE_GLOBAL_GROUP);
+ 
"(&(objectClass=group)(groupType=%u))",
+ GTYPE_SECURITY_GLOBAL_GROUP);
info->num_aliases = samdb_search_count(state->sam_ctx, state->domain_dn,
-  
"(&(objectClass=group)(sAMAccountType=%u))",
-  ATYPE_LOCAL_GROUP);
+  
"(&(objectClass=group)(groupType=%u))",
+  
GTYPE_SECURITY_DOMAIN_LOCAL_GROUP);
 
return NT_STATUS_OK;
 }
diff --git a/source4/setup/provision_users.ldif 
b/source4/setup/provision_users.ldif
index c27249d..a2e5441 100644
--- a/source4/setup/provision_users.ldif
+++ b/source4/setup/provision_users.ldif
@@ -

[SCM] Samba Shared Repository - annotated tag release-3-3-10 created

2010-01-14 Thread Karolin Seeger 
The annotated tag, release-3-3-10 has been created
at  e5849fea19f0c633bc2b7c4caa36bbf295b1a33a (tag)
   tagging  3df467f2f38809d0b41c76463bd73c36e1853238 (commit)
  replaces  release-3-3-9
 tagged by  Karolin Seeger
on  Thu Jan 14 11:18:04 2010 +0100

- Log -
tag release-3-3-10
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.12 (GNU/Linux)

iD8DBQBLTu98bzORW2Vot+oRAtSlAKCsOeYFQ1E0GsMkjcMm5UCID1CJ/wCgjpK2
kbsoIrX+/sl3xAnII9JZ1Kg=
=YTSI
-END PGP SIGNATURE-

Andrew Tridgell (1):
  s3: fixed krb5 build problem on ubuntu karmic

Bo Yang (3):
  Fix bug 6811 - pam_winbind references freed memory. s3: Fix reference to 
freed memory in pam_winbind.
  s3: Don't fail authentication when one or some group of 
require-membership-of is invalid.
  s3: Fix crash in pam_winbind, another reference to freed memory.

Günther Deschner (18):
  s3-rpc_client: protect rpc_pipe_np_smb_conn against a NULL struct 
rpc_pipe_client.
  s3-rpc_client: make sure cli_rpc_pipe_open_schannel() does not always 
return NT_STATUS_OK.
  docs: Fix Bug 6922: Add Registry patchfile for Win7 domain join.
  kerberos: fix some heimdal build warnings.
  s3-kerberos: fix some build warnings when building against heimdal.
  s3-kerberos: add smb_krb5_principal_get_realm().
  cifs.upcall: Fix Bug #6868: support building with Heimdal we well as with 
MIT.
  nsswitch: fix the build of the winbind krb5 locator plugin.
  s3-build: really fix build of winbind_krb5_locator.
  cifs.upcall: 2nd part of fix for Bug #6868: support building with Heimdal 
we well as with MIT.
  nsswitch: fix compile of winbind_krb5_locator with recent Heimdal 
versions.
  s3-kerberos: add check for prerequisite krb5/krb5.h header while checking 
for krb5/locate_plugin.h.
  s3-kerberos: next step to resolve Bug #6929: build with recent heimdal.
  s3-kerberos: Fix Bug #6929: build with recent heimdal.
  s3-kerberos: only use krb5 headers where required.
  s3-kerberos: do not include authdata headers before including krb5 
headers.
  s3-kerberos: add a missing reference to authdata headers.
  s3-kerberos: fix the build on Mac OS X 10.6.2.

Jeff Layton (11):
  cifs.upcall: use pid value from kernel to determine KRB5CCNAME to use
  cifs.upcall: clean up logging and add debug messages
  cifs.upcall: formatting cleanup
  cifs.upcall: declare a structure for holding decoded args
  cifs.upcall: try getting a "cifs/" principal and fall back to "host/"
  cifs.upcall: clean up flag handling
  cifs.upcall: use ip address passed by kernel to get server's hostname
  cifs.upcall: fix IPv6 addrs sent to upcall to have colon delimiters
  cifs.upcall: switch to getopt_long
  cifs.upcall: make using ip address conditional on new option
  cifs.upcall: do a brute-force search for KRB5 credcache

Jelmer Vernooij (1):
  clikrb5: Prefer krb5_free_keytab_entry_contents to krb5_kt_free_entry.

Jeremy Allison (11):
  Fix bug 6828 - infinite timeout occurs when byte lock held outside of 
samba Jeremy.
  Fix bug 6829 - smbclient does not show special characters properly. All 
successful calls to cli_session_setup() *must* be followed by calls to 
cli_init_creds() to stash the credentials we successfully connected with. There 
were 2 codepaths where this was missing. This caused smbclient to be unable to 
open the \srvsvc pipe to do an RPC netserverenum, and cause it to fall back to 
a RAP netserverenum, which uses DOS codepage conversion rather than the full 
UCS2 of RPC, so the returned characters were not correct (unless the DOS 
codepage was set correctly). Phew. That was fun to track down :-). Includes 
logic simplification in libsmb_server.c Jeremy.
  Fix bug 6867 - trans2findnext returns reply_nterror(req, ntstatus) In a 
directory with a lot of files. Jeremy.
  Fix bug 6880 - cannot list workgroup servers reported by Alban Browaeys 
 with fix. Revert 2e989bab0764c298a2530a2d4c8690258eba210c 
with extra comments - this broke workgroup enumeration. Jeremy.
  Fix bug 6875 - trans2 FIND_FIRST2 response --> FIND_FIRST2 Data -> Fille 
Attributes are returned as 0x220 for LANMAN2.1 dialect Jeremy.
  Second part of the fix for bug 6828 - infinite timeout occurs when byte 
lock held outside of samba. Fixes case where a connection with a pending lock 
can me marked "idle", and ensures that the lock queue timeout is always 
recalculated. Jeremy.
  Second part of fix for 6875 - trans2 FIND_FIRST2 response --> FIND_FIRST2 
Data -> Fille Attributes are returned as 0x220 for LANMAN2.1 dial
  Fix bug #6939 - mangling method = hash breaks long filenames.
  Fix bug 7005 - mangle method = hash truncates files with dot '. ' 
character
  Re-fix bug 5202 - cannot change ACLs on writable file with "dos 
filemode=yes"
  Second part of fix for bug 6696 - smbd 3.3.

[SCM] Samba Shared Repository - branch v3-3-stable updated

2010-01-14 Thread Karolin Seeger 
The branch, v3-3-stable has been updated
   via  3df467f... WHATSNEW: Update release notes.
   via  1cbac36... s3:configure: only check for gpfs_gpl.h
  from  ed0611f... WHATSNEW: Prepare release notes for Samba 3.3.10.

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


- Log -
commit 3df467f2f38809d0b41c76463bd73c36e1853238
Author: Karolin Seeger 
Date:   Thu Jan 14 11:10:27 2010 +0100

WHATSNEW: Update release notes.

Karolin
(cherry picked from commit f3ed684b73b233cc2a652f6980e3a854e63eac6b)

commit 1cbac364a7cb3f5314ab0d76da1f65a9e678df6b
Author: Stefan Metzmacher 
Date:   Wed Oct 28 11:21:27 2009 +0100

s3:configure: only check for gpfs_gpl.h

The header is everything we need in order to build vfs_gpfs.

metze

Signed-off-by: Michael Adam 
(cherry picked from commit ee13e9c0becc2b4a4d3b233613d5e3e9bfb54938)

Fix bug #6856.
(cherry picked from commit b71f0e5f6f715d7c061d3a845f1e983e2472c1b0)
(cherry picked from commit 3f0de150f64f93c7874290160359a89b518864b5)

---

Summary of changes:
 WHATSNEW.txt|1 +
 source/configure.in |   30 +-
 2 files changed, 6 insertions(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 325c136..8c42cbf 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -75,6 +75,7 @@ o   Jim McDonough 
 o   Stefan Metzmacher 
 * BUG 6157: Restore Samba 3.0.x behavior and use the first "uid" value.
 * BUG 6642: Fix opening the quota magic file.
+* BUG 6856: Fix the build of the GPFS VFS module with headers only.
 * BUG 6919: Fix remote quota management.
 
 
diff --git a/source/configure.in b/source/configure.in
index 650a38f..5585a02 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -1064,33 +1064,13 @@ AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
 AC_CHECK_FUNCS(backtrace_symbols)
 AC_CHECK_LIB(exc, trace_back_stack)
 
-printf "%s" "checking for GPFS GPL libs... "
-save_LIBS="$LIBS"
-LIBS="$LIBS -lgpfs_gpl"
-AC_TRY_LINK([#include ],
-  [gpfs_set_share(0,GPFS_SHARE_READ,GPFS_DENY_NONE)],
-  samba_cv_HAVE_GPFS=yes,
-  samba_cv_HAVE_GPFS=no)
-echo $samba_cv_HAVE_GPFS
-if test x"$samba_cv_HAVE_GPFS" = x"yes"; then
-AC_DEFINE(HAVE_GPFS,1,[Whether GPFS GPL libs are available])
+#
+# check if building with gpfs
+AC_CHECK_HEADERS(gpfs_gpl.h)
+if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
+AC_DEFINE(HAVE_GPFS,1,[Whether GPFS GPL headers are available])
 default_shared_modules="$default_shared_modules vfs_gpfs"
 fi
-LIBS="$save_LIBS"
-
-printf "%s" "checking for GPFS libs (with 3.2.1 PTF8 available as GPL)... "
-save_LIBS="$LIBS"
-LIBS="$LIBS -lgpfs"
-AC_TRY_LINK([#include ],
-  [gpfs_set_share(0,GPFS_SHARE_READ,GPFS_DENY_NONE)],
-  samba_cv_HAVE_GPFS=yes,
-  samba_cv_HAVE_GPFS=no)
-echo $samba_cv_HAVE_GPFS
-if test x"$samba_cv_HAVE_GPFS" = x"yes"; then
-AC_DEFINE(HAVE_GPFS,1,[Whether GPFS GPL libs are available])
-default_shared_modules="$default_shared_modules vfs_gpfs"
-fi
-LIBS="$save_LIBS"
 
 # Note that all the libunwind symbols in the API are defined to internal
 # platform-specific version, so we must include libunwind.h before checking


-- 
Samba Shared Repository

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

2010-01-14 Thread Karolin Seeger 
The branch, v3-3-test has been updated
   via  f3ed684... WHATSNEW: Update release notes.
  from  3f0de15... s3:configure: only check for gpfs_gpl.h

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


- Log -
commit f3ed684b73b233cc2a652f6980e3a854e63eac6b
Author: Karolin Seeger 
Date:   Thu Jan 14 11:10:27 2010 +0100

WHATSNEW: Update release notes.

Karolin

---

Summary of changes:
 WHATSNEW.txt |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 325c136..8c42cbf 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -75,6 +75,7 @@ o   Jim McDonough 
 o   Stefan Metzmacher 
 * BUG 6157: Restore Samba 3.0.x behavior and use the first "uid" value.
 * BUG 6642: Fix opening the quota magic file.
+* BUG 6856: Fix the build of the GPFS VFS module with headers only.
 * BUG 6919: Fix remote quota management.
 
 


-- 
Samba Shared Repository

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

2010-01-14 Thread Karolin Seeger 
The branch, v3-3-test has been updated
   via  3f0de15... s3:configure: only check for gpfs_gpl.h
  from  448e1d2... WHATSNEW: Prepare release notes for Samba 3.3.10.

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


- Log -
commit 3f0de150f64f93c7874290160359a89b518864b5
Author: Stefan Metzmacher 
Date:   Wed Oct 28 11:21:27 2009 +0100

s3:configure: only check for gpfs_gpl.h

The header is everything we need in order to build vfs_gpfs.

metze

Signed-off-by: Michael Adam 
(cherry picked from commit ee13e9c0becc2b4a4d3b233613d5e3e9bfb54938)

Fix bug #6856.
(cherry picked from commit b71f0e5f6f715d7c061d3a845f1e983e2472c1b0)

---

Summary of changes:
 source/configure.in |   30 +-
 1 files changed, 5 insertions(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/configure.in b/source/configure.in
index 650a38f..5585a02 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -1064,33 +1064,13 @@ AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
 AC_CHECK_FUNCS(backtrace_symbols)
 AC_CHECK_LIB(exc, trace_back_stack)
 
-printf "%s" "checking for GPFS GPL libs... "
-save_LIBS="$LIBS"
-LIBS="$LIBS -lgpfs_gpl"
-AC_TRY_LINK([#include ],
-  [gpfs_set_share(0,GPFS_SHARE_READ,GPFS_DENY_NONE)],
-  samba_cv_HAVE_GPFS=yes,
-  samba_cv_HAVE_GPFS=no)
-echo $samba_cv_HAVE_GPFS
-if test x"$samba_cv_HAVE_GPFS" = x"yes"; then
-AC_DEFINE(HAVE_GPFS,1,[Whether GPFS GPL libs are available])
+#
+# check if building with gpfs
+AC_CHECK_HEADERS(gpfs_gpl.h)
+if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
+AC_DEFINE(HAVE_GPFS,1,[Whether GPFS GPL headers are available])
 default_shared_modules="$default_shared_modules vfs_gpfs"
 fi
-LIBS="$save_LIBS"
-
-printf "%s" "checking for GPFS libs (with 3.2.1 PTF8 available as GPL)... "
-save_LIBS="$LIBS"
-LIBS="$LIBS -lgpfs"
-AC_TRY_LINK([#include ],
-  [gpfs_set_share(0,GPFS_SHARE_READ,GPFS_DENY_NONE)],
-  samba_cv_HAVE_GPFS=yes,
-  samba_cv_HAVE_GPFS=no)
-echo $samba_cv_HAVE_GPFS
-if test x"$samba_cv_HAVE_GPFS" = x"yes"; then
-AC_DEFINE(HAVE_GPFS,1,[Whether GPFS GPL libs are available])
-default_shared_modules="$default_shared_modules vfs_gpfs"
-fi
-LIBS="$save_LIBS"
 
 # Note that all the libunwind symbols in the API are defined to internal
 # platform-specific version, so we must include libunwind.h before checking


-- 
Samba Shared Repository