[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-726-ga20a710

[Volker Lendecke]

The branch, master has been updated
   via  a20a710c944055932402ec5dfe3a36ac3d654cbf (commit)
  from  202228d48b6459148d328840d23322ecfac00626 (commit)

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


- Log -
commit a20a710c944055932402ec5dfe3a36ac3d654cbf
Author: Volker Lendecke 
Date:   Thu Mar 26 10:03:59 2009 +0100

Avahi disables a timer by tv=NULL in avahi_timeout_update(), do not crash

---

Summary of changes:
 source3/lib/avahi.c |7 +++
 1 files changed, 7 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/avahi.c b/source3/lib/avahi.c
index ac9867a..269b329 100644
--- a/source3/lib/avahi.c
+++ b/source3/lib/avahi.c
@@ -207,6 +207,13 @@ static void avahi_timeout_update(AvahiTimeout *t, const 
struct timeval *tv)
 {
TALLOC_FREE(t->te);
 
+   if (tv == NULL) {
+   /*
+* Disable this timer
+*/
+   return;
+   }
+
t->te = tevent_add_timer(t->ctx->ev, t, *tv, avahi_timeout_handler, t);
/*
 * No failure mode defined here


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-580-g45726ee

[Volker Lendecke]

The branch, v3-4-test has been updated
   via  45726ee52f766350023d85bc38cd803fdd8235a4 (commit)
  from  940c84fcc75085ee4f1180d4d2a8e718142e4eb6 (commit)

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


- Log -
commit 45726ee52f766350023d85bc38cd803fdd8235a4
Author: Volker Lendecke 
Date:   Thu Mar 26 10:03:59 2009 +0100

Avahi disables a timer by tv=NULL in avahi_timeout_update(), do not crash

---

Summary of changes:
 source3/lib/avahi.c |7 +++
 1 files changed, 7 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/avahi.c b/source3/lib/avahi.c
index ac9867a..269b329 100644
--- a/source3/lib/avahi.c
+++ b/source3/lib/avahi.c
@@ -207,6 +207,13 @@ static void avahi_timeout_update(AvahiTimeout *t, const 
struct timeval *tv)
 {
TALLOC_FREE(t->te);
 
+   if (tv == NULL) {
+   /*
+* Disable this timer
+*/
+   return;
+   }
+
t->te = tevent_add_timer(t->ctx->ev, t, *tv, avahi_timeout_handler, t);
/*
 * No failure mode defined here


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5168-g5730172

[Volker Lendecke]

The branch, v3-3-test has been updated
   via  57301725e1c92676d3dbb62c81a41507ed1adb7b (commit)
  from  efa7f6bff9bec89214dab368ff5efc61fa1cc212 (commit)

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


- Log -
commit 57301725e1c92676d3dbb62c81a41507ed1adb7b
Author: Volker Lendecke 
Date:   Thu Mar 26 10:13:50 2009 +0100

Avahi disables a timer by tv=NULL in avahi_timeout_update(), do not crash

---

Summary of changes:
 source/lib/avahi.c |7 +++
 1 files changed, 7 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/avahi.c b/source/lib/avahi.c
index bdc58cb..b30ef06 100644
--- a/source/lib/avahi.c
+++ b/source/lib/avahi.c
@@ -216,6 +216,13 @@ static void avahi_timeout_update(AvahiTimeout *t, const 
struct timeval *tv)
 {
TALLOC_FREE(t->te);
 
+   if (tv == NULL) {
+   /*
+* Disable this timer
+*/
+   return;
+   }
+
t->te = event_add_timed(t->ctx->ev, t, *tv, avahi_timeout_handler, t);
/*
 * No failure mode defined here


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-581-g1de41bb

[Günther Deschner]

The branch, v3-4-test has been updated
   via  1de41bb8d6b9cbf287bad4152e38402201f966d3 (commit)
  from  45726ee52f766350023d85bc38cd803fdd8235a4 (commit)

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


- Log -
commit 1de41bb8d6b9cbf287bad4152e38402201f966d3
Author: Günther Deschner 
Date:   Thu Mar 26 10:11:59 2009 +0100

s3-net: Fix Bug #6102. NetQueryDisplayInformation could return wrong 
information.

Guenther
(cherry picked from commit 24d5229a81e1067662930d42f8c59b3a0adac1e0)

---

Summary of changes:
 source3/lib/netapi/user.c |   18 --
 1 files changed, 12 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index e760a8b..1cbb883 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -1497,6 +1497,9 @@ WERROR NetQueryDisplayInformation_r(struct libnetapi_ctx 
*ctx,
 
NTSTATUS status = NT_STATUS_OK;
WERROR werr;
+   WERROR werr_tmp;
+
+   *r->out.entries_read = 0;
 
ZERO_STRUCT(connect_handle);
ZERO_STRUCT(domain_handle);
@@ -1540,15 +1543,18 @@ WERROR NetQueryDisplayInformation_r(struct 
libnetapi_ctx *ctx,
   &total_size,
   &returned_size,
   &info);
-   if (!NT_STATUS_IS_OK(status)) {
-   werr = ntstatus_to_werror(status);
+   werr = ntstatus_to_werror(status);
+   if (NT_STATUS_IS_ERR(status)) {
goto done;
}
 
-   werr = convert_samr_dispinfo_to_NET_DISPLAY(ctx, &info,
-   r->in.level,
-   r->out.entries_read,
-   r->out.buffer);
+   werr_tmp = convert_samr_dispinfo_to_NET_DISPLAY(ctx, &info,
+   r->in.level,
+   r->out.entries_read,
+   r->out.buffer);
+   if (!W_ERROR_IS_OK(werr_tmp)) {
+   werr = werr_tmp;
+   }
  done:
/* if last query */
if (NT_STATUS_IS_OK(status) ||


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-728-gfe340eb

[Günther Deschner]

The branch, master has been updated
   via  fe340eb92fd2e5dfef977dc391d2a43ce970e0ea (commit)
  from  24d5229a81e1067662930d42f8c59b3a0adac1e0 (commit)

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


- Log -
commit fe340eb92fd2e5dfef977dc391d2a43ce970e0ea
Author: Günther Deschner 
Date:   Wed Mar 25 23:23:06 2009 +0100

s3:rpc_parse: remove unused init_unistr().

Guenther

---

Summary of changes:
 source3/include/proto.h |1 -
 source3/rpc_parse/parse_misc.c  |   19 ---
 source3/utils/net_rpc_printer.c |9 -
 3 files changed, 4 insertions(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index d619c3b..77be0ab 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5695,7 +5695,6 @@ bool smb_io_system_time(const char *desc, prs_struct *ps, 
int depth, SYSTEMTIME
 bool make_systemtime(SYSTEMTIME *systime, struct tm *unixtime);
 bool smb_io_uuid(const char *desc, struct GUID *uuid, 
 prs_struct *ps, int depth);
-void init_unistr(UNISTR *str, const char *buf);
 void init_unistr2(UNISTR2 *str, const char *buf, enum unistr2_term_codes 
flags);
 
 /* The following definitions come from rpc_parse/parse_prs.c  */
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index ffbd67b..1ea4ecf 100644
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -129,25 +129,6 @@ bool smb_io_uuid(const char *desc, struct GUID *uuid,
 }
 
 /***
- Inits a UNISTR structure.
-/
-
-void init_unistr(UNISTR *str, const char *buf)
-{
-   size_t len;
-
-   if (buf == NULL) {
-   str->buffer = NULL;
-   return;
-   }
-
-   len = rpcstr_push_talloc(talloc_tos(), &str->buffer, buf);
-   if (len == (size_t)-1) {
-   str->buffer = NULL;
-   }
-}
-
-/***
  Inits a UNISTR2 structure.
 /
 
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 1d0e9a3..9721628 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -2260,14 +2260,13 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct 
net_context *c,
info_dst.info2.secdesc = NULL;
 
 #if 0
-   if (asprintf(&devicename, "%s\\%s", longname,
-printername) < 0) {
+   info_dst.info2.devmode.devicename =
+   talloc_asprintf(mem_ctx, "%s\\%s",
+   longname, printername);
+   if (!info_dst.info2.devmode.devicename) {
nt_status = NT_STATUS_NO_MEMORY;
goto done;
}
-
-   init_unistr(&ctr_dst.printers_2->devmode->devicename,
-   devicename);
 #endif
if (!net_spoolss_setprinter(pipe_hnd_dst, mem_ctx, 
&hnd_dst,
level, &info_dst))


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-729-g56d74b6

[Günther Deschner]

The branch, master has been updated
   via  56d74b62126083dd7e2a60d1b48b03e1b1798c90 (commit)
  from  fe340eb92fd2e5dfef977dc391d2a43ce970e0ea (commit)

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


- Log -
commit 56d74b62126083dd7e2a60d1b48b03e1b1798c90
Author: Günther Deschner 
Date:   Thu Mar 26 10:26:59 2009 +0100

s3-libnetapi: fix creds in libnetapi_open_ipc_connection().

Jeremy, this broke with 8dd1faaa2992851f6852ba7ea4498445af5faadd. Not sure 
if
other users broke as well with that change.

Guenther

---

Summary of changes:
 source3/lib/netapi/cm.c |5 +
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index b676ae6..d28b2b2 100644
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -57,6 +57,11 @@ static WERROR libnetapi_open_ipc_connection(struct 
libnetapi_ctx *ctx,
false, false,
PROTOCOL_NT1,
0, 0x20);
+   if (cli_ipc) {
+   cli_set_username(cli_ipc, ctx->username);
+   cli_set_password(cli_ipc, ctx->password);
+   cli_set_domain(cli_ipc, ctx->workgroup);
+   }
TALLOC_FREE(auth_info);
 
if (!cli_ipc) {


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-583-g97c30f5

[Günther Deschner]

The branch, v3-4-test has been updated
   via  97c30f557aab49f199df07f2a48ba94ad9cc81c5 (commit)
   via  0e845cd6009c8a01eb3d53f558e9872ec4a3ab9f (commit)
  from  1de41bb8d6b9cbf287bad4152e38402201f966d3 (commit)

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


- Log -
commit 97c30f557aab49f199df07f2a48ba94ad9cc81c5
Author: Günther Deschner 
Date:   Thu Mar 26 10:26:59 2009 +0100

s3-libnetapi: fix creds in libnetapi_open_ipc_connection().

Jeremy, this broke with 8dd1faaa2992851f6852ba7ea4498445af5faadd. Not sure 
if
other users broke as well with that change.

Guenther
(cherry picked from commit 56d74b62126083dd7e2a60d1b48b03e1b1798c90)

commit 0e845cd6009c8a01eb3d53f558e9872ec4a3ab9f
Author: Günther Deschner 
Date:   Wed Mar 25 23:23:06 2009 +0100

s3:rpc_parse: remove unused init_unistr().

Guenther
(cherry picked from commit fe340eb92fd2e5dfef977dc391d2a43ce970e0ea)

---

Summary of changes:
 source3/include/proto.h |1 -
 source3/lib/netapi/cm.c |5 +
 source3/rpc_parse/parse_misc.c  |   19 ---
 source3/utils/net_rpc_printer.c |9 -
 4 files changed, 9 insertions(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index bb5e472..44c6e0f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5684,7 +5684,6 @@ bool smb_io_system_time(const char *desc, prs_struct *ps, 
int depth, SYSTEMTIME
 bool make_systemtime(SYSTEMTIME *systime, struct tm *unixtime);
 bool smb_io_uuid(const char *desc, struct GUID *uuid, 
 prs_struct *ps, int depth);
-void init_unistr(UNISTR *str, const char *buf);
 void init_unistr2(UNISTR2 *str, const char *buf, enum unistr2_term_codes 
flags);
 
 /* The following definitions come from rpc_parse/parse_prs.c  */
diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index b676ae6..d28b2b2 100644
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -57,6 +57,11 @@ static WERROR libnetapi_open_ipc_connection(struct 
libnetapi_ctx *ctx,
false, false,
PROTOCOL_NT1,
0, 0x20);
+   if (cli_ipc) {
+   cli_set_username(cli_ipc, ctx->username);
+   cli_set_password(cli_ipc, ctx->password);
+   cli_set_domain(cli_ipc, ctx->workgroup);
+   }
TALLOC_FREE(auth_info);
 
if (!cli_ipc) {
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index ffbd67b..1ea4ecf 100644
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -129,25 +129,6 @@ bool smb_io_uuid(const char *desc, struct GUID *uuid,
 }
 
 /***
- Inits a UNISTR structure.
-/
-
-void init_unistr(UNISTR *str, const char *buf)
-{
-   size_t len;
-
-   if (buf == NULL) {
-   str->buffer = NULL;
-   return;
-   }
-
-   len = rpcstr_push_talloc(talloc_tos(), &str->buffer, buf);
-   if (len == (size_t)-1) {
-   str->buffer = NULL;
-   }
-}
-
-/***
  Inits a UNISTR2 structure.
 /
 
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 1d0e9a3..9721628 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -2260,14 +2260,13 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct 
net_context *c,
info_dst.info2.secdesc = NULL;
 
 #if 0
-   if (asprintf(&devicename, "%s\\%s", longname,
-printername) < 0) {
+   info_dst.info2.devmode.devicename =
+   talloc_asprintf(mem_ctx, "%s\\%s",
+   longname, printername);
+   if (!info_dst.info2.devmode.devicename) {
nt_status = NT_STATUS_NO_MEMORY;
goto done;
}
-
-   init_unistr(&ctr_dst.printers_2->devmode->devicename,
-   devicename);
 #endif
if (!net_spoolss_setprinter(pipe_hnd_dst, mem_ctx, 
&hnd_dst,
level, &info_dst))


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5169-gfe102f5

[Günther Deschner]

The branch, v3-3-test has been updated
   via  fe102f53d1ac6f888bd559eaf52b6a166d5f78d3 (commit)
  from  57301725e1c92676d3dbb62c81a41507ed1adb7b (commit)

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


- Log -
commit fe102f53d1ac6f888bd559eaf52b6a166d5f78d3
Author: Günther Deschner 
Date:   Thu Mar 26 10:35:55 2009 +0100

s3-net: Fix Bug #6102. NetQueryDisplayInformation could return wrong 
information.

Guenther

---

Summary of changes:
 source/lib/netapi/user.c |   18 --
 1 files changed, 12 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/netapi/user.c b/source/lib/netapi/user.c
index 84d32dc..2c78f6f 100644
--- a/source/lib/netapi/user.c
+++ b/source/lib/netapi/user.c
@@ -1510,6 +1510,9 @@ WERROR NetQueryDisplayInformation_r(struct libnetapi_ctx 
*ctx,
 
NTSTATUS status = NT_STATUS_OK;
WERROR werr;
+   WERROR werr_tmp;
+
+   *r->out.entries_read = 0;
 
ZERO_STRUCT(connect_handle);
ZERO_STRUCT(domain_handle);
@@ -1554,15 +1557,18 @@ WERROR NetQueryDisplayInformation_r(struct 
libnetapi_ctx *ctx,
   &total_size,
   &returned_size,
   &info);
-   if (!NT_STATUS_IS_OK(status)) {
-   werr = ntstatus_to_werror(status);
+   werr = ntstatus_to_werror(status);
+   if (NT_STATUS_IS_ERR(status)) {
goto done;
}
 
-   werr = convert_samr_dispinfo_to_NET_DISPLAY(ctx, &info,
-   r->in.level,
-   r->out.entries_read,
-   r->out.buffer);
+   werr_tmp = convert_samr_dispinfo_to_NET_DISPLAY(ctx, &info,
+   r->in.level,
+   r->out.entries_read,
+   r->out.buffer);
+   if (!W_ERROR_IS_OK(werr_tmp)) {
+   werr = werr_tmp;
+   }
  done:
if (!cli) {
return werr;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-727-g24d5229

[Günther Deschner]

The branch, master has been updated
   via  24d5229a81e1067662930d42f8c59b3a0adac1e0 (commit)
  from  a20a710c944055932402ec5dfe3a36ac3d654cbf (commit)

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


- Log -
commit 24d5229a81e1067662930d42f8c59b3a0adac1e0
Author: Günther Deschner 
Date:   Thu Mar 26 10:11:59 2009 +0100

s3-net: Fix Bug #6102. NetQueryDisplayInformation could return wrong 
information.

Guenther

---

Summary of changes:
 source3/lib/netapi/user.c |   18 --
 1 files changed, 12 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index e760a8b..1cbb883 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -1497,6 +1497,9 @@ WERROR NetQueryDisplayInformation_r(struct libnetapi_ctx 
*ctx,
 
NTSTATUS status = NT_STATUS_OK;
WERROR werr;
+   WERROR werr_tmp;
+
+   *r->out.entries_read = 0;
 
ZERO_STRUCT(connect_handle);
ZERO_STRUCT(domain_handle);
@@ -1540,15 +1543,18 @@ WERROR NetQueryDisplayInformation_r(struct 
libnetapi_ctx *ctx,
   &total_size,
   &returned_size,
   &info);
-   if (!NT_STATUS_IS_OK(status)) {
-   werr = ntstatus_to_werror(status);
+   werr = ntstatus_to_werror(status);
+   if (NT_STATUS_IS_ERR(status)) {
goto done;
}
 
-   werr = convert_samr_dispinfo_to_NET_DISPLAY(ctx, &info,
-   r->in.level,
-   r->out.entries_read,
-   r->out.buffer);
+   werr_tmp = convert_samr_dispinfo_to_NET_DISPLAY(ctx, &info,
+   r->in.level,
+   r->out.entries_read,
+   r->out.buffer);
+   if (!W_ERROR_IS_OK(werr_tmp)) {
+   werr = werr_tmp;
+   }
  done:
/* if last query */
if (NT_STATUS_IS_OK(status) ||


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3521-g490ed83

[Günther Deschner]

The branch, v3-2-test has been updated
   via  490ed838f2626893bb623ea6ad8d79595c8c44c4 (commit)
  from  1a1823c357fb8e01ac0e8c8749e6f5004bf3cf3e (commit)

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


- Log -
commit 490ed838f2626893bb623ea6ad8d79595c8c44c4
Author: Günther Deschner 
Date:   Thu Mar 26 10:41:11 2009 +0100

s3-net: Fix Bug #6102. NetQueryDisplayInformation could return wrong 
information.

Guenther

---

Summary of changes:
 source/lib/netapi/user.c |   18 --
 1 files changed, 12 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/netapi/user.c b/source/lib/netapi/user.c
index 05a0510..b31d838 100644
--- a/source/lib/netapi/user.c
+++ b/source/lib/netapi/user.c
@@ -899,6 +899,9 @@ WERROR NetQueryDisplayInformation_r(struct libnetapi_ctx 
*ctx,
 
NTSTATUS status;
WERROR werr;
+   WERROR werr_tmp;
+
+   *r->out.entries_read = 0;
 
ZERO_STRUCT(connect_handle);
ZERO_STRUCT(domain_handle);
@@ -992,15 +995,18 @@ WERROR NetQueryDisplayInformation_r(struct libnetapi_ctx 
*ctx,
   &total_size,
   &returned_size,
   &info);
-   if (!NT_STATUS_IS_OK(status)) {
-   werr = ntstatus_to_werror(status);
+   werr = ntstatus_to_werror(status);
+   if (NT_STATUS_IS_ERR(status)) {
goto done;
}
 
-   werr = convert_samr_dispinfo_to_NET_DISPLAY(ctx, &info,
-   r->in.level,
-   r->out.entries_read,
-   r->out.buffer);
+   werr_tmp = convert_samr_dispinfo_to_NET_DISPLAY(ctx, &info,
+   r->in.level,
+   r->out.entries_read,
+   r->out.buffer);
+   if (!W_ERROR_IS_OK(werr_tmp)) {
+   werr = werr_tmp;
+   }
  done:
if (!cli) {
return werr;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-731-g7eb7f42

[Andrew Tridgell]

The branch, master has been updated
   via  7eb7f423d048e869a19d560ab0d1ba3b51b62fa9 (commit)
   via  3f37342bc0e7c26b6a61490706fe8cec3e6d491e (commit)
  from  56d74b62126083dd7e2a60d1b48b03e1b1798c90 (commit)

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


- Log -
commit 7eb7f423d048e869a19d560ab0d1ba3b51b62fa9
Merge: 3f37342bc0e7c26b6a61490706fe8cec3e6d491e 
56d74b62126083dd7e2a60d1b48b03e1b1798c90
Author: Andrew Tridgell 
Date:   Thu Mar 26 22:10:32 2009 +1100

Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit 3f37342bc0e7c26b6a61490706fe8cec3e6d491e
Author: Andrew Tridgell 
Date:   Thu Mar 26 22:10:02 2009 +1100

fixed possibleinferiors.py so it matches windows behaviour

This test code builds the possibleInferiors for every class in the
schema on a target machine, and compares it to the servers
possibleInferiors attribute.

The MS-ADTS spec describes how to calculate possibleInferiors for a
object, but it seems to have some bugs. The spec says that we need to
use AUXCLASSES, and it does not mention the use of the SUBCLASS
tree. In trying to match windows behaviour, I found that I needed to
ignore the AUXCLASSES and build a SUBCLASSES tree.

---

Summary of changes:
 .../samdb/ldb_modules/tests/possibleinferiors.py   |  166 +++-
 1 files changed, 127 insertions(+), 39 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py 
b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
index 0e74456..ec426c0 100755
--- a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
+++ b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
@@ -71,7 +71,7 @@ schema_base = rootDse["schemaNamingContext"][0]
 def possible_inferiors_search(db, oc):
 """return the possible inferiors via a search for the possibleInferiors 
attribute"""
 res = db.search(base=schema_base,
-expression=("ldapdisplayname=%s" % oc),
+expression=("ldapDisplayName=%s" % oc),
 attrs=["possibleInferiors"])
 
 poss=[]
@@ -86,47 +86,137 @@ def possible_inferiors_search(db, oc):
 
 
 # see [MS-ADTS] section 3.1.1.4.5.21
-# for this algorithm
+# and section 3.1.1.4.2 for this algorithm
 
 # !systemOnly=TRUE
 # !objectClassCategory=2
 # !objectClassCategory=3
 
-def POSSINFERIORS(db, oc):
-"""returns a list of possible inferiors to a class. Returned list has the 
ldapdisplayname, systemOnly and objectClassCategory for each element"""
-expanded = [oc]
-res = db.search(base=schema_base,
-expression=("subclassof=%s" % 
str(oc["ldapdisplayname"][0])),
-attrs=["ldapdisplayname", "systemOnly", 
"objectClassCategory"])
+def SUPCLASSES(classinfo, oc):
+list = []
+if oc == "top":
+return list
+if classinfo[oc].get("SUPCLASSES") is not None:
+return classinfo[oc]["SUPCLASSES"]
+res = classinfo[oc]["subClassOf"];
 for r in res:
-expanded.extend(POSSINFERIORS(db,r))
-return expanded
+list.append(r)
+list.extend(SUPCLASSES(classinfo,r))
+classinfo[oc]["SUPCLASSES"] = list
+return list
 
-def possible_inferiors_constructed(db, oc):
-"""return the possbible inferiors via a recursive search and match"""
-res = db.search(base=schema_base,
-
expression=("(&(objectclass=classSchema)(|(posssuperiors=%s)(systemposssuperiors=%s)))"
 % (oc,oc)),
-attrs=["ldapdisplayname", "systemOnly", 
"objectClassCategory"])
+def AUXCLASSES(classinfo, oclist):
+list = []
+if oclist == []:
+return list
+for oc in oclist:
+if classinfo[oc].get("AUXCLASSES") is not None:
+list.extend(classinfo[oc]["AUXCLASSES"])
+else:
+list2 = []
+list2.extend(classinfo[oc]["systemAuxiliaryClass"])
+list2.extend(AUXCLASSES(classinfo, 
classinfo[oc]["systemAuxiliaryClass"]))
+list2.extend(classinfo[oc]["auxiliaryClass"])
+list2.extend(AUXCLASSES(classinfo, 
classinfo[oc]["auxiliaryClass"]))
+list2.extend(AUXCLASSES(classinfo, SUPCLASSES(classinfo, oc)))
+classinfo[oc]["AUXCLASSES"] = list2
+list.extend(list2)
+return list
 
-poss = []
+def SUBCLASSES(classinfo, oclist):
+list = []
+for oc in oclist:
+list.extend(classinfo[oc]["SUBCLASSES"])
+return list
+
+def POSSSUPERIORS(classinfo, oclist):
+list = []
+for oc in oclist:
+if classinfo[oc].get("POSSSUPERIORS") is not None:
+list.extend(classinfo[oc]["POSSSUPERIORS"])
+else:
+list2 = []
+list2.extend(classinfo[oc]["systemPossSuperiors"])
+list2.extend(classinfo[oc]["possSup

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-732-gc164c0c

[Volker Lendecke]

The branch, master has been updated
   via  c164c0c20ac0420878a9f7aba6503d3deb8e53d5 (commit)
  from  7eb7f423d048e869a19d560ab0d1ba3b51b62fa9 (commit)

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


- Log -
commit c164c0c20ac0420878a9f7aba6503d3deb8e53d5
Author: Volker Lendecke 
Date:   Thu Mar 26 12:24:50 2009 +0100

Fix a scary "fill_share_mode_lock failed" message

To me "fill_share_mode_lock failed" is a "can't happen" alert. There is
however a perfectly valid case in get_file_infos() when the file is not 
open.

Change the corresponding debug message to level 10 and explain more.

---

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


Changeset truncated at 500 lines:

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index bafb895..7084122 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -887,7 +887,8 @@ struct share_mode_lock 
*fetch_share_mode_unlocked(TALLOC_CTX *mem_ctx,
}
 
if (!fill_share_mode_lock(lck, id, servicepath, fname, data, NULL)) {
-   DEBUG(3, ("fill_share_mode_lock failed\n"));
+   DEBUG(10, ("fetch_share_mode_unlocked: no share_mode record "
+  "around (file not open)\n"));
TALLOC_FREE(lck);
return NULL;
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-584-g66ea221

[Volker Lendecke]

The branch, v3-4-test has been updated
   via  66ea221009d9d72868a989c33d48177accc9d924 (commit)
  from  97c30f557aab49f199df07f2a48ba94ad9cc81c5 (commit)

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


- Log -
commit 66ea221009d9d72868a989c33d48177accc9d924
Author: Volker Lendecke 
Date:   Thu Mar 26 12:24:50 2009 +0100

Fix a scary "fill_share_mode_lock failed" message

To me "fill_share_mode_lock failed" is a "can't happen" alert. There is
however a perfectly valid case in get_file_infos() when the file is not 
open.

Change the corresponding debug message to level 10 and explain more.

---

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


Changeset truncated at 500 lines:

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index bafb895..7084122 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -887,7 +887,8 @@ struct share_mode_lock 
*fetch_share_mode_unlocked(TALLOC_CTX *mem_ctx,
}
 
if (!fill_share_mode_lock(lck, id, servicepath, fname, data, NULL)) {
-   DEBUG(3, ("fill_share_mode_lock failed\n"));
+   DEBUG(10, ("fetch_share_mode_unlocked: no share_mode record "
+  "around (file not open)\n"));
TALLOC_FREE(lck);
return NULL;
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5170-g74efc72

[Volker Lendecke]

The branch, v3-3-test has been updated
   via  74efc72bca5707ff35df9282c843d62c4cf331c3 (commit)
  from  fe102f53d1ac6f888bd559eaf52b6a166d5f78d3 (commit)

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


- Log -
commit 74efc72bca5707ff35df9282c843d62c4cf331c3
Author: Volker Lendecke 
Date:   Thu Mar 26 12:24:50 2009 +0100

Fix a scary "fill_share_mode_lock failed" message

To me "fill_share_mode_lock failed" is a "can't happen" alert. There is
however a perfectly valid case in get_file_infos() when the file is not 
open.

Change the corresponding debug message to level 10 and explain more.

---

Summary of changes:
 source/locking/locking.c |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/locking/locking.c b/source/locking/locking.c
index 9bd5361..41fe1c9 100644
--- a/source/locking/locking.c
+++ b/source/locking/locking.c
@@ -854,7 +854,8 @@ struct share_mode_lock 
*fetch_share_mode_unlocked(TALLOC_CTX *mem_ctx,
}
 
if (!fill_share_mode_lock(lck, id, servicepath, fname, data, NULL)) {
-   DEBUG(3, ("fill_share_mode_lock failed\n"));
+   DEBUG(10, ("fetch_share_mode_unlocked: no share_mode record "
+  "around (file not open)\n"));
TALLOC_FREE(lck);
return NULL;
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3522-gf73d4cf

[Volker Lendecke]

The branch, v3-2-test has been updated
   via  f73d4cf1fcfd8f9e2543a222faed133472fd890c (commit)
  from  490ed838f2626893bb623ea6ad8d79595c8c44c4 (commit)

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


- Log -
commit f73d4cf1fcfd8f9e2543a222faed133472fd890c
Author: Volker Lendecke 
Date:   Thu Mar 26 12:24:50 2009 +0100

Fix a scary "fill_share_mode_lock failed" message

To me "fill_share_mode_lock failed" is a "can't happen" alert. There is
however a perfectly valid case in get_file_infos() when the file is not 
open.

Change the corresponding debug message to level 10 and explain more.

---

Summary of changes:
 source/locking/locking.c |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/locking/locking.c b/source/locking/locking.c
index eebf870..b8cd29f 100644
--- a/source/locking/locking.c
+++ b/source/locking/locking.c
@@ -854,7 +854,8 @@ struct share_mode_lock 
*fetch_share_mode_unlocked(TALLOC_CTX *mem_ctx,
}
 
if (!fill_share_mode_lock(lck, id, servicepath, fname, data, NULL)) {
-   DEBUG(3, ("fill_share_mode_lock failed\n"));
+   DEBUG(10, ("fetch_share_mode_unlocked: no share_mode record "
+  "around (file not open)\n"));
TALLOC_FREE(lck);
return NULL;
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-733-g5603c0f

[Günther Deschner]

The branch, master has been updated
   via  5603c0f2ba9d5b90e5f8b71e779ec037053f04f8 (commit)
  from  c164c0c20ac0420878a9f7aba6503d3deb8e53d5 (commit)

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


- Log -
commit 5603c0f2ba9d5b90e5f8b71e779ec037053f04f8
Author: Günther Deschner 
Date:   Thu Mar 26 14:51:04 2009 +0100

error-codes: add WERR_DS_DRA_SOURCE_DISABLED.

Guenther

---

Summary of changes:
 libcli/util/doserr.c |1 +
 libcli/util/werror.h |1 +
 2 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index 5104c3e..1a7422e 100644
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -124,6 +124,7 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_DS_DRA_DB_ERROR", WERR_DS_DRA_DB_ERROR },
{ "WERR_DS_DRA_NO_REPLICA", WERR_DS_DRA_NO_REPLICA },
{ "WERR_DS_DRA_ACCESS_DENIED", WERR_DS_DRA_ACCESS_DENIED },
+   { "WERR_DS_DRA_SOURCE_DISABLED", WERR_DS_DRA_SOURCE_DISABLED },
{ "WERR_DS_DNS_LOOKUP_FAILURE", WERR_DS_DNS_LOOKUP_FAILURE },
{ "WERR_DS_WRONG_LINKED_ATTRIBUTE_SYNTAX", 
WERR_DS_WRONG_LINKED_ATTRIBUTE_SYNTAX },
{ "WERR_DS_NO_MSDS_INTID", WERR_DS_NO_MSDS_INTID },
diff --git a/libcli/util/werror.h b/libcli/util/werror.h
index d922327..a69587f 100644
--- a/libcli/util/werror.h
+++ b/libcli/util/werror.h
@@ -248,6 +248,7 @@ typedef uint32_t WERROR;
 #define WERR_DS_DRA_DB_ERROR W_ERROR(0x2103)
 #define WERR_DS_DRA_NO_REPLICA W_ERROR(0x2104)
 #define WERR_DS_DRA_ACCESS_DENIED W_ERROR(0x2105)
+#define WERR_DS_DRA_SOURCE_DISABLED W_ERROR(0x2108)
 #define WERR_DS_DNS_LOOKUP_FAILURE W_ERROR(0x214c)
 #define WERR_DS_WRONG_LINKED_ATTRIBUTE_SYNTAX W_ERROR(0x2150)
 #define WERR_DS_NO_MSDS_INTID W_ERROR(0x2194)


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-585-ga7c80bb

[Günther Deschner]

The branch, v3-4-test has been updated
   via  a7c80bb70e0153568bc26c0dac044458d47dae0a (commit)
  from  66ea221009d9d72868a989c33d48177accc9d924 (commit)

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


- Log -
commit a7c80bb70e0153568bc26c0dac044458d47dae0a
Author: Günther Deschner 
Date:   Thu Mar 26 14:51:04 2009 +0100

error-codes: add WERR_DS_DRA_SOURCE_DISABLED.

Guenther
(cherry picked from commit 5603c0f2ba9d5b90e5f8b71e779ec037053f04f8)

---

Summary of changes:
 libcli/util/doserr.c |1 +
 libcli/util/werror.h |1 +
 2 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index 5104c3e..1a7422e 100644
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -124,6 +124,7 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_DS_DRA_DB_ERROR", WERR_DS_DRA_DB_ERROR },
{ "WERR_DS_DRA_NO_REPLICA", WERR_DS_DRA_NO_REPLICA },
{ "WERR_DS_DRA_ACCESS_DENIED", WERR_DS_DRA_ACCESS_DENIED },
+   { "WERR_DS_DRA_SOURCE_DISABLED", WERR_DS_DRA_SOURCE_DISABLED },
{ "WERR_DS_DNS_LOOKUP_FAILURE", WERR_DS_DNS_LOOKUP_FAILURE },
{ "WERR_DS_WRONG_LINKED_ATTRIBUTE_SYNTAX", 
WERR_DS_WRONG_LINKED_ATTRIBUTE_SYNTAX },
{ "WERR_DS_NO_MSDS_INTID", WERR_DS_NO_MSDS_INTID },
diff --git a/libcli/util/werror.h b/libcli/util/werror.h
index d922327..a69587f 100644
--- a/libcli/util/werror.h
+++ b/libcli/util/werror.h
@@ -248,6 +248,7 @@ typedef uint32_t WERROR;
 #define WERR_DS_DRA_DB_ERROR W_ERROR(0x2103)
 #define WERR_DS_DRA_NO_REPLICA W_ERROR(0x2104)
 #define WERR_DS_DRA_ACCESS_DENIED W_ERROR(0x2105)
+#define WERR_DS_DRA_SOURCE_DISABLED W_ERROR(0x2108)
 #define WERR_DS_DNS_LOOKUP_FAILURE W_ERROR(0x214c)
 #define WERR_DS_WRONG_LINKED_ATTRIBUTE_SYNTAX W_ERROR(0x2150)
 #define WERR_DS_NO_MSDS_INTID W_ERROR(0x2194)


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-734-g2d087a0

[Volker Lendecke]

The branch, master has been updated
   via  2d087a0c156dc95086a39e297b24ef6889e1a50d (commit)
  from  5603c0f2ba9d5b90e5f8b71e779ec037053f04f8 (commit)

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


- Log -
commit 2d087a0c156dc95086a39e297b24ef6889e1a50d
Author: Volker Lendecke 
Date:   Thu Mar 26 14:54:18 2009 +0100

Fix a talloc/malloc screwup in file_lines_pload

Another bug due to careless merge to /lib :-(((

Volker

---

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


Changeset truncated at 500 lines:

diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c
index c5a9b7c..50ff844 100644
--- a/source3/lib/util_file.c
+++ b/source3/lib/util_file.c
@@ -39,7 +39,7 @@ static char *file_pload(const char *syscmd, size_t *size)
total = 0;
 
while ((n = read(fd, buf, sizeof(buf))) > 0) {
-   p = (char *)SMB_REALLOC(p, total + n + 1);
+   p = talloc_realloc(NULL, p, char, total + n + 1);
if (!p) {
DEBUG(0,("file_pload: failed to expand buffer!\n"));
close(fd);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-586-gc253e80

[Volker Lendecke]

The branch, v3-4-test has been updated
   via  c253e80ad21a24395a973b23993dd211b8e0d482 (commit)
  from  a7c80bb70e0153568bc26c0dac044458d47dae0a (commit)

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


- Log -
commit c253e80ad21a24395a973b23993dd211b8e0d482
Author: Volker Lendecke 
Date:   Thu Mar 26 14:54:18 2009 +0100

Fix a talloc/malloc screwup in file_lines_pload

Another bug due to careless merge to /lib :-(((

Volker

---

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


Changeset truncated at 500 lines:

diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c
index c5a9b7c..50ff844 100644
--- a/source3/lib/util_file.c
+++ b/source3/lib/util_file.c
@@ -39,7 +39,7 @@ static char *file_pload(const char *syscmd, size_t *size)
total = 0;
 
while ((n = read(fd, buf, sizeof(buf))) > 0) {
-   p = (char *)SMB_REALLOC(p, total + n + 1);
+   p = talloc_realloc(NULL, p, char, total + n + 1);
if (!p) {
DEBUG(0,("file_pload: failed to expand buffer!\n"));
close(fd);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-739-g853f928

[Stefan Metzmacher]

The branch, master has been updated
   via  853f9283fb8fbcd2078e3cf8e99d6c8e24d77346 (commit)
   via  510e37155eab8b4bf29adcf10f242334bfedca46 (commit)
   via  9521801dc89a425a2d1e58d0cf7ca24e83b02a04 (commit)
   via  4d9641793124954e5994e64e9ce810f8f76e0449 (commit)
   via  8a264753a1f80defe5335c334f8242ad46d2af9f (commit)
  from  2d087a0c156dc95086a39e297b24ef6889e1a50d (commit)

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


- Log -
commit 853f9283fb8fbcd2078e3cf8e99d6c8e24d77346
Author: Stefan Metzmacher 
Date:   Wed Mar 25 11:22:01 2009 +0100

s4:heimdal_build: provide heimdal_version and heimdal_long_version symbols

metze

commit 510e37155eab8b4bf29adcf10f242334bfedca46
Author: Stefan Metzmacher 
Date:   Wed Mar 25 11:20:50 2009 +0100

s4:heimdal_build: define HAVE_STRLCPY, HAVE_STRLCAT, HAVE_STRCASECMP and 
HAVE_MKSTEMP

metze

commit 9521801dc89a425a2d1e58d0cf7ca24e83b02a04
Author: Stefan Metzmacher 
Date:   Wed Mar 25 12:21:59 2009 +0100

s4:kdc: use krb5_data_free()

metze

commit 4d9641793124954e5994e64e9ce810f8f76e0449
Author: Stefan Metzmacher 
Date:   Wed Mar 25 12:21:36 2009 +0100

s4:auth/credentials: use krb5_data_free()

metze

commit 8a264753a1f80defe5335c334f8242ad46d2af9f
Author: Stefan Metzmacher 
Date:   Wed Mar 25 11:17:17 2009 +0100

s4:auth/credentials: include gssapi/gssapi_krb5.h

metze

---

Summary of changes:
 source4/auth/credentials/credentials_krb5.h |1 +
 source4/auth/kerberos/clikrb5.c |6 +-
 source4/heimdal_build/replace.c |4 
 source4/heimdal_build/roken.h   |   19 +++
 source4/kdc/kdc.c   |2 +-
 5 files changed, 26 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/auth/credentials/credentials_krb5.h 
b/source4/auth/credentials/credentials_krb5.h
index 0d0e9f3..5e56752 100644
--- a/source4/auth/credentials/credentials_krb5.h
+++ b/source4/auth/credentials/credentials_krb5.h
@@ -24,6 +24,7 @@
 #define __CREDENTIALS_KRB5_H__
 
 #include 
+#include 
 #include 
 
 struct gssapi_creds_container {
diff --git a/source4/auth/kerberos/clikrb5.c b/source4/auth/kerberos/clikrb5.c
index cf87d13..68e7eb9 100644
--- a/source4/auth/kerberos/clikrb5.c
+++ b/source4/auth/kerberos/clikrb5.c
@@ -74,13 +74,9 @@
 
  void kerberos_free_data_contents(krb5_context context, krb5_data *pdata)
 {
-#if defined(HAVE_KRB5_FREE_DATA_CONTENTS)
if (pdata->data) {
-   krb5_free_data_contents(context, pdata);
+   krb5_data_free(pdata);
}
-#else
-   SAFE_FREE(pdata->data);
-#endif
 }
 
  krb5_error_code smb_krb5_kt_free_entry(krb5_context context, 
krb5_keytab_entry *kt_entry)
diff --git a/source4/heimdal_build/replace.c b/source4/heimdal_build/replace.c
index 41309fe..ba43dd9 100644
--- a/source4/heimdal_build/replace.c
+++ b/source4/heimdal_build/replace.c
@@ -84,3 +84,7 @@
return -1;
 }
 #endif
+
+const char *heimdal_version = "samba-internal-heimdal";
+const char *heimdal_long_version = "samba-interal-heimdal";
+
diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h
index 3edeb2f..e3edd53 100644
--- a/source4/heimdal_build/roken.h
+++ b/source4/heimdal_build/roken.h
@@ -41,6 +41,22 @@
 #define HAVE_STRNDUP
 #endif
 
+#ifndef HAVE_STRLCPY
+#define HAVE_STRLCPY
+#endif
+
+#ifndef HAVE_STRLCAT
+#define HAVE_STRLCAT
+#endif
+
+#ifndef HAVE_STRCASECMP
+#define HAVE_STRCASECMP
+#endif
+
+#ifndef HAVE_MKSTEMP
+#define HAVE_MKSTEMP
+#endif
+
 #ifndef HAVE_SETENV
 #define HAVE_SETENV
 #endif
@@ -84,4 +100,7 @@
 #undef SOCKET_WRAPPER_REPLACE
 #include "heimdal/lib/roken/roken.h.in"
 
+extern const char *heimdal_version;
+extern const char *heimdal_long_version;
+
 #endif
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 1cfe985..3d11441 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -345,7 +345,7 @@ static bool kdc_process(struct kdc_server *kdc,
}
if (k5_reply.length) {
*reply = data_blob_talloc(mem_ctx, k5_reply.data, 
k5_reply.length);
-   krb5_free_data_contents(kdc->smb_krb5_context->krb5_context, 
&k5_reply);
+   krb5_data_free(&k5_reply);
} else {
*reply = data_blob(NULL, 0);
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-750-g494e471

[Jelmer Vernooij]

The branch, master has been updated
   via  494e471d747c1e858481fad16cb33574d3e7f985 (commit)
   via  50189e81d04edd313f707fc3bb7f18e46389e9e6 (commit)
   via  ef10b40338a98f1700b1a8d24a445715d846a5a6 (commit)
   via  1e200c1952adab450909ac35252be4636c3e1053 (commit)
   via  30a3dec549dc408940710409c80276077b4d9701 (commit)
   via  c42fc5e103d9d210c2f370e237a952e6df361792 (commit)
   via  9a61758c1e3b3893fda1aca5dae291d86cec82e3 (commit)
   via  ea907a7144beb29cb5c823851a98ceac8166994b (commit)
   via  ca202cf464aec82e63be4b2160f394f56b8c195e (commit)
   via  44787565715f0622cc1d049854427d735ca1c14b (commit)
   via  e548ec9c24d7f05fea81910b8c7cf3fc0bd137db (commit)
  from  853f9283fb8fbcd2078e3cf8e99d6c8e24d77346 (commit)

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


- Log -
commit 494e471d747c1e858481fad16cb33574d3e7f985
Author: Jelmer Vernooij 
Date:   Thu Mar 26 16:28:45 2009 +0100

configure: Use m4 defines for minimum library versions rather than shell
variables, so the values rather than the variable names show up in
configure output.

commit 50189e81d04edd313f707fc3bb7f18e46389e9e6
Merge: ef10b40338a98f1700b1a8d24a445715d846a5a6 
ea907a7144beb29cb5c823851a98ceac8166994b
Author: Jelmer Vernooij 
Date:   Thu Mar 26 15:31:35 2009 +0100

Merge branch 'copyright' of /home/jelmer/samba4

commit ef10b40338a98f1700b1a8d24a445715d846a5a6
Merge: 1e200c1952adab450909ac35252be4636c3e1053 
30a3dec549dc408940710409c80276077b4d9701
Author: Jelmer Vernooij 
Date:   Thu Mar 26 15:31:27 2009 +0100

Merge branch 'displaysec' of /home/jelmer/samba4

commit 1e200c1952adab450909ac35252be4636c3e1053
Merge: ca202cf464aec82e63be4b2160f394f56b8c195e 
853f9283fb8fbcd2078e3cf8e99d6c8e24d77346
Author: Jelmer Vernooij 
Date:   Thu Mar 26 15:31:02 2009 +0100

Merge branch 'master' of git://git.samba.org/samba

commit 30a3dec549dc408940710409c80276077b4d9701
Merge: c42fc5e103d9d210c2f370e237a952e6df361792 
853f9283fb8fbcd2078e3cf8e99d6c8e24d77346
Author: Jelmer Vernooij 
Date:   Thu Mar 26 15:28:18 2009 +0100

Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec

commit c42fc5e103d9d210c2f370e237a952e6df361792
Author: Jelmer Vernooij 
Date:   Wed Mar 25 21:29:13 2009 +0100

display_sec: Move to common libcli/security directory.

commit 9a61758c1e3b3893fda1aca5dae291d86cec82e3
Merge: ca202cf464aec82e63be4b2160f394f56b8c195e 
365b5cfcbeb041ce84718717f30ac02183c9af7f
Author: Jelmer Vernooij 
Date:   Wed Mar 25 20:51:29 2009 +0100

Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec

commit ea907a7144beb29cb5c823851a98ceac8166994b
Author: Jelmer Vernooij 
Date:   Wed Mar 25 15:40:39 2009 +0100

selftest: Add copyright headers

commit ca202cf464aec82e63be4b2160f394f56b8c195e
Merge: 44787565715f0622cc1d049854427d735ca1c14b 
2de464a7658f91d2d01087080b984d52c3483426
Author: Jelmer Vernooij 
Date:   Fri Mar 20 16:40:09 2009 +0100

Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec

commit 44787565715f0622cc1d049854427d735ca1c14b
Author: Jelmer Vernooij 
Date:   Sun Mar 15 18:10:20 2009 +0100

Strip /usr/include from include flags, so we don't end up including
the system tevent if it's too old.

commit e548ec9c24d7f05fea81910b8c7cf3fc0bd137db
Author: Jelmer Vernooij 
Date:   Sun Mar 15 17:14:25 2009 +0100

display_sec: Remove use of samba3-specific data types.

---

Summary of changes:
 lib/util/fault.m4  |2 +
 libcli/security/config.mk  |2 +-
 {source3/lib => libcli/security}/display_sec.c |   91 +---
 selftest/SocketWrapper.pm  |   16 -
 selftest/Subunit.pm|   16 
 selftest/output/buildfarm.pm   |   15 
 selftest/output/html.pm|   16 -
 selftest/output/plain.pm   |   14 
 selftest/selftest.pl   |   14 -
 source3/Makefile.in|2 +-
 source3/samba4.m4  |8 +-
 source4/auth/config.m4 |2 +
 source4/build/m4/public.m4 |4 +-
 source4/configure.ac   |6 +-
 source4/libcli/security/config.mk  |2 -
 source4/min_versions.m4|8 +-
 16 files changed, 156 insertions(+), 62 deletions(-)
 rename {source3/lib => libcli/security}/display_sec.c (80%)


Changeset truncated at 500 lines:

diff --git a/lib/util/fault.m4 b/lib/util/fault.m4
index bac553a..c229769 100644
--- a/lib/util/fault.m4
+++ b/lib/util/fault.m4
@@ -9,6 +9,8 @@ if test x"$ac_cv_header_execinfo_h" = x"yes" -a 
x"$ac_cv_func_ext_backtrace" = x
EXECINFO_CPPFLAG

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5171-ge452955

[Jeremy Allison]

The branch, v3-3-test has been updated
   via  e452955c077a761cbadd27bede8d6844edbb2e5e (commit)
  from  74efc72bca5707ff35df9282c843d62c4cf331c3 (commit)

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


- Log -
commit e452955c077a761cbadd27bede8d6844edbb2e5e
Author: Tim Prouty 
Date:   Thu Mar 26 11:28:37 2009 -0700

s3: parse_packet can return NULL which is then dereferenced in 
match_mailslot_name

---

Summary of changes:
 source/libsmb/unexpected.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/unexpected.c b/source/libsmb/unexpected.c
index df4d211..4404b26 100644
--- a/source/libsmb/unexpected.c
+++ b/source/libsmb/unexpected.c
@@ -163,6 +163,10 @@ static int traverse_match(TDB_CONTEXT *ttdb, TDB_DATA 
kbuf, TDB_DATA dbuf,
ip,
port);
 
+   if (!p) {
+   return 0;
+   }
+
if ((state->match_type == NMB_PACKET &&
 p->packet.nmb.header.name_trn_id == state->match_id) ||
(state->match_type == DGRAM_PACKET &&


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3523-gd097e3f

[Jeremy Allison]

The branch, v3-2-test has been updated
   via  d097e3f918853cf642c4a51f6ed3a4d8c85d283e (commit)
  from  f73d4cf1fcfd8f9e2543a222faed133472fd890c (commit)

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


- Log -
commit d097e3f918853cf642c4a51f6ed3a4d8c85d283e
Author: Tim Prouty 
Date:   Thu Mar 26 11:28:37 2009 -0700

s3: parse_packet can return NULL which is then dereferenced in 
match_mailslot_name

---

Summary of changes:
 source/libsmb/unexpected.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/unexpected.c b/source/libsmb/unexpected.c
index df4d211..4404b26 100644
--- a/source/libsmb/unexpected.c
+++ b/source/libsmb/unexpected.c
@@ -163,6 +163,10 @@ static int traverse_match(TDB_CONTEXT *ttdb, TDB_DATA 
kbuf, TDB_DATA dbuf,
ip,
port);
 
+   if (!p) {
+   return 0;
+   }
+
if ((state->match_type == NMB_PACKET &&
 p->packet.nmb.header.name_trn_id == state->match_id) ||
(state->match_type == DGRAM_PACKET &&


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-587-g1d11417

[Stefan Metzmacher]

The branch, v3-4-test has been updated
   via  1d11417c71ebcb80851c8b77e9f3102ee9b592f8 (commit)
  from  c253e80ad21a24395a973b23993dd211b8e0d482 (commit)

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


- Log -
commit 1d11417c71ebcb80851c8b77e9f3102ee9b592f8
Author: Stefan Metzmacher 
Date:   Mon Mar 23 11:44:00 2009 +0100

s3:smbd: if we allow trans2 on the IPC$ share, then we have to allow 
transs2 too.

Otherwise we'll confuse the client signing engine, when we reply an error 
to each transs2.

metze
(cherry picked from commit 7716ad68a8d859ac3651c4eb559b6e45d98566db)

---

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


Changeset truncated at 500 lines:

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 18fbdd7..6d53bbe 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -913,7 +913,7 @@ static const struct smb_message_struct {
 /* 0x30 */ { NULL, NULL, 0 },
 /* 0x31 */ { NULL, NULL, 0 },
 /* 0x32 */ { "SMBtrans2",reply_trans2, AS_USER | CAN_IPC },
-/* 0x33 */ { "SMBtranss2",reply_transs2, AS_USER},
+/* 0x33 */ { "SMBtranss2",reply_transs2, AS_USER | CAN_IPC },
 /* 0x34 */ { "SMBfindclose",reply_findclose,AS_USER},
 /* 0x35 */ { "SMBfindnclose",reply_findnclose,AS_USER},
 /* 0x36 */ { NULL, NULL, 0 },


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5172-g15718a5

[Jeremy Allison]

The branch, v3-3-test has been updated
   via  15718a5d3edc3a65256533dd898ef582ded7f833 (commit)
  from  e452955c077a761cbadd27bede8d6844edbb2e5e (commit)

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


- Log -
commit 15718a5d3edc3a65256533dd898ef582ded7f833
Author: Jeremy Allison 
Date:   Thu Mar 26 12:13:28 2009 -0700

Fix bug #6224 - nmbd waits 5 minutes at startup before checking if it needs 
to run elections
Fix logic bug that causes nmbd to wait 5 minutes before
looking for a master browser. This one is *old* :-). Thanks
for Simo for bugging me on this.
Jeremy.

---

Summary of changes:
 source/nmbd/nmbd_elections.c |3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nmbd/nmbd_elections.c b/source/nmbd/nmbd_elections.c
index b50d215..1ed64f4 100644
--- a/source/nmbd/nmbd_elections.c
+++ b/source/nmbd/nmbd_elections.c
@@ -130,9 +130,6 @@ void check_master_browser_exists(time_t t)
struct subnet_record *subrec;
const char *workgroup_name = lp_workgroup();
 
-   if (!lastrun)
-   lastrun = t;
-
if (t < (lastrun + (CHECK_TIME_MST_BROWSE * 60)))
return;
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3524-g857c2e4

[Jeremy Allison]

The branch, v3-2-test has been updated
   via  857c2e4407a0f4fcee721372ffed5366bc3051f9 (commit)
  from  d097e3f918853cf642c4a51f6ed3a4d8c85d283e (commit)

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


- Log -
commit 857c2e4407a0f4fcee721372ffed5366bc3051f9
Author: Jeremy Allison 
Date:   Thu Mar 26 12:13:28 2009 -0700

Fix bug #6224 - nmbd waits 5 minutes at startup before checking if it needs 
to run elections
Fix logic bug that causes nmbd to wait 5 minutes before
looking for a master browser. This one is *old* :-). Thanks
for Simo for bugging me on this.
Jeremy.

---

Summary of changes:
 source/nmbd/nmbd_elections.c |3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nmbd/nmbd_elections.c b/source/nmbd/nmbd_elections.c
index b50d215..1ed64f4 100644
--- a/source/nmbd/nmbd_elections.c
+++ b/source/nmbd/nmbd_elections.c
@@ -130,9 +130,6 @@ void check_master_browser_exists(time_t t)
struct subnet_record *subrec;
const char *workgroup_name = lp_workgroup();
 
-   if (!lastrun)
-   lastrun = t;
-
if (t < (lastrun + (CHECK_TIME_MST_BROWSE * 60)))
return;
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-588-g21c76ac

[Jeremy Allison]

The branch, v3-4-test has been updated
   via  21c76accc3cde979844eb622d7a9bafe1d02d9be (commit)
  from  1d11417c71ebcb80851c8b77e9f3102ee9b592f8 (commit)

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


- Log -
commit 21c76accc3cde979844eb622d7a9bafe1d02d9be
Author: Jeremy Allison 
Date:   Thu Mar 26 12:21:55 2009 -0700

Fix bug #6224 - nmbd waits 5 minutes at startup before checking if it needs 
to run elections
Fix logic bug that causes nmbd to wait 5 minutes before
looking for a master browser. This one is *old* :-). Thanks
for Simo for bugging me on this.
Jeremy.

---

Summary of changes:
 source3/nmbd/nmbd_elections.c |3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/nmbd/nmbd_elections.c b/source3/nmbd/nmbd_elections.c
index b50d215..1ed64f4 100644
--- a/source3/nmbd/nmbd_elections.c
+++ b/source3/nmbd/nmbd_elections.c
@@ -130,9 +130,6 @@ void check_master_browser_exists(time_t t)
struct subnet_record *subrec;
const char *workgroup_name = lp_workgroup();
 
-   if (!lastrun)
-   lastrun = t;
-
if (t < (lastrun + (CHECK_TIME_MST_BROWSE * 60)))
return;
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-751-g94ba56b

[Jeremy Allison]

The branch, master has been updated
   via  94ba56b2bdad4782deefc5581e6b6ac5c4eeb258 (commit)
  from  494e471d747c1e858481fad16cb33574d3e7f985 (commit)

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


- Log -
commit 94ba56b2bdad4782deefc5581e6b6ac5c4eeb258
Author: Jeremy Allison 
Date:   Thu Mar 26 12:21:55 2009 -0700

Fix bug #6224 - nmbd waits 5 minutes at startup before checking if it needs 
to run elections
Fix logic bug that causes nmbd to wait 5 minutes before
looking for a master browser. This one is *old* :-). Thanks
for Simo for bugging me on this.
Jeremy.

---

Summary of changes:
 source3/nmbd/nmbd_elections.c |3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/nmbd/nmbd_elections.c b/source3/nmbd/nmbd_elections.c
index b50d215..1ed64f4 100644
--- a/source3/nmbd/nmbd_elections.c
+++ b/source3/nmbd/nmbd_elections.c
@@ -130,9 +130,6 @@ void check_master_browser_exists(time_t t)
struct subnet_record *subrec;
const char *workgroup_name = lp_workgroup();
 
-   if (!lastrun)
-   lastrun = t;
-
if (t < (lastrun + (CHECK_TIME_MST_BROWSE * 60)))
return;
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-752-g757d403

[Jeremy Allison]

The branch, master has been updated
   via  757d403dfff023fdb122a155f6a05d33daa76410 (commit)
  from  94ba56b2bdad4782deefc5581e6b6ac5c4eeb258 (commit)

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


- Log -
commit 757d403dfff023fdb122a155f6a05d33daa76410
Author: Jeremy Allison 
Date:   Thu Mar 26 14:34:25 2009 -0700

This should fix the build farm RAW-STREAMS failure. streams_depot.so
depends on xattrs, and xattr_tdb was pushed *first* in the stack...
Jeremy.

---

Summary of changes:
 source3/script/tests/selftest.sh |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index a430d01..af77c79 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -238,7 +238,7 @@ cat >$SERVERCONFFILE<

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-753-ge235b46

[Jeremy Allison]

The branch, master has been updated
   via  e235b4628b473f30275a534f5172c8926d3f205d (commit)
  from  757d403dfff023fdb122a155f6a05d33daa76410 (commit)

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


- Log -
commit e235b4628b473f30275a534f5172c8926d3f205d
Author: Jeremy Allison 
Date:   Thu Mar 26 14:48:34 2009 -0700

Revert 757d403dfff023fdb122a155f6a05d33daa76410 - module
order shouldn't matter & I have a more correct fix for this.
Jeremy.

---

Summary of changes:
 source3/script/tests/selftest.sh |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index af77c79..a430d01 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -238,7 +238,7 @@ cat >$SERVERCONFFILE<

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-755-g0495343

[Andrew Tridgell]

The branch, master has been updated
   via  049534336c8df538ab3c384c0f505cf3bc6a1300 (commit)
   via  d88ced1dccd8f6eb6a1931d3ccae2c7cb0667020 (commit)
  from  e235b4628b473f30275a534f5172c8926d3f205d (commit)

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


- Log -
commit 049534336c8df538ab3c384c0f505cf3bc6a1300
Merge: d88ced1dccd8f6eb6a1931d3ccae2c7cb0667020 
e235b4628b473f30275a534f5172c8926d3f205d
Author: Andrew Tridgell 
Date:   Fri Mar 27 09:32:43 2009 +1100

Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit d88ced1dccd8f6eb6a1931d3ccae2c7cb0667020
Author: Andrew Tridgell 
Date:   Fri Mar 27 09:31:51 2009 +1100

added a --wspp option

Adding --wspp to possibleInferiors.py forces it to use the WSPP
documented algorithm, which doesn't match windows behaviour

---

Summary of changes:
 .../samdb/ldb_modules/tests/possibleinferiors.py   |   11 +++
 1 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py 
b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
index ec426c0..aab93e5 100755
--- a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
+++ b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
@@ -36,6 +36,7 @@ parser.add_option_group(sambaopts)
 credopts = options.CredentialsOptions(parser)
 parser.add_option_group(credopts)
 parser.add_option_group(options.VersionOptions(parser))
+parser.add_option("--wspp", action="store_true")
 
 opts, args = parser.parse_args()
 
@@ -139,10 +140,12 @@ def POSSSUPERIORS(classinfo, oclist):
 list2.extend(classinfo[oc]["systemPossSuperiors"])
 list2.extend(classinfo[oc]["possSuperiors"])
 list2.extend(POSSSUPERIORS(classinfo, SUPCLASSES(classinfo, oc)))
-   # the WSPP docs suggest we should do this:
-   #   list2.extend(POSSSUPERIORS(classinfo, AUXCLASSES(classinfo, 
[oc])))
-   # but testing against w2k3 and w2k8 shows that we need to do this 
instead
-list2.extend(SUBCLASSES(classinfo, list2))
+if opts.wspp:
+# the WSPP docs suggest we should do this:
+list2.extend(POSSSUPERIORS(classinfo, AUXCLASSES(classinfo, 
[oc])))
+else:
+# but testing against w2k3 and w2k8 shows that we need to do 
this instead
+list2.extend(SUBCLASSES(classinfo, list2))
 classinfo[oc]["POSSSUPERIORS"] = list2
 list.extend(list2)
 return list


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5173-g05c038f

[Jeremy Allison]

The branch, v3-3-test has been updated
   via  05c038fb86555e2ee26d051ca002eeac1c1669ce (commit)
  from  15718a5d3edc3a65256533dd898ef582ded7f833 (commit)

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


- Log -
commit 05c038fb86555e2ee26d051ca002eeac1c1669ce
Author: Jeremy Allison 
Date:   Thu Mar 26 15:33:39 2009 -0700

Try and fix the build farm RAW-STREAMS errors. Ordering of
modules shouldn't matter, so as vfs_streams_depot doesn't
implement get/setxattrs then call into the full VFS stack
at the top.
Jeremy

---

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


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_streams_depot.c 
b/source/modules/vfs_streams_depot.c
index 2a5b7a9..20e28d9 100644
--- a/source/modules/vfs_streams_depot.c
+++ b/source/modules/vfs_streams_depot.c
@@ -78,7 +78,7 @@ static bool file_is_valid(vfs_handle_struct *handle, const 
char *path,
 
DEBUG(10, ("file_is_valid (%s) called\n", path));
 
-   if (SMB_VFS_NEXT_GETXATTR(handle, path, SAMBA_XATTR_MARKER,
+   if (SMB_VFS_GETXATTR(handle->conn, path, SAMBA_XATTR_MARKER,
  &buf, sizeof(buf)) != sizeof(buf)) {
DEBUG(10, ("GETXATTR failed: %s\n", strerror(errno)));
return false;
@@ -104,7 +104,7 @@ static bool mark_file_valid(vfs_handle_struct *handle, 
const char *path,
 
DEBUG(10, ("marking file %s as valid\n", path));
 
-   ret = SMB_VFS_NEXT_SETXATTR(handle, path, SAMBA_XATTR_MARKER,
+   ret = SMB_VFS_SETXATTR(handle->conn, path, SAMBA_XATTR_MARKER,
&buf, sizeof(buf), 0);
 
if (ret == -1) {


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-757-g0788436

[Jeremy Allison]

The branch, master has been updated
   via  0788436b579b78088bfa9d77fb4c47f652ad5eb8 (commit)
   via  1f83aafac85fad3f996f1dfd92e553b030de50d0 (commit)
  from  049534336c8df538ab3c384c0f505cf3bc6a1300 (commit)

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


- Log -
commit 0788436b579b78088bfa9d77fb4c47f652ad5eb8
Merge: 1f83aafac85fad3f996f1dfd92e553b030de50d0 
049534336c8df538ab3c384c0f505cf3bc6a1300
Author: Jeremy Allison 
Date:   Thu Mar 26 15:33:40 2009 -0700

Merge branch 'master' of ssh://j...@git.samba.org/data/git/samba

commit 1f83aafac85fad3f996f1dfd92e553b030de50d0
Author: Jeremy Allison 
Date:   Thu Mar 26 15:30:42 2009 -0700

Try and fix the build farm RAW-STREAMS errors. Ordering of
modules shouldn't matter, so as vfs_streams_depot doesn't
implement get/setxattrs then call into the full VFS stack
at the top.
Jeremy

---

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_streams_depot.c 
b/source3/modules/vfs_streams_depot.c
index 023d2b9..e5a70b1 100644
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -78,7 +78,7 @@ static bool file_is_valid(vfs_handle_struct *handle, const 
char *path,
 
DEBUG(10, ("file_is_valid (%s) called\n", path));
 
-   if (SMB_VFS_NEXT_GETXATTR(handle, path, SAMBA_XATTR_MARKER,
+   if (SMB_VFS_GETXATTR(handle->conn, path, SAMBA_XATTR_MARKER,
  &buf, sizeof(buf)) != sizeof(buf)) {
DEBUG(10, ("GETXATTR failed: %s\n", strerror(errno)));
return false;
@@ -104,7 +104,7 @@ static bool mark_file_valid(vfs_handle_struct *handle, 
const char *path,
 
DEBUG(10, ("marking file %s as valid\n", path));
 
-   ret = SMB_VFS_NEXT_SETXATTR(handle, path, SAMBA_XATTR_MARKER,
+   ret = SMB_VFS_SETXATTR(handle->conn, path, SAMBA_XATTR_MARKER,
&buf, sizeof(buf), 0);
 
if (ret == -1) {


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-589-g5e77abe

[Jeremy Allison]

The branch, v3-4-test has been updated
   via  5e77abe108bab07c04f5c7186b63a4c0fef59721 (commit)
  from  21c76accc3cde979844eb622d7a9bafe1d02d9be (commit)

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


- Log -
commit 5e77abe108bab07c04f5c7186b63a4c0fef59721
Author: Jeremy Allison 
Date:   Thu Mar 26 15:30:42 2009 -0700

Try and fix the build farm RAW-STREAMS errors. Ordering of
modules shouldn't matter, so as vfs_streams_depot doesn't
implement get/setxattrs then call into the full VFS stack
at the top.
Jeremy

---

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_streams_depot.c 
b/source3/modules/vfs_streams_depot.c
index 023d2b9..e5a70b1 100644
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -78,7 +78,7 @@ static bool file_is_valid(vfs_handle_struct *handle, const 
char *path,
 
DEBUG(10, ("file_is_valid (%s) called\n", path));
 
-   if (SMB_VFS_NEXT_GETXATTR(handle, path, SAMBA_XATTR_MARKER,
+   if (SMB_VFS_GETXATTR(handle->conn, path, SAMBA_XATTR_MARKER,
  &buf, sizeof(buf)) != sizeof(buf)) {
DEBUG(10, ("GETXATTR failed: %s\n", strerror(errno)));
return false;
@@ -104,7 +104,7 @@ static bool mark_file_valid(vfs_handle_struct *handle, 
const char *path,
 
DEBUG(10, ("marking file %s as valid\n", path));
 
-   ret = SMB_VFS_NEXT_SETXATTR(handle, path, SAMBA_XATTR_MARKER,
+   ret = SMB_VFS_SETXATTR(handle->conn, path, SAMBA_XATTR_MARKER,
&buf, sizeof(buf), 0);
 
if (ret == -1) {


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3525-ga1d9b31

[Jeremy Allison]

The branch, v3-2-test has been updated
   via  a1d9b31a0c8a38dbfa94f578830d5d35695aff3b (commit)
  from  857c2e4407a0f4fcee721372ffed5366bc3051f9 (commit)

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


- Log -
commit a1d9b31a0c8a38dbfa94f578830d5d35695aff3b
Author: Jeremy Allison 
Date:   Thu Mar 26 15:33:39 2009 -0700

Try and fix the build farm RAW-STREAMS errors. Ordering of
modules shouldn't matter, so as vfs_streams_depot doesn't
implement get/setxattrs then call into the full VFS stack
at the top.
Jeremy

---

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


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_streams_depot.c 
b/source/modules/vfs_streams_depot.c
index a1a1fc1..7a0ea08 100644
--- a/source/modules/vfs_streams_depot.c
+++ b/source/modules/vfs_streams_depot.c
@@ -78,7 +78,7 @@ static bool file_is_valid(vfs_handle_struct *handle, const 
char *path,
 
DEBUG(10, ("file_is_valid (%s) called\n", path));
 
-   if (SMB_VFS_NEXT_GETXATTR(handle, path, SAMBA_XATTR_MARKER,
+   if (SMB_VFS_GETXATTR(handle->conn, path, SAMBA_XATTR_MARKER,
  &buf, sizeof(buf)) != sizeof(buf)) {
DEBUG(10, ("GETXATTR failed: %s\n", strerror(errno)));
return false;
@@ -104,7 +104,7 @@ static bool mark_file_valid(vfs_handle_struct *handle, 
const char *path,
 
DEBUG(10, ("marking file %s as valid\n", path));
 
-   ret = SMB_VFS_NEXT_SETXATTR(handle, path, SAMBA_XATTR_MARKER,
+   ret = SMB_VFS_SETXATTR(handle->conn, path, SAMBA_XATTR_MARKER,
&buf, sizeof(buf), 0);
 
if (ret == -1) {


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-759-ga9bc6a3

[Steven Danneman]

The branch, master has been updated
   via  a9bc6a3d457fc2e568317b9867f8b3dc2a8f0d4f (commit)
   via  7278c549ea7ea4a83ff164a9f9bf335fa4d11dd8 (commit)
  from  0788436b579b78088bfa9d77fb4c47f652ad5eb8 (commit)

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


- Log -
commit a9bc6a3d457fc2e568317b9867f8b3dc2a8f0d4f
Author: Zach Loafman 
Date:   Thu Mar 26 13:35:39 2009 -0700

Add durable open / oplock interaction test. Rather than give it a chance to 
disconnect, Win7 will break a batch oplock immediately on contention.

commit 7278c549ea7ea4a83ff164a9f9bf335fa4d11dd8
Author: Zach Loafman 
Date:   Thu Mar 26 09:32:50 2009 -0700

Reorganize old persistent_handles test into durable_open.c, turn it into a 
suite instead of a solo test (in anticipation of more tests).

---

Summary of changes:
 source4/torture/smb2/config.mk|2 +-
 source4/torture/smb2/durable_open.c   |  300 +
 source4/torture/smb2/persistent_handles.c |  183 --
 source4/torture/smb2/smb2.c   |2 +-
 4 files changed, 302 insertions(+), 185 deletions(-)
 create mode 100644 source4/torture/smb2/durable_open.c
 delete mode 100644 source4/torture/smb2/persistent_handles.c


Changeset truncated at 500 lines:

diff --git a/source4/torture/smb2/config.mk b/source4/torture/smb2/config.mk
index e0fc29f..91ba9fc 100644
--- a/source4/torture/smb2/config.mk
+++ b/source4/torture/smb2/config.mk
@@ -20,7 +20,7 @@ TORTURE_SMB2_OBJ_FILES = $(addprefix $(torturesrcdir)/smb2/, \
lock.o \
notify.o \
smb2.o \
-   persistent_handles.o \
+   durable_open.o \
oplocks.o \
create.o \
read.o)
diff --git a/source4/torture/smb2/durable_open.c 
b/source4/torture/smb2/durable_open.c
new file mode 100644
index 000..f34dfc4
--- /dev/null
+++ b/source4/torture/smb2/durable_open.c
@@ -0,0 +1,300 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   test suite for SMB2 durable opens
+
+   Copyright (C) Stefan Metzmacher 2008
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see .
+*/
+
+#include "includes.h"
+#include "librpc/gen_ndr/security.h"
+#include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
+#include "torture/torture.h"
+#include "torture/smb2/proto.h"
+
+#define CHECK_VAL(v, correct) do { \
+   if ((v) != (correct)) { \
+   torture_result(tctx, TORTURE_FAIL, "(%s): wrong value for %s 
got 0x%x - should be 0x%x\n", \
+   __location__, #v, (int)v, (int)correct); \
+   ret = false; \
+   }} while (0)
+
+#define CHECK_STATUS(status, correct) do { \
+   if (!NT_STATUS_EQUAL(status, correct)) { \
+   torture_result(tctx, TORTURE_FAIL, __location__": Incorrect 
status %s - should be %s", \
+  nt_errstr(status), nt_errstr(correct)); \
+   ret = false; \
+   goto done; \
+   }} while (0)
+
+/*
+   basic testing of SMB2 durable opens
+   regarding the position information on the handle
+*/
+bool test_durable_open_file_position(struct torture_context *tctx,
+struct smb2_tree *tree1,
+struct smb2_tree *tree2)
+{
+   TALLOC_CTX *mem_ctx = talloc_new(tctx);
+   struct smb2_handle h1, h2;
+   struct smb2_create io1, io2;
+   NTSTATUS status;
+   const char *fname = "durable_open_position.dat";
+   DATA_BLOB b;
+   union smb_fileinfo qfinfo;
+   union smb_setfileinfo sfinfo;
+   bool ret = true;
+   uint64_t pos;
+
+   smb2_util_unlink(tree1, fname);
+
+   ZERO_STRUCT(io1);
+   io1.in.security_flags   = 0x00;
+   io1.in.oplock_level = SMB2_OPLOCK_LEVEL_BATCH;
+   io1.in.impersonation_level  = NTCREATEX_IMPERSONATION_IMPERSONATION;
+   io1.in.create_flags = 0x;
+   io1.in.reserved = 0x;
+   io1.in.desired_access   = SEC_RIGHTS_FILE_ALL;
+   io1.in.file_attributes  = FILE_ATTRIBUTE_NORMAL;
+   io1.in.share_access = NTCREATEX_SHARE_ACCESS_READ |
+

Build status as of Fri Mar 27 00:00:02 2009

[build]

URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2009-03-26 
00:00:22.0 +
+++ /home/build/master/cache/broken_results.txt 2009-03-27 00:00:24.0 
+
@@ -1,4 +1,4 @@
-Build status as of Thu Mar 26 00:00:02 2009
+Build status as of Fri Mar 27 00:00:02 2009
 
 Build counts:
 Tree Total  Broken Panic 
@@ -15,7 +15,7 @@
 samba-docs   0  0  0 
 samba-gtk6  6  0 
 samba_3_X_devel 29 27 0 
-samba_3_X_test 28 27 0 
+samba_3_X_test 28 21 0 
 samba_4_0_test 30 29 1 
 smb-build29 6  0 
 talloc   30 30 0