[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 5b3a32b... s3-kerberos: next step to resolve Bug #6929: build with recent heimdal. from 60419a0... s4-smbtorture: refactor RPC-SAMR-LARGE-DC test a little more. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 5b3a32be97a37c119e837bdee8f049684565458c Author: Günther Deschner g...@samba.org Date: Thu Nov 26 10:15:45 2009 +0100 s3-kerberos: next step to resolve Bug #6929: build with recent heimdal. Based on patch from Allan al...@archlinux.org. Also should fix the FreeBSD build on the buildfarm. Guenther --- Summary of changes: nsswitch/winbind_krb5_locator.c |6 +- source3/configure.in|6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/nsswitch/winbind_krb5_locator.c b/nsswitch/winbind_krb5_locator.c index 272e7db..db6e8d0 100644 --- a/nsswitch/winbind_krb5_locator.c +++ b/nsswitch/winbind_krb5_locator.c @@ -26,7 +26,11 @@ #if defined(HAVE_KRB5) defined(HAVE_KRB5_LOCATE_PLUGIN_H) -#include krb5/krb5.h +#if HAVE_COM_ERR_H +#include com_err.h +#endif + +#include krb5.h #include krb5/locate_plugin.h #ifndef KRB5_PLUGIN_NO_HANDLE diff --git a/source3/configure.in b/source3/configure.in index f624e0e..29016c5 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -3329,7 +3329,7 @@ if test x$with_ads_support != xno; then # now check for krb5.h. Some systems have the libraries without the headers! # note that this check is done here to allow for different kerberos # include paths - AC_CHECK_HEADERS(krb5.h krb5/krb5.h) + AC_CHECK_HEADERS(krb5.h) if test x$ac_cv_header_krb5_h = xno; then @@ -3351,8 +3351,8 @@ if test x$with_ads_support != xno; then LDFLAGS=$ac_save_LDFLAGS fi AC_CHECK_HEADERS([krb5/locate_plugin.h], [], [], -[[#ifdef HAVE_KRB5_KRB5_H - #include krb5/krb5.h +[[#ifdef HAVE_KRB5_H + #include krb5.h #endif ]]) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9755337... s4:ldap.py - add a test for the enhanced operational
attributes check
via b6efbd5... s4:objectclass LDB module - Prevent write operations on
constructed attributes
via 393b839... s4:operational LDB module - Don't do the write checks
here
from 5b3a32b... s3-kerberos: next step to resolve Bug #6929: build with
recent heimdal.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 97553373d182671a8da1553cc47465c664ae69f0
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Thu Nov 26 09:51:56 2009 +0100
s4:ldap.py - add a test for the enhanced operational attributes check
(Deny creation of entries with operational attributes specified)
commit b6efbd5b4c5ba3a2e2040033b6b634d60ed2d3f5
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Thu Nov 26 10:54:20 2009 +0100
s4:objectclass LDB module - Prevent write operations on constructed
attributes
commit 393b83979d11dddcf6d38ca24b3aea7bb645e0d0
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Thu Nov 26 10:21:44 2009 +0100
s4:operational LDB module - Don't do the write checks here
Let this perform the schema in the objectclass module.
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/objectclass.c | 25 +++--
source4/dsdb/samdb/ldb_modules/operational.c | 16
source4/lib/ldb/tests/python/ldap.py | 11 +++
3 files changed, 30 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c
b/source4/dsdb/samdb/ldb_modules/objectclass.c
index 53c1cc7..82b8835 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -366,9 +366,12 @@ static int fix_dn(TALLOC_CTX *mem_ctx,
}
/* Fix all attribute names to be in the correct case, and check they are all
valid per the schema */
-static int fix_attributes(struct ldb_context *ldb, const struct dsdb_schema
*schema, struct ldb_message *msg)
+static int fix_check_attributes(struct ldb_context *ldb,
+ const struct dsdb_schema *schema,
+ struct ldb_message *msg,
+ enum ldb_request_type op)
{
- int i;
+ unsigned int i;
for (i=0; i msg-num_elements; i++) {
const struct dsdb_attribute *attribute =
dsdb_attribute_by_lDAPDisplayName(schema, msg-elements[i].name);
/* Add in a very special case for 'clearTextPassword',
@@ -382,6 +385,16 @@ static int fix_attributes(struct ldb_context *ldb, const
struct dsdb_schema *sch
}
} else {
msg-elements[i].name = attribute-lDAPDisplayName;
+
+ /* We have to deny write operations on constructed
attributes */
+ if ((attribute-systemFlags
DS_FLAG_ATTR_IS_CONSTRUCTED) != 0) {
+ if (op == LDB_ADD) {
+ return LDB_ERR_UNDEFINED_ATTRIBUTE_TYPE;
+ } else {
+ return LDB_ERR_CONSTRAINT_VIOLATION;
+ }
+ }
+
}
}
@@ -500,7 +513,7 @@ static int objectclass_do_add(struct oc_context *ac)
}
if (schema) {
- ret = fix_attributes(ldb, schema, msg);
+ ret = fix_check_attributes(ldb, schema, msg,
ac-req-operation);
if (ret != LDB_SUCCESS) {
talloc_free(mem_ctx);
return ret;
@@ -738,7 +751,7 @@ static int objectclass_modify(struct ldb_module *module,
struct ldb_request *req
return LDB_ERR_OPERATIONS_ERROR;
}
- ret = fix_attributes(ldb, schema, msg);
+ ret = fix_check_attributes(ldb, schema, msg, req-operation);
if (ret != LDB_SUCCESS) {
return ret;
}
@@ -775,7 +788,7 @@ static int objectclass_modify(struct ldb_module *module,
struct ldb_request *req
return LDB_ERR_OPERATIONS_ERROR;
}
- ret = fix_attributes(ldb, schema, msg);
+ ret = fix_check_attributes(ldb, schema, msg, req-operation);
if (ret != LDB_SUCCESS) {
talloc_free(mem_ctx);
return ret;
@@ -851,7 +864,7 @@ static int objectclass_modify(struct ldb_module *module,
struct ldb_request *req
return LDB_ERR_OPERATIONS_ERROR;
}
- ret = fix_attributes(ldb, schema, msg);
+ ret =
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 77e2d2f... create-tarball: Make it more comfortable to use the
--copy-docs option.
from 9755337... s4:ldap.py - add a test for the enhanced operational
attributes check
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 77e2d2f1d29b69699f4539abfce7b2f32db843e4
Author: Karolin Seeger ksee...@samba.org
Date: Thu Nov 26 11:18:39 2009 +0100
create-tarball: Make it more comfortable to use the --copy-docs option.
Now you can directly specify the 'make release' output dir without any
modifications.
Karolin
---
Summary of changes:
release-scripts/create-tarball | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 05d77bc..9e6b8fe 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -116,6 +116,19 @@ function buildDocs
rsync -av ${OPT_DOCSDIR}/ docs/
exitOnError $? Failed top copy docs from ${OPT_DOCSDIR}
+ cd docs/
+ /bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
+ if [ -d manpages-3 ]; then
+ mv manpages-3 manpages
+ fi
+ if [ -d htmldocs/manpages-3 ]; then
+ mv htmldocs/manpages-3 htmldocs/manpages
+ fi
+ # Sync thanks, history and registry/ into the docs dir
+ rsync -Ca --exclude=.svn ../../$OPT_BRANCH/docs-xml/registry ../docs/
+ rsync -Ca --exclude=.svn ../../$OPT_BRANCH/docs-xml/archives/ ../docs/
+ cd ../
+
return 0
fi
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 62df932... create-tarball: Make it more comfortable to use the
--copy-docs option.
from ebd6a9f... Fix warnings with talloc_asprintf. Jeremy. (cherry
picked from commit c5b234c9cde079aa45ed93c42b5ed5e66ac969a3)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 62df932f9dc333f69bf901fe88bfac6fc4e59bcd
Author: Karolin Seeger ksee...@samba.org
Date: Thu Nov 26 11:18:39 2009 +0100
create-tarball: Make it more comfortable to use the --copy-docs option.
Now you can directly specify the 'make release' output dir without any
modifications.
Karolin
(cherry picked from commit 77e2d2f1d29b69699f4539abfce7b2f32db843e4)
---
Summary of changes:
release-scripts/create-tarball | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 5c9df90..26a7270 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -116,6 +116,19 @@ function buildDocs
rsync -av ${OPT_DOCSDIR}/ docs/
exitOnError $? Failed top copy docs from ${OPT_DOCSDIR}
+ cd docs/
+ /bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
+ if [ -d manpages-3 ]; then
+ mv manpages-3 manpages
+ fi
+ if [ -d htmldocs/manpages-3 ]; then
+ mv htmldocs/manpages-3 htmldocs/manpages
+ fi
+ # Sync thanks, history and registry/ into the docs dir
+ rsync -Ca --exclude=.svn ../../$OPT_BRANCH/docs-xml/registry ../docs/
+ rsync -Ca --exclude=.svn ../../$OPT_BRANCH/docs-xml/archives/ ../docs/
+ cd ../
+
return 0
fi
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated
via f35a774... create-tarball: Make it more comfortable to use the
--copy-docs option.
from e3dc0f5... s3: Fix bug 6338 -- net rpc trustdom list always display
none
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit f35a774cd0a6837e5440acf51ef1fc032d434007
Author: Karolin Seeger ksee...@samba.org
Date: Thu Nov 26 11:18:39 2009 +0100
create-tarball: Make it more comfortable to use the --copy-docs option.
Now you can directly specify the 'make release' output dir without any
modifications.
Karolin
(cherry picked from commit 77e2d2f1d29b69699f4539abfce7b2f32db843e4)
(cherry picked from commit 62df932f9dc333f69bf901fe88bfac6fc4e59bcd)
---
Summary of changes:
release-scripts/create-tarball | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 5c9df90..26a7270 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -116,6 +116,19 @@ function buildDocs
rsync -av ${OPT_DOCSDIR}/ docs/
exitOnError $? Failed top copy docs from ${OPT_DOCSDIR}
+ cd docs/
+ /bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
+ if [ -d manpages-3 ]; then
+ mv manpages-3 manpages
+ fi
+ if [ -d htmldocs/manpages-3 ]; then
+ mv htmldocs/manpages-3 htmldocs/manpages
+ fi
+ # Sync thanks, history and registry/ into the docs dir
+ rsync -Ca --exclude=.svn ../../$OPT_BRANCH/docs-xml/registry ../docs/
+ rsync -Ca --exclude=.svn ../../$OPT_BRANCH/docs-xml/archives/ ../docs/
+ cd ../
+
return 0
fi
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 49553d0... librpc: rerun make idl
via a20e095... pidl:Samba3/ClientNDR: $size can be 'foo / 2' so we need
to add '(' and ')'
via ab1c929... pidl:NDR/Parser: $size can be 'foo / 2' so we need to
add '(' and ')'
from 77e2d2f... create-tarball: Make it more comfortable to use the
--copy-docs option.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 49553d066ba346b28286b72f54e5ee8739cbcef2
Author: Stefan Metzmacher me...@samba.org
Date: Wed Nov 25 14:42:24 2009 +0100
librpc: rerun make idl
metze
commit a20e095b1fffb6d690609c924d03cafedbbce8f3
Author: Stefan Metzmacher me...@samba.org
Date: Wed Nov 25 14:31:34 2009 +0100
pidl:Samba3/ClientNDR: $size can be 'foo / 2' so we need to add '(' and ')'
foo / 5 * sizeof(bar)' isn't the same as
'(foo / 2) * sizeof(bar)'.
metze
commit ab1c92950f3cfdc8c52b772ecef23a5477f48f9d
Author: Stefan Metzmacher me...@samba.org
Date: Wed Nov 25 14:21:32 2009 +0100
pidl:NDR/Parser: $size can be 'foo / 2' so we need to add '(' and ')'
foo / 5 * sizeof(bar)' isn't the same as
'(foo / 2) * sizeof(bar)'.
metze
---
Summary of changes:
librpc/gen_ndr/cli_echo.c|8 +++---
librpc/gen_ndr/cli_epmapper.c|8 +++---
librpc/gen_ndr/cli_eventlog.c|8 +++---
librpc/gen_ndr/cli_ntsvcs.c |8 +++---
librpc/gen_ndr/cli_spoolss.c | 36 +-
librpc/gen_ndr/cli_srvsvc.c |4 +-
librpc/gen_ndr/cli_svcctl.c | 40 +++---
librpc/gen_ndr/cli_winreg.c | 16 ++--
librpc/gen_ndr/ndr_winreg.c |4 +-
pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm |4 +-
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |2 +-
pidl/tests/samba3-cli.pl |2 +-
source4/selftest/config.mk |2 +-
13 files changed, 71 insertions(+), 71 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_echo.c b/librpc/gen_ndr/cli_echo.c
index 52aa8c5..04d4bbc 100644
--- a/librpc/gen_ndr/cli_echo.c
+++ b/librpc/gen_ndr/cli_echo.c
@@ -219,7 +219,7 @@ static void rpccli_echo_EchoData_done(struct tevent_req
*subreq)
}
/* Copy out parameters */
- memcpy(state-orig.out.out_data, state-tmp.out.out_data,
state-tmp.in.len * sizeof(*state-orig.out.out_data));
+ memcpy(state-orig.out.out_data, state-tmp.out.out_data,
(state-tmp.in.len) * sizeof(*state-orig.out.out_data));
/* Reset temporary structure */
ZERO_STRUCT(state-tmp);
@@ -274,7 +274,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(out_data, r.out.out_data, r.in.len * sizeof(*out_data));
+ memcpy(out_data, r.out.out_data, (r.in.len) * sizeof(*out_data));
/* Return result */
return NT_STATUS_OK;
@@ -484,7 +484,7 @@ static void rpccli_echo_SourceData_done(struct tevent_req
*subreq)
}
/* Copy out parameters */
- memcpy(state-orig.out.data, state-tmp.out.data, state-tmp.in.len *
sizeof(*state-orig.out.data));
+ memcpy(state-orig.out.data, state-tmp.out.data, (state-tmp.in.len) *
sizeof(*state-orig.out.data));
/* Reset temporary structure */
ZERO_STRUCT(state-tmp);
@@ -537,7 +537,7 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(data, r.out.data, r.in.len * sizeof(*data));
+ memcpy(data, r.out.data, (r.in.len) * sizeof(*data));
/* Return result */
return NT_STATUS_OK;
diff --git a/librpc/gen_ndr/cli_epmapper.c b/librpc/gen_ndr/cli_epmapper.c
index 4e5d160..c83dba6 100644
--- a/librpc/gen_ndr/cli_epmapper.c
+++ b/librpc/gen_ndr/cli_epmapper.c
@@ -380,7 +380,7 @@ static void rpccli_epm_Lookup_done(struct tevent_req
*subreq)
/* Copy out parameters */
*state-orig.out.entry_handle = *state-tmp.out.entry_handle;
*state-orig.out.num_ents = *state-tmp.out.num_ents;
- memcpy(state-orig.out.entries, state-tmp.out.entries,
state-tmp.in.max_ents * sizeof(*state-orig.out.entries));
+ memcpy(state-orig.out.entries, state-tmp.out.entries,
(state-tmp.in.max_ents) * sizeof(*state-orig.out.entries));
/* Copy result */
state-orig.out.result = state-tmp.out.result;
@@ -453,7 +453,7 @@ NTSTATUS rpccli_epm_Lookup(struct rpc_pipe_client *cli,
/* Return variables */
*entry_handle = *r.out.entry_handle;
*num_ents = *r.out.num_ents;
- memcpy(entries, r.out.entries, r.in.max_ents * sizeof(*entries));
+ memcpy(entries, r.out.entries, (r.in.max_ents) * sizeof(*entries));
/* Return result
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via f275c43... librpc: rerun make idl
via 941aa3f... pidl:Samba3/ClientNDR: $size can be 'foo / 2' so we need
to add '(' and ')'
via e58955f... pidl:NDR/Parser: $size can be 'foo / 2' so we need to
add '(' and ')'
from 62df932... create-tarball: Make it more comfortable to use the
--copy-docs option.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit f275c437b170f3d11a183306b77f8755bda6e688
Author: Stefan Metzmacher me...@samba.org
Date: Wed Nov 25 14:42:24 2009 +0100
librpc: rerun make idl
metze
(cherry picked from commit 49553d066ba346b28286b72f54e5ee8739cbcef2)
commit 941aa3f8fc43c1720e1b59d1dbcec290eae1abc6
Author: Stefan Metzmacher me...@samba.org
Date: Wed Nov 25 14:31:34 2009 +0100
pidl:Samba3/ClientNDR: $size can be 'foo / 2' so we need to add '(' and ')'
foo / 5 * sizeof(bar)' isn't the same as
'(foo / 2) * sizeof(bar)'.
metze
(cherry picked from commit a20e095b1fffb6d690609c924d03cafedbbce8f3)
commit e58955fd4ca1500e58045417711b469a485419af
Author: Stefan Metzmacher me...@samba.org
Date: Wed Nov 25 14:21:32 2009 +0100
pidl:NDR/Parser: $size can be 'foo / 2' so we need to add '(' and ')'
foo / 5 * sizeof(bar)' isn't the same as
'(foo / 2) * sizeof(bar)'.
metze
(cherry picked from commit ab1c92950f3cfdc8c52b772ecef23a5477f48f9d)
---
Summary of changes:
librpc/gen_ndr/cli_echo.c|8 +++---
librpc/gen_ndr/cli_epmapper.c|8 +++---
librpc/gen_ndr/cli_eventlog.c|8 +++---
librpc/gen_ndr/cli_ntsvcs.c |8 +++---
librpc/gen_ndr/cli_spoolss.c | 36 +-
librpc/gen_ndr/cli_srvsvc.c |4 +-
librpc/gen_ndr/cli_svcctl.c | 40 +++---
librpc/gen_ndr/cli_winreg.c | 16 ++--
librpc/gen_ndr/ndr_winreg.c |4 +-
pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm |4 +-
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |2 +-
pidl/tests/samba3-cli.pl |2 +-
source4/selftest/config.mk |2 +-
13 files changed, 71 insertions(+), 71 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_echo.c b/librpc/gen_ndr/cli_echo.c
index 52aa8c5..04d4bbc 100644
--- a/librpc/gen_ndr/cli_echo.c
+++ b/librpc/gen_ndr/cli_echo.c
@@ -219,7 +219,7 @@ static void rpccli_echo_EchoData_done(struct tevent_req
*subreq)
}
/* Copy out parameters */
- memcpy(state-orig.out.out_data, state-tmp.out.out_data,
state-tmp.in.len * sizeof(*state-orig.out.out_data));
+ memcpy(state-orig.out.out_data, state-tmp.out.out_data,
(state-tmp.in.len) * sizeof(*state-orig.out.out_data));
/* Reset temporary structure */
ZERO_STRUCT(state-tmp);
@@ -274,7 +274,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(out_data, r.out.out_data, r.in.len * sizeof(*out_data));
+ memcpy(out_data, r.out.out_data, (r.in.len) * sizeof(*out_data));
/* Return result */
return NT_STATUS_OK;
@@ -484,7 +484,7 @@ static void rpccli_echo_SourceData_done(struct tevent_req
*subreq)
}
/* Copy out parameters */
- memcpy(state-orig.out.data, state-tmp.out.data, state-tmp.in.len *
sizeof(*state-orig.out.data));
+ memcpy(state-orig.out.data, state-tmp.out.data, (state-tmp.in.len) *
sizeof(*state-orig.out.data));
/* Reset temporary structure */
ZERO_STRUCT(state-tmp);
@@ -537,7 +537,7 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(data, r.out.data, r.in.len * sizeof(*data));
+ memcpy(data, r.out.data, (r.in.len) * sizeof(*data));
/* Return result */
return NT_STATUS_OK;
diff --git a/librpc/gen_ndr/cli_epmapper.c b/librpc/gen_ndr/cli_epmapper.c
index 4e5d160..c83dba6 100644
--- a/librpc/gen_ndr/cli_epmapper.c
+++ b/librpc/gen_ndr/cli_epmapper.c
@@ -380,7 +380,7 @@ static void rpccli_epm_Lookup_done(struct tevent_req
*subreq)
/* Copy out parameters */
*state-orig.out.entry_handle = *state-tmp.out.entry_handle;
*state-orig.out.num_ents = *state-tmp.out.num_ents;
- memcpy(state-orig.out.entries, state-tmp.out.entries,
state-tmp.in.max_ents * sizeof(*state-orig.out.entries));
+ memcpy(state-orig.out.entries, state-tmp.out.entries,
(state-tmp.in.max_ents) * sizeof(*state-orig.out.entries));
/* Copy result */
state-orig.out.result = state-tmp.out.result;
@@ -453,7 +453,7 @@ NTSTATUS rpccli_epm_Lookup(struct rpc_pipe_client *cli,
/* Return variables */
*entry_handle =
Re: [SCM] Samba Shared Repository - branch master updated
Hi Tim, The branch, master has been updated via 17caf63... s3 selftest: Add RAW-SFILEINFO-END-OF-FILE to selftest via af610a6... s3 setfileinfo: Open with FILE_WRITE_DATA when setting the file size via b6f9722... s4 torture: Change RAW-OPLOCK to use the documented version of SET_END_OF_FILE_INFO via 98f5950... s4 torture: Allow onefs to be checked like samba3 and samba4 via 6074a05... s4 torture: Add two new setfileinfo tests via ce9ac3a... s4 torture: Split up the torture suite setup for RAW-SFILEINFO from 56eca75... The start of a WHATSNEW for Samba4 alpha9 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master commit ce9ac3a685e2a23b30952bf20dbe3f9bf24dfaaa Author: Tim Prouty tpro...@samba.org Date: Tue Nov 24 16:25:02 2009 -0800 s4 torture: Split up the torture suite setup for RAW-SFILEINFO A side effect of this change is that RAW-SFILEINFO now runs the whole suite instead of just the first test. I changed the name of the first test to RAW-SFILEINFO-BASE and changed all of the selftest scripts that call it. I would like to solicit some help from a selftest/samba 4 expert on how to get selftest working with this recent commit. RAW-SFILEINFO was explcitly defined in raw.c along with subtests such as RAW-SFILEINFO-BUG. I modified RAW-SFILEINFO to reference the suite of tests which now includes subtests such as RAW-SFILEINFO-BUG. Since it is no longer possible to have a specific test called RAW-SFILEINFO, I modified it to be called RAW-SFILEINFO-BASE. I changed all of the samba3 make test references from RAW-SFILEINFO to RAW-SFILEINFO-BASE, but I'm having trouble doing the same in samba4. I tried changing source4/selftest/quick to include a line raw.sfileinfo.base rather than raw.sfileinfo, but it doesn't seem to parse correctly and just skips the test. I could just remove it from quicktest, but that seems like a last resort. Additionally, the full 'make test' far samba4 needs a similar adjustment. I've been looking at this now for a few hours and need some guidance from someone who knows how this all fits together a little better than me :). The reason is that we use smbtorture --list in source4/selftest/tests.sh and --list only outputs the first 2 levels of torture suites nesting. So we just pass RAW-SFILEINFO to smbtorture, which means it runs all subtests. me...@sam[sernet]:~/master4/source4 bin/smbtorture --list |grep SFIL RAW-SFILEINFO me...@sam[sernet]:~/master4/source4 bin/smbtorture //127.0.0.45/bla RAW-SFILEINFO Using seed 1259237626 test: BASE Failed to open connection - NT_STATUS_CONNECTION_REFUSED error: BASE [ Unknown error/failure ] test: RENAME Failed to open connection - NT_STATUS_CONNECTION_REFUSED error: RENAME [ Unknown error/failure ] test: BUG Failed to open connection - NT_STATUS_CONNECTION_REFUSED error: BUG [ Unknown error/failure ] test: END-OF-FILE Failed to open connection - NT_STATUS_CONNECTION_REFUSED error: END-OF-FILE [ Unknown error/failure ] test: END-OF-FILE-ACCESS Failed to open connection - NT_STATUS_CONNECTION_REFUSED error: END-OF-FILE-ACCESS [ Unknown error/failure ] me...@sam[sernet]:~/master4/source4 bin/smbtorture //127.0.0.45/bla RAW-SFILEINFO-BUG Using seed 1259237640 test: BUG Failed to open connection - NT_STATUS_CONNECTION_REFUSED error: BUG [ Unknown error/failure ] As we're getting this in make test now: UNEXPECTED(failure): samba4.raw.sfileinfo (dc).END-OF-FILE command: ./bin/smbtorture --configfile=$SMB_CONF_PATH --maximum-runtime=1200 --target=samba4 --basedir=/home/metze/tmp/st-master4/s4client --option=torture:progress=no --format=subunit //$SERVER/tmp -U$USERNAME%$PASSWORD --option=torture:sharedelay=1 --option=torture:oplocktimeout=3 --option=torture:writetimeupdatedelay=5 RAW-SFILEINFO ERROR: Testsuite[samba4.raw.sfileinfo (dc)] REASON: Exit code was 1 we should add something like raw.sfileinfo.*.END-OF-FILE to source4/selftest/knownfail metze signature.asc Description: OpenPGP digital signature
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via c560443... WHATSNEW: Prepare 3.5.0pre1 release notes. from f275c43... librpc: rerun make idl http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit c5604437a857b7ac0c09d94dc6550180f68121ba Author: Karolin Seeger ksee...@samba.org Date: Thu Nov 26 14:11:09 2009 +0100 WHATSNEW: Prepare 3.5.0pre1 release notes. Karolin --- Summary of changes: WHATSNEW.txt | 17 ++--- 1 files changed, 2 insertions(+), 15 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 9823d89..53fdc34 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,6 +1,6 @@ = Release Notes for Samba 3.5.0pre1 - + November 26, 2009 = This is the first preview release of Samba 3.5. This is *not* @@ -23,6 +23,7 @@ Winbind changes: o Major refactoring o Asynchronous + General changes: @@ -68,11 +69,6 @@ smb.conf changes ldap follow referral New auto -New [sub]commands -- - - - New configure options - @@ -86,15 +82,6 @@ New configure options Commit Highlights = - -o Jeremy Allison j...@samba.org -* - - -o Günther Deschner g...@samba.org -* - - o Björn Jacke bja...@sernet.de * Add support for full Windows timestamp resolution. * Add encryption support for connections to a CUPS server. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-stable updated
The branch, v3-5-stable has been updated
via c4e2824... WHATSNEW: Prepare 3.5.0pre1 release notes.
via 4e16962... librpc: rerun make idl
via c474675... pidl:Samba3/ClientNDR: $size can be 'foo / 2' so we need
to add '(' and ')'
via 164a33d... pidl:NDR/Parser: $size can be 'foo / 2' so we need to
add '(' and ')'
from e3bcc3e... create-tarball: Make it more comfortable to use the
--copy-docs option.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable
- Log -
commit c4e282456b3f68baf935374183548b18b1ed3c1b
Author: Karolin Seeger ksee...@samba.org
Date: Thu Nov 26 14:11:09 2009 +0100
WHATSNEW: Prepare 3.5.0pre1 release notes.
Karolin
(cherry picked from commit c5604437a857b7ac0c09d94dc6550180f68121ba)
commit 4e169622d47d7fc560e2e038e4ea5e5c8e16c8ea
Author: Stefan Metzmacher me...@samba.org
Date: Wed Nov 25 14:42:24 2009 +0100
librpc: rerun make idl
metze
(cherry picked from commit 49553d066ba346b28286b72f54e5ee8739cbcef2)
(cherry picked from commit f275c437b170f3d11a183306b77f8755bda6e688)
commit c4746758fe7b3e2e352cfa6f9efd39a40f9f39c5
Author: Stefan Metzmacher me...@samba.org
Date: Wed Nov 25 14:31:34 2009 +0100
pidl:Samba3/ClientNDR: $size can be 'foo / 2' so we need to add '(' and ')'
foo / 5 * sizeof(bar)' isn't the same as
'(foo / 2) * sizeof(bar)'.
metze
(cherry picked from commit a20e095b1fffb6d690609c924d03cafedbbce8f3)
(cherry picked from commit 941aa3f8fc43c1720e1b59d1dbcec290eae1abc6)
commit 164a33d4e9d6b90507d2db96a24c67eb514b5af4
Author: Stefan Metzmacher me...@samba.org
Date: Wed Nov 25 14:21:32 2009 +0100
pidl:NDR/Parser: $size can be 'foo / 2' so we need to add '(' and ')'
foo / 5 * sizeof(bar)' isn't the same as
'(foo / 2) * sizeof(bar)'.
metze
(cherry picked from commit ab1c92950f3cfdc8c52b772ecef23a5477f48f9d)
(cherry picked from commit e58955fd4ca1500e58045417711b469a485419af)
---
Summary of changes:
WHATSNEW.txt | 17 +---
librpc/gen_ndr/cli_echo.c|8 +++---
librpc/gen_ndr/cli_epmapper.c|8 +++---
librpc/gen_ndr/cli_eventlog.c|8 +++---
librpc/gen_ndr/cli_ntsvcs.c |8 +++---
librpc/gen_ndr/cli_spoolss.c | 36 +-
librpc/gen_ndr/cli_srvsvc.c |4 +-
librpc/gen_ndr/cli_svcctl.c | 40 +++---
librpc/gen_ndr/cli_winreg.c | 16 ++--
librpc/gen_ndr/ndr_winreg.c |4 +-
pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm |4 +-
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |2 +-
pidl/tests/samba3-cli.pl |2 +-
source4/selftest/config.mk |2 +-
14 files changed, 73 insertions(+), 86 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 9823d89..53fdc34 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,6 +1,6 @@
=
Release Notes for Samba 3.5.0pre1
-
+ November 26, 2009
=
This is the first preview release of Samba 3.5. This is *not*
@@ -23,6 +23,7 @@ Winbind changes:
o Major refactoring
o Asynchronous
+
General changes:
@@ -68,11 +69,6 @@ smb.conf changes
ldap follow referral New auto
-New [sub]commands
--
-
-
-
New configure options
-
@@ -86,15 +82,6 @@ New configure options
Commit Highlights
=
-
-o Jeremy Allison j...@samba.org
-*
-
-
-o Günther Deschner g...@samba.org
-*
-
-
o Björn Jacke bja...@sernet.de
* Add support for full Windows timestamp resolution.
* Add encryption support for connections to a CUPS server.
diff --git a/librpc/gen_ndr/cli_echo.c b/librpc/gen_ndr/cli_echo.c
index 52aa8c5..04d4bbc 100644
--- a/librpc/gen_ndr/cli_echo.c
+++ b/librpc/gen_ndr/cli_echo.c
@@ -219,7 +219,7 @@ static void rpccli_echo_EchoData_done(struct tevent_req
*subreq)
}
/* Copy out parameters */
- memcpy(state-orig.out.out_data, state-tmp.out.out_data,
state-tmp.in.len * sizeof(*state-orig.out.out_data));
+ memcpy(state-orig.out.out_data, state-tmp.out.out_data,
(state-tmp.in.len) * sizeof(*state-orig.out.out_data));
/* Reset temporary structure */
ZERO_STRUCT(state-tmp);
@@ -274,7 +274,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(out_data, r.out.out_data, r.in.len * sizeof(*out_data));
+ memcpy(out_data, r.out.out_data, (r.in.len) * sizeof(*out_data));
[SCM] Samba Shared Repository - branch v3-5-stable updated
The branch, v3-5-stable has been updated via 31c1722... VERSION: Set version to 3.5.0pre1. from c4e2824... WHATSNEW: Prepare 3.5.0pre1 release notes. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable - Log - commit 31c172264473241b7edf20e1dca80adf10ca7882 Author: Karolin Seeger ksee...@samba.org Date: Thu Nov 26 14:16:00 2009 +0100 VERSION: Set version to 3.5.0pre1. Karolin --- Summary of changes: source3/VERSION |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/VERSION b/source3/VERSION index 5296aff..b5bd528 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -46,7 +46,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # - 2.2.9pre1 # -SAMBA_VERSION_PRE_RELEASE= +SAMBA_VERSION_PRE_RELEASE=1 # For 'rc' releases the version will be# @@ -68,7 +68,7 @@ SAMBA_VERSION_RC_RELEASE= # e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes # # - 3.0.0-SVN-build-199 # -SAMBA_VERSION_IS_GIT_SNAPSHOT=yes +SAMBA_VERSION_IS_GIT_SNAPSHOT=no # This can be set by vendors if they want... # @@ -84,7 +84,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=yes # SAMBA_VERSION_VENDOR_FUNCTION # # # -SAMBA_VERSION_VENDOR_SUFFIX=devel +SAMBA_VERSION_VENDOR_SUFFIX= SAMBA_VERSION_VENDOR_PATCH= -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 6b86a0c... VERSION: Update version number. from c560443... WHATSNEW: Prepare 3.5.0pre1 release notes. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 6b86a0ca2253afa087143eb7839b51b390b4f764 Author: Karolin Seeger ksee...@samba.org Date: Thu Nov 26 14:41:31 2009 +0100 VERSION: Update version number. Karolin --- Summary of changes: source3/VERSION |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/VERSION b/source3/VERSION index 5296aff..9438dc8 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -46,7 +46,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # - 2.2.9pre1 # -SAMBA_VERSION_PRE_RELEASE= +SAMBA_VERSION_PRE_RELEASE=1 # For 'rc' releases the version will be# @@ -84,7 +84,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=yes # SAMBA_VERSION_VENDOR_FUNCTION # # # -SAMBA_VERSION_VENDOR_SUFFIX=devel +SAMBA_VERSION_VENDOR_SUFFIX=test SAMBA_VERSION_VENDOR_PATCH= -- Samba Shared Repository
svn commit: samba-web r1343 - in trunk: .
Author: kseeger Date: 2009-11-26 07:05:04 -0700 (Thu, 26 Nov 2009) New Revision: 1343 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1343 Log: Announce Samba 3.5.0pre1 Karolin Modified: trunk/index.html Changeset: Modified: trunk/index.html === --- trunk/index.html2009-11-17 21:40:59 UTC (rev 1342) +++ trunk/index.html2009-11-26 14:05:04 UTC (rev 1343) @@ -24,6 +24,21 @@ h2Latest News/h2 !--#include virtual=/samba/news/headlines.html -- +h426 November 2009/h4 + +p class=headlineSamba 3.5.0pre1 Available for Download/p + +pThe a href=/samba/ftp/pre/samba-3.5.0pre1.tar.gzSamba 3.5.0pre1 +source code/a can be downloaded now. This is the first preview release of +the Samba 3.5 series. It is emnot/em intended for use on production +servers. The a href=/samba/ftp/pre/samba-3.5.0pre1.tar.ascGnuPG +signature is for the emun/emcompressed tarball/a. +Please see the a href=/samba/ftp/pre/WHATSNEW-3-5-0pre1.txtRelease Notes/a +for more information on this release. +Precompiled packages will be made available on a volunteer basis and can be +found in the a href=/samba/ftp/Binary_Packages/Binary_Packages download +area/a./p + h4a name=latest29 October 2009/a/h4 p class=headlineSamba 3.4.3 Available for Download/p
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4d8118f... tevent: Fix a comment
from 49553d0... librpc: rerun make idl
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4d8118f145549bb8d4d0afce72eaefd4d60cbd99
Author: Volker Lendecke v...@samba.org
Date: Thu Nov 26 17:18:00 2009 +0100
tevent: Fix a comment
---
Summary of changes:
lib/tevent/tevent_internal.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
index 4e3b7b5..e10f52e 100644
--- a/lib/tevent/tevent_internal.h
+++ b/lib/tevent/tevent_internal.h
@@ -142,7 +142,7 @@ struct tevent_req {
struct tevent_immediate *trigger;
/**
-* @brief the timer event if tevent_req_set_timeout was used
+* @brief the timer event if tevent_req_set_endtime was used
*
*/
struct tevent_timer *timer;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via dbef841... tevent: Fix a comment
from 6b86a0c... VERSION: Update version number.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit dbef8410476bc1eaa8bd68f8996da97782e5b13f
Author: Volker Lendecke v...@samba.org
Date: Thu Nov 26 17:18:00 2009 +0100
tevent: Fix a comment
---
Summary of changes:
lib/tevent/tevent_internal.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
index 4e3b7b5..e10f52e 100644
--- a/lib/tevent/tevent_internal.h
+++ b/lib/tevent/tevent_internal.h
@@ -142,7 +142,7 @@ struct tevent_req {
struct tevent_immediate *trigger;
/**
-* @brief the timer event if tevent_req_set_timeout was used
+* @brief the timer event if tevent_req_set_endtime was used
*
*/
struct tevent_timer *timer;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4d0fca4... s3-winbind: properly include netlogon.idl in wbint.idl.
via 85b6461... s3-spoolss: pre cosmetics: reorder levels in
construct_printer_info levels.
from 4d8118f... tevent: Fix a comment
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4d0fca4472500b92cccff8de5a467fe09eb25455
Author: Günther Deschner g...@samba.org
Date: Thu Nov 26 18:58:36 2009 +0100
s3-winbind: properly include netlogon.idl in wbint.idl.
Guenther
commit 85b6461174fd43acd7360c79cebe9b73366a8ff9
Author: Günther Deschner g...@samba.org
Date: Thu Nov 26 18:57:24 2009 +0100
s3-spoolss: pre cosmetics: reorder levels in construct_printer_info levels.
Guenther
---
Summary of changes:
source3/librpc/gen_ndr/ndr_wbint.c |1 +
source3/librpc/gen_ndr/wbint.h |1 +
source3/librpc/idl/wbint.idl|2 +-
source3/rpc_server/srv_spoolss_nt.c | 208 +-
4 files changed, 107 insertions(+), 105 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/librpc/gen_ndr/ndr_wbint.c
b/source3/librpc/gen_ndr/ndr_wbint.c
index 7c6aac9..97b2976 100644
--- a/source3/librpc/gen_ndr/ndr_wbint.c
+++ b/source3/librpc/gen_ndr/ndr_wbint.c
@@ -4,6 +4,7 @@
#include librpc/gen_ndr/ndr_wbint.h
#include librpc/gen_ndr/ndr_lsa.h
+#include librpc/gen_ndr/ndr_netlogon.h
_PUBLIC_ enum ndr_err_code ndr_push_wbint_userinfo(struct ndr_push *ndr, int
ndr_flags, const struct wbint_userinfo *r)
{
if (ndr_flags NDR_SCALARS) {
diff --git a/source3/librpc/gen_ndr/wbint.h b/source3/librpc/gen_ndr/wbint.h
index 1c6cdbc..962a87e 100644
--- a/source3/librpc/gen_ndr/wbint.h
+++ b/source3/librpc/gen_ndr/wbint.h
@@ -5,6 +5,7 @@
#include libcli/util/ntstatus.h
#include librpc/gen_ndr/lsa.h
+#include librpc/gen_ndr/netlogon.h
#ifndef _HEADER_wbint
#define _HEADER_wbint
diff --git a/source3/librpc/idl/wbint.idl b/source3/librpc/idl/wbint.idl
index 1f0192e..e44f179 100644
--- a/source3/librpc/idl/wbint.idl
+++ b/source3/librpc/idl/wbint.idl
@@ -1,5 +1,5 @@
#include idl_types.h
-import lsa.idl;
+import lsa.idl, netlogon.idl;
[
uuid(bf09192c-ed60-4928-9dff-d0d7bcb03ed8),
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index bcc6f5f..55fc1c1 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -3781,6 +3781,110 @@ done:
}
/
+ * construct_printer_info1
+ * fill a spoolss_PrinterInfo1 struct
+/
+
+static WERROR construct_printer_info1(TALLOC_CTX *mem_ctx,
+ const NT_PRINTER_INFO_LEVEL *ntprinter,
+ uint32_t flags,
+ struct spoolss_PrinterInfo1 *r,
+ int snum)
+{
+ r-flags= flags;
+
+ r-description = talloc_asprintf(mem_ctx, %s,%s,%s,
+
ntprinter-info_2-printername,
+ ntprinter-info_2-drivername,
+ ntprinter-info_2-location);
+ W_ERROR_HAVE_NO_MEMORY(r-description);
+
+ if (*ntprinter-info_2-comment == '\0') {
+ r-comment = talloc_strdup(mem_ctx, lp_comment(snum));
+ } else {
+ r-comment = talloc_strdup(mem_ctx,
ntprinter-info_2-comment); /* saved comment */
+ }
+ W_ERROR_HAVE_NO_MEMORY(r-comment);
+
+ r-name = talloc_strdup(mem_ctx,
ntprinter-info_2-printername);
+ W_ERROR_HAVE_NO_MEMORY(r-name);
+
+ return WERR_OK;
+}
+
+/
+ * construct_printer_info2
+ * fill a spoolss_PrinterInfo2 struct
+/
+
+static WERROR construct_printer_info2(TALLOC_CTX *mem_ctx,
+ const NT_PRINTER_INFO_LEVEL *ntprinter,
+ struct spoolss_PrinterInfo2 *r,
+ int snum)
+{
+ int count;
+
+ print_status_struct status;
+
+ count = print_queue_length(snum, status);
+
+ r-servername = talloc_strdup(mem_ctx,
ntprinter-info_2-servername);
+ W_ERROR_HAVE_NO_MEMORY(r-servername);
+ r-printername = talloc_strdup(mem_ctx,
ntprinter-info_2-printername);
+ W_ERROR_HAVE_NO_MEMORY(r-printername);
+ r-sharename= talloc_strdup(mem_ctx, lp_servicename(snum));
+ W_ERROR_HAVE_NO_MEMORY(r-sharename);
+ r-portname
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 86f4536... s3-passdb: move some defines out of rpc headers (they really belong to passdb). from 4d0fca4... s3-winbind: properly include netlogon.idl in wbint.idl. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 86f4536b7a128922b5d5808557e70fa243442361 Author: Günther Deschner g...@samba.org Date: Thu Nov 26 18:15:39 2009 +0100 s3-passdb: move some defines out of rpc headers (they really belong to passdb). Guenther --- Summary of changes: source3/include/passdb.h | 15 +++ source3/include/rpc_misc.h | 16 2 files changed, 15 insertions(+), 16 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/passdb.h b/source3/include/passdb.h index c8e4bc2..9be2a69 100644 --- a/source3/include/passdb.h +++ b/source3/include/passdb.h @@ -23,6 +23,21 @@ #ifndef _PASSDB_H #define _PASSDB_H +/** + * Masks for mappings between unix uid and gid types and + * NT RIDS. + **/ + +#define BASE_RID (0x03E8L) + +/* Take the bottom bit. */ +#define RID_TYPE_MASK 1 +#define RID_MULTIPLIER 2 + +/* The two common types. */ +#define USER_RID_TYPE 0 +#define GROUP_RID_TYPE 1 + /* * bit flags representing initialized fields in struct samu */ diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h index 58ea916..e86c47f 100644 --- a/source3/include/rpc_misc.h +++ b/source3/include/rpc_misc.h @@ -66,22 +66,6 @@ #define BUILTIN_ALIAS_RID_PRE_2K_ACCESS (0x022aL) -/** - * Masks for mappings between unix uid and gid types and - * NT RIDS. - **/ - -#define BASE_RID (0x03E8L) - -/* Take the bottom bit. */ -#define RID_TYPE_MASK 1 -#define RID_MULTIPLIER 2 - -/* The two common types. */ -#define USER_RID_TYPE 0 -#define GROUP_RID_TYPE 1 - - /** * RPC policy handle used pretty much everywhere -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 3d679a3... s3-rpc: Avoid including every pipe's client and server stubs everywhere in samba. from 86f4536... s3-passdb: move some defines out of rpc headers (they really belong to passdb). http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3d679a3b5fc208d8521217f6a4b4d9037b609b9b Author: Günther Deschner g...@samba.org Date: Thu Nov 26 18:21:28 2009 +0100 s3-rpc: Avoid including every pipe's client and server stubs everywhere in samba. Guenther --- Summary of changes: source3/client/client.c |3 +- source3/include/includes.h |1 - source3/include/ntdomain.h |2 + source3/include/proto.h | 18 ++-- source3/include/rpc_client.h | 44 -- source3/lib/netapi/file.c|1 + source3/lib/netapi/getdc.c |1 + source3/lib/netapi/group.c |1 + source3/lib/netapi/joindomain.c |1 + source3/lib/netapi/localgroup.c |2 + source3/lib/netapi/netlogon.c|1 + source3/lib/netapi/samr.c|1 + source3/lib/netapi/serverinfo.c |1 + source3/lib/netapi/share.c |1 + source3/lib/netapi/shutdown.c|1 + source3/lib/netapi/user.c|1 + source3/libads/ldap_printer.c|1 + source3/libnet/libnet_dssync.c |1 + source3/libnet/libnet_join.c |2 + source3/libnet/libnet_samsync.c |1 + source3/libsmb/libsmb_dir.c |2 +- source3/libsmb/trusts_util.c |1 + source3/rpc_client/cli_lsarpc.c |1 + source3/rpc_client/cli_netlogon.c|1 + source3/rpc_client/cli_samr.c|1 + source3/rpc_client/cli_spoolss.c |2 +- source3/rpc_server/srv_dfs_nt.c |1 + source3/rpc_server/srv_dssetup_nt.c |1 + source3/rpc_server/srv_echo_nt.c |1 + source3/rpc_server/srv_eventlog_nt.c |1 + source3/rpc_server/srv_initshutdown_nt.c |2 + source3/rpc_server/srv_lsa_nt.c |1 + source3/rpc_server/srv_netlog_nt.c |1 + source3/rpc_server/srv_ntsvcs_nt.c |1 + source3/rpc_server/srv_samr_nt.c |1 + source3/rpc_server/srv_spoolss_nt.c |2 + source3/rpc_server/srv_srvsvc_nt.c |1 + source3/rpc_server/srv_svcctl_nt.c |1 + source3/rpc_server/srv_winreg_nt.c |1 + source3/rpc_server/srv_wkssvc_nt.c |1 + source3/rpcclient/cmd_dfs.c |1 + source3/rpcclient/cmd_drsuapi.c |1 + source3/rpcclient/cmd_dssetup.c |1 + source3/rpcclient/cmd_echo.c |1 + source3/rpcclient/cmd_epmapper.c |1 + source3/rpcclient/cmd_eventlog.c |1 + source3/rpcclient/cmd_lsarpc.c |1 + source3/rpcclient/cmd_netlogon.c |1 + source3/rpcclient/cmd_ntsvcs.c |1 + source3/rpcclient/cmd_samr.c |1 + source3/rpcclient/cmd_spoolss.c |1 + source3/rpcclient/cmd_srvsvc.c |1 + source3/rpcclient/cmd_test.c |1 + source3/rpcclient/cmd_wkssvc.c |1 + source3/rpcclient/rpcclient.c|1 + source3/smbd/lanman.c|2 + source3/smbd/process.c | 15 ++ source3/utils/net_ads.c |1 + source3/utils/net_dom.c |1 + source3/utils/net_rpc.c |7 + source3/utils/net_rpc_audit.c|1 + source3/utils/net_rpc_join.c |2 + source3/utils/net_rpc_printer.c |1 + source3/utils/net_rpc_registry.c |1 + source3/utils/net_rpc_rights.c |1 + source3/utils/net_rpc_service.c |2 +- source3/utils/net_rpc_sh_acct.c |1 + source3/utils/net_util.c |2 + source3/utils/smbtree.c |1 + source3/winbindd/winbindd_ads.c |1 + source3/winbindd/winbindd_cm.c |4 +++ source3/winbindd/winbindd_dual_srv.c |1 + source3/winbindd/winbindd_misc.c |1 + source3/winbindd/winbindd_pam.c |2 + source3/winbindd/winbindd_rpc.c |2 + 75 files changed, 109 insertions(+), 64 deletions(-) delete mode 100644 source3/include/rpc_client.h Changeset truncated at 500 lines: diff --git a/source3/client/client.c b/source3/client/client.c index 6773e6d..ca2f9a8 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -23,7 +23,8 @@ #include includes.h #include client/client_proto.h -#include include/rpc_client.h +#include
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 89e02ef... s3-smbd: no drsuapi server stubs yet in s3. Fixes the build, sorry. via 5d706a2... s3-rpc: running minimal_includes.pl on rpc_client and rpc_server. from 3d679a3... s3-rpc: Avoid including every pipe's client and server stubs everywhere in samba. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 89e02ef1f395d9662c20623bb81e40ba25d10bb4 Author: Günther Deschner g...@samba.org Date: Thu Nov 26 20:26:01 2009 +0100 s3-smbd: no drsuapi server stubs yet in s3. Fixes the build, sorry. Guenther commit 5d706a2fd4d5d0489b55d79250c68154600c4102 Author: Günther Deschner g...@samba.org Date: Thu Nov 26 20:17:07 2009 +0100 s3-rpc: running minimal_includes.pl on rpc_client and rpc_server. Guenther --- Summary of changes: source3/rpc_client/cli_pipe.c|2 -- source3/rpc_server/srv_initshutdown_nt.c |1 - source3/rpc_server/srv_netlog_nt.c |2 -- source3/rpc_server/srv_pipe.c|2 -- source3/smbd/process.c |1 - 5 files changed, 0 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 084bbef..5bfcba3 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -18,11 +18,9 @@ */ #include includes.h -#include ../libcli/auth/libcli_auth.h #include librpc/gen_ndr/cli_epmapper.h #include ../librpc/gen_ndr/ndr_schannel.h #include ../libcli/auth/schannel.h -#include ../libcli/auth/schannel_proto.h #include ../libcli/auth/spnego.h #undef DBGC_CLASS diff --git a/source3/rpc_server/srv_initshutdown_nt.c b/source3/rpc_server/srv_initshutdown_nt.c index 0425f82..858bd15 100644 --- a/source3/rpc_server/srv_initshutdown_nt.c +++ b/source3/rpc_server/srv_initshutdown_nt.c @@ -21,7 +21,6 @@ /* Implementation of registry functions. */ #include includes.h -#include regfio.h #include ../librpc/gen_ndr/srv_initshutdown.h #include ../librpc/gen_ndr/srv_winreg.h diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index 7854c44..8f4381c 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/rpc_server/srv_netlog_nt.c @@ -25,8 +25,6 @@ /* This is the implementation of the netlogon pipe. */ #include includes.h -#include ../libcli/auth/libcli_auth.h -#include ../libcli/auth/schannel_state.h #include ../libcli/auth/schannel.h #include ../librpc/gen_ndr/srv_netlogon.h diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index 90eb4f9..46f67f4 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -28,10 +28,8 @@ */ #include includes.h -#include ../libcli/auth/libcli_auth.h #include ../librpc/gen_ndr/ndr_schannel.h #include ../libcli/auth/schannel.h -#include ../libcli/auth/schannel_proto.h #include ../libcli/auth/spnego.h extern struct current_user current_user; diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 3c5cb53..15d89a5 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -21,7 +21,6 @@ #include includes.h #include smbd/globals.h #include ../librpc/gen_ndr/srv_dfs.h -#include ../librpc/gen_ndr/srv_drsuapi.h #include ../librpc/gen_ndr/srv_dssetup.h #include ../librpc/gen_ndr/srv_echo.h #include ../librpc/gen_ndr/srv_eventlog.h -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 54994ab... s3-smbd: no drsuapi server stubs yet in s3. Fixes the build, sorry. via 821e466... s3-rpc: running minimal_includes.pl on rpc_client and rpc_server. via 5b051c7... s3-rpc: Avoid including every pipe's client and server stubs everywhere in samba. via f583a0c... s3-passdb: move some defines out of rpc headers (they really belong to passdb). via b3bf9c6... s3-winbind: properly include netlogon.idl in wbint.idl. via 0509a99... s3-spoolss: pre cosmetics: reorder levels in construct_printer_info levels. via ec7929a... s3-kerberos: next step to resolve Bug #6929: build with recent heimdal. via a1a49c7... s4-smbtorture: refactor RPC-SAMR-LARGE-DC test a little more. via 358f3c3... s4-smbtorture: add torture_samr_context to carry some RPC-SAMR-X specifics. from dbef841... tevent: Fix a comment http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 54994ab1f681ca9c48afcf2bf983117e3890e688 Author: Günther Deschner g...@samba.org Date: Thu Nov 26 20:26:01 2009 +0100 s3-smbd: no drsuapi server stubs yet in s3. Fixes the build, sorry. Guenther (cherry picked from commit 89e02ef1f395d9662c20623bb81e40ba25d10bb4) commit 821e4667e6f496d97e52dd75475ef1a5eaa009cd Author: Günther Deschner g...@samba.org Date: Thu Nov 26 20:17:07 2009 +0100 s3-rpc: running minimal_includes.pl on rpc_client and rpc_server. Guenther (cherry picked from commit 5d706a2fd4d5d0489b55d79250c68154600c4102) commit 5b051c7accf5f88e46d86e9afa4da0e4152f0fd3 Author: Günther Deschner g...@samba.org Date: Thu Nov 26 18:21:28 2009 +0100 s3-rpc: Avoid including every pipe's client and server stubs everywhere in samba. Guenther (cherry picked from commit 3d679a3b5fc208d8521217f6a4b4d9037b609b9b) commit f583a0c75fd30aabec7728d574589f7c71370d91 Author: Günther Deschner g...@samba.org Date: Thu Nov 26 18:15:39 2009 +0100 s3-passdb: move some defines out of rpc headers (they really belong to passdb). Guenther (cherry picked from commit 86f4536b7a128922b5d5808557e70fa243442361) commit b3bf9c66e68722addd6bcd66d7cf5a9e17ff122f Author: Günther Deschner g...@samba.org Date: Thu Nov 26 18:58:36 2009 +0100 s3-winbind: properly include netlogon.idl in wbint.idl. Guenther (cherry picked from commit 4d0fca4472500b92cccff8de5a467fe09eb25455) commit 0509a99cbfa0bfed92a04f731056a475b670755c Author: Günther Deschner g...@samba.org Date: Thu Nov 26 18:57:24 2009 +0100 s3-spoolss: pre cosmetics: reorder levels in construct_printer_info levels. Guenther (cherry picked from commit 85b6461174fd43acd7360c79cebe9b73366a8ff9) commit ec7929a8c783d85a4d30b41b1a9152586bdf2132 Author: Günther Deschner g...@samba.org Date: Thu Nov 26 10:15:45 2009 +0100 s3-kerberos: next step to resolve Bug #6929: build with recent heimdal. Based on patch from Allan al...@archlinux.org. Also should fix the FreeBSD build on the buildfarm. Guenther (cherry picked from commit 5b3a32be97a37c119e837bdee8f049684565458c) commit a1a49c704b2496006abc8c759023f889dd7986fe Author: Günther Deschner g...@samba.org Date: Thu Nov 26 01:25:56 2009 +0100 s4-smbtorture: refactor RPC-SAMR-LARGE-DC test a little more. Guenther (cherry picked from commit 60419a0eb72c2e07c4b882727b2ccb01b73c52e6) commit 358f3c309b02eb4fee62be4ebbbab2b625cfe7e6 Author: Günther Deschner g...@samba.org Date: Thu Nov 26 00:32:47 2009 +0100 s4-smbtorture: add torture_samr_context to carry some RPC-SAMR-X specifics. Guenther (cherry picked from commit d22eb75a13a294cb31a3f253356853eab48b41d5) --- Summary of changes: nsswitch/winbind_krb5_locator.c |6 +- source3/client/client.c |3 +- source3/configure.in |6 +- source3/include/includes.h |1 - source3/include/ntdomain.h |2 + source3/include/passdb.h | 15 ++ source3/include/proto.h | 18 +-- source3/include/rpc_client.h | 44 -- source3/include/rpc_misc.h | 16 -- source3/lib/netapi/file.c|1 + source3/lib/netapi/getdc.c |1 + source3/lib/netapi/group.c |1 + source3/lib/netapi/joindomain.c |1 + source3/lib/netapi/localgroup.c |2 + source3/lib/netapi/netlogon.c|1 + source3/lib/netapi/samr.c|1 + source3/lib/netapi/serverinfo.c |1 + source3/lib/netapi/share.c |1 + source3/lib/netapi/shutdown.c|1 + source3/lib/netapi/user.c|1 +
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1a8f838... s3-kerberos: Fix Bug #6929: build with recent heimdal.
via 49e464c... s3-spoolss: use macros to fillup driver levels.
from 89e02ef... s3-smbd: no drsuapi server stubs yet in s3. Fixes the
build, sorry.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1a8f8382740e352a83133b8c49aaedd4716210cd
Author: Günther Deschner g...@samba.org
Date: Fri Nov 27 01:06:36 2009 +0100
s3-kerberos: Fix Bug #6929: build with recent heimdal.
Heimdal changed the KRB5_DEPRECATED define (which now may not take an
identifier
for activation) in new releases (like 1.3.1).
Guenther
commit 49e464cef5ed75976fcd6c544bffbd4391f3a1b6
Author: Günther Deschner g...@samba.org
Date: Thu Nov 26 23:46:50 2009 +0100
s3-spoolss: use macros to fillup driver levels.
Guenther
---
Summary of changes:
source3/configure.in| 19 +++
source3/libsmb/clikrb5.c|2 +-
source3/rpc_server/srv_spoolss_nt.c | 272 +++
3 files changed, 134 insertions(+), 159 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index 29016c5..693fe6a 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3362,6 +3362,25 @@ if test x$with_ads_support != xno; then
EXTRA_ALL_TARGETS=$EXTRA_ALL_TARGETS $WINBIND_KRB5_LOCATOR
fi
fi
+
+ # check for new heimdal KRB5_DEPRECATED handling
+
+ AC_CACHE_CHECK([for KRB5_DEPRECATED define taking an identifier],
+samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER,[
+AC_TRY_COMPILE(
+ [#define KRB5_DEPRECATED 1
+ #include krb5.h],
+ [void main(void) {}],
+ samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER=yes,
+ samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER=no)])
+
+ if test x$samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER = xyes; then
+AC_DEFINE(KRB5_DEPRECATED, 1,
+ [Whether to use deprecated krb5 interfaces])
+ else
+AC_DEFINE(KRB5_DEPRECATED,,
+ [Whether to use deprecated krb5 interfaces])
+ fi
fi
# Now we have determined whether we really want ADS support
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index 3da64d6..3dc8c64 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -21,7 +21,7 @@
*/
#define KRB5_PRIVATE1 /* this file uses PRIVATE interfaces! */
-#define KRB5_DEPRECATED 1 /* this file uses DEPRECATED interfaces! */
+/* this file uses DEPRECATED interfaces! */
#include includes.h
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index a40bb02..c704418 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -4537,6 +4537,24 @@ static const char
**string_array_from_driver_info(TALLOC_CTX *mem_ctx,
return array;
}
+#define FILL_DRIVER_STRING(mem_ctx, in, out) \
+ do { \
+ if (in strlen(in)) { \
+ out = talloc_strdup(mem_ctx, in); \
+ W_ERROR_HAVE_NO_MEMORY(out); \
+ } \
+ } while (0);
+
+#define FILL_DRIVER_UNC_STRING(mem_ctx, server, in, out) \
+ do { \
+ if (in strlen(in)) { \
+ out = talloc_asprintf(mem_ctx, %s%s, server, in);
\
+ } else { \
+ out = talloc_strdup(mem_ctx, ); \
+ } \
+ W_ERROR_HAVE_NO_MEMORY(out); \
+ } while (0);
+
/
* fill a spoolss_DriverInfo1 struct
/
@@ -4572,29 +4590,17 @@ static WERROR fill_printer_driver_info2(TALLOC_CTX
*mem_ctx,
r-architecture = talloc_strdup(mem_ctx, driver-architecture);
W_ERROR_HAVE_NO_MEMORY(r-architecture);
- if (strlen(driver-driver_path)) {
- r-driver_path = talloc_asprintf(mem_ctx, %s%s,
- cservername, driver-driver_path);
- } else {
- r-driver_path = talloc_strdup(mem_ctx, );
- }
- W_ERROR_HAVE_NO_MEMORY(r-driver_path);
+ FILL_DRIVER_UNC_STRING(mem_ctx, cservername,
+ driver-driver_path,
+ r-driver_path);
- if (strlen(driver-data_file)) {
- r-data_file= talloc_asprintf(mem_ctx, %s%s,
- cservername, driver-data_file);
- } else {
- r-data_file= talloc_strdup(mem_ctx, );
- }
- W_ERROR_HAVE_NO_MEMORY(r-data_file);
+ FILL_DRIVER_UNC_STRING(mem_ctx, cservername,
+ driver-data_file,
+
[SCM] CTDB repository - branch status-test-2 updated - ctdb-1.0.104-42-g937823c
The branch, status-test-2 has been updated via 937823cc73eb098230acff4b1583f6d01f26c21a (commit) via 0e6c06ac38fd82adf124d111717502055501974a (commit) via c278c798d41a35f58ca81f8f0e08e4dab51eba9b (commit) from 28d0648725e7de4e4d0e8569e3fbfb0fa1d7f934 (commit) http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=status-test-2 - Log - commit 937823cc73eb098230acff4b1583f6d01f26c21a Merge: 28d0648725e7de4e4d0e8569e3fbfb0fa1d7f934 0e6c06ac38fd82adf124d111717502055501974a Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Fri Nov 27 12:50:45 2009 +1100 Merge commit 'martins/status-test' into status-test-2 commit 0e6c06ac38fd82adf124d111717502055501974a Merge: 143f1fa3cc4588505e3992c601153ea08be8432d c278c798d41a35f58ca81f8f0e08e4dab51eba9b Author: Martin Schwenke mar...@meltin.net Date: Fri Nov 27 12:49:31 2009 +1100 Merge commit 'martins-svart/status-test-2' into status-test commit c278c798d41a35f58ca81f8f0e08e4dab51eba9b Author: Martin Schwenke mar...@meltin.net Date: Fri Nov 27 12:04:02 2009 +1100 Event script infrastructure: add reload event to check_options(). Signed-off-by: Martin Schwenke mar...@meltin.net --- Summary of changes: server/eventscript.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/server/eventscript.c b/server/eventscript.c index 2508542..2c30cb2 100644 --- a/server/eventscript.c +++ b/server/eventscript.c @@ -774,6 +774,7 @@ static bool check_options(enum ctdb_eventscript_call call, const char *options) case CTDB_EVENT_MONITOR: case CTDB_EVENT_STATUS: case CTDB_EVENT_SHUTDOWN: + case CTDB_EVENT_RELOAD: return count_words(options) == 0; case CTDB_EVENT_TAKE_IP: /* interface, IP address, netmask bits. */ -- CTDB repository
[SCM] CTDB repository - branch status-test-2 updated - ctdb-1.0.104-43-g50c2cae
The branch, status-test-2 has been updated via 50c2caed57c0520f506eaaeeb0bba2c272da6ef6 (commit) from 937823cc73eb098230acff4b1583f6d01f26c21a (commit) http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=status-test-2 - Log - commit 50c2caed57c0520f506eaaeeb0bba2c272da6ef6 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Fri Nov 27 13:28:31 2009 +1100 dont use talloc_steal() on a object that is already a child of ctdb. --- Summary of changes: server/eventscript.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/server/eventscript.c b/server/eventscript.c index 2c30cb2..2040253 100644 --- a/server/eventscript.c +++ b/server/eventscript.c @@ -241,7 +241,7 @@ int32_t ctdb_control_event_script_finished(struct ctdb_context *ctdb) talloc_free(ctdb-last_monitor_status_ctx); ctdb-last_monitor_status_ctx = NULL; } - ctdb-last_monitor_status_ctx = talloc_steal(ctdb, ctdb-current_monitor_status_ctx); + ctdb-last_monitor_status_ctx = ctdb-current_monitor_status_ctx); ctdb-current_monitor_status_ctx = NULL; return 0; -- CTDB repository
[SCM] CTDB repository - branch status-test-2 updated - ctdb-1.0.104-44-g16db488
The branch, status-test-2 has been updated via 16db4882635d84b8410a77e2ea8b08d0a257b0ab (commit) from 50c2caed57c0520f506eaaeeb0bba2c272da6ef6 (commit) http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=status-test-2 - Log - commit 16db4882635d84b8410a77e2ea8b08d0a257b0ab Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Fri Nov 27 13:35:39 2009 +1100 remove a stray ) so we compile --- Summary of changes: server/eventscript.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/server/eventscript.c b/server/eventscript.c index 2040253..1e06e18 100644 --- a/server/eventscript.c +++ b/server/eventscript.c @@ -241,7 +241,7 @@ int32_t ctdb_control_event_script_finished(struct ctdb_context *ctdb) talloc_free(ctdb-last_monitor_status_ctx); ctdb-last_monitor_status_ctx = NULL; } - ctdb-last_monitor_status_ctx = ctdb-current_monitor_status_ctx); + ctdb-last_monitor_status_ctx = ctdb-current_monitor_status_ctx; ctdb-current_monitor_status_ctx = NULL; return 0; -- CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f6ecb4e... s4-torture: fixed expected error codes for s4 in SMB2-LOCK via 0920e0b... s4-drstest: don't use getenv(LDB_URL) in test suites via d78921d... s4-pvfs: fixed access check failure in SFILEINFO test via d5387ed... s4-ldb: improve detection of whether the server has a GC port via 7ea485a... s4-ldb: better to test for valid arguments in ldb library than commandline via d3d7ca8... s4-smb2: SMB2 uses NT_STATUS_CANCELLED for cancelled locks via 7c158bd... s4-smb2: sequence numbers are not checked in SMB2_OP_CANCEL via 056473d... torture: fixed SMB2-LOCK valgrind error via 04f235a... s4-smb2: check for invalid SMB2 lock ranges via aa4c516... s4-smb2: check for an invalid lock flags combination via 61a278f... s4-install: fixed install path for python scripts via 8455a76... s4:upgradeprovision Rework update_machine_account_password() tranactions via e6c1608... s4:dsdb Don't segfault with ldb_transaction_prepare_commit() without begin() via 731f560... s4:upgradeprovision add 'exit $failed' to blackbox test via d1faf7c... s4:upgradeprovision Use mkdtemp to create unique tempoary directory names via 6f0f82f... s4:selftest Add tests for upgradeprovision via b9f9588... s4:upgradeprovision Rework script, and reset machine account pw via 2fd8314... s4:ldb Provide bindings for ldb_transaction_prepare_commit() via 09338e6... s4:provision Make setting the domain SID in the self join optional via 4a52ee3... Fix path to upgradeprovision via 44bc8ac... s4: Improve updateprovision via 81a21cb... s4: update What's new and explain how to upgrade a samba4 provision via b25a42d... s4: Rename the script from 1a8f838... s3-kerberos: Fix Bug #6929: build with recent heimdal. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f6ecb4efb063617771dfa519911ae8af069c0f9a Author: Andrew Tridgell tri...@samba.org Date: Fri Nov 27 14:54:22 2009 +1100 s4-torture: fixed expected error codes for s4 in SMB2-LOCK I think the error/success codes returned by windows for these tests are quite bogus. The ones s4 gives are much more reasonable. The locking ones returning NT_STATUS_SUCCESS could lead to data loss, as an application thinks it has a file locked correctly when it fact it doesn't, so it could do an unsafe modify. commit 0920e0b63b806c8ed4839271048dd4924ed02b2b Author: Andrew Tridgell tri...@samba.org Date: Fri Nov 27 14:42:05 2009 +1100 s4-drstest: don't use getenv(LDB_URL) in test suites I was stumped for a while as to why the drs test suite was failing for me. It turned out that it looked for LDB_URL in the environment, and used it if set. I had it set in my terminal, and it was happily munching on my sam.ldb while testing. Quite a cute bug really :-) commit d78921d78ca0a9211f044092b9a7f29bcfdd5397 Author: Andrew Tridgell tri...@samba.org Date: Fri Nov 27 14:22:29 2009 +1100 s4-pvfs: fixed access check failure in SFILEINFO test matching windows behaviour is not always the right thing to do! commit d5387edb88ce29ad1a6f864415c19486a20269af Author: Andrew Tridgell tri...@samba.org Date: Fri Nov 27 14:20:47 2009 +1100 s4-ldb: improve detection of whether the server has a GC port We were trying to open $SERVER:3268 regardless, which could result in creating a file called localdc1:3268, which led to subsequent test failures commit 7ea485a1d20c1bf41926ebb4b0ae8f37a2d909f7 Author: Andrew Tridgell tri...@samba.org Date: Fri Nov 27 14:18:39 2009 +1100 s4-ldb: better to test for valid arguments in ldb library than commandline We were testing for valid DNs in ldbrename in the command line tool. This hid a bug in the ldb library where we caught a bad DN in the objectclass module rather than in the main ldb code. It is better to do validation of the DNs passed on the command line in the library code, as this gives us more consistent error handling between the programming APIs for ldb and the command line. commit d3d7ca8eeab13c00705188102855525a21dd5345 Author: Andrew Tridgell tri...@samba.org Date: Thu Nov 26 17:38:50 2009 +1100 s4-smb2: SMB2 uses NT_STATUS_CANCELLED for cancelled locks commit 7c158bdb1d0e217e06f54d2e2cef12a5433d3578 Author: Andrew Tridgell tri...@samba.org Date: Thu Nov 26 17:38:11 2009 +1100 s4-smb2: sequence numbers are not checked in SMB2_OP_CANCEL commit 056473d58836ef3818e816f2d649ea35e7550264 Author: Andrew Tridgell tri...@samba.org Date: Thu Nov 26 17:03:20 2009 +1100 torture: fixed SMB2-LOCK valgrind error commit 04f235a9ebf45422c6ec2a971268c2c38dc081ad Author: Andrew Tridgell tri...@samba.org Date: Thu Nov 26 16:53:51 2009 +1100
[SCM] CTDB repository - branch status-test-2 updated - ctdb-1.0.104-45-ga1f37fd
The branch, status-test-2 has been updated via a1f37fdc5217e57d2d643d77a811afca747685e0 (commit) from 16db4882635d84b8410a77e2ea8b08d0a257b0ab (commit) http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=status-test-2 - Log - commit a1f37fdc5217e57d2d643d77a811afca747685e0 Author: Martin Schwenke mar...@meltin.net Date: Fri Nov 27 15:57:33 2009 +1100 Event scripts: functions file now intercepts status and setstatus. Signed-off-by: Martin Schwenke mar...@meltin.net --- Summary of changes: config/functions | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/config/functions b/config/functions index 93b50af..7265db9 100644 --- a/config/functions +++ b/config/functions @@ -607,3 +607,14 @@ service_fail_limit=1 ctdb_event=$1 ; shift cmd=$ctdb_event + +case $ctdb_event in +status) + ctdb_checkstatus + exit + ;; +setstatus) + ctdb_setstatus $@ + exit + ;; +esac -- CTDB repository
Build status as of Fri Nov 27 07:00:05 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-11-26 00:00:06.0 -0700 +++ /home/build/master/cache/broken_results.txt 2009-11-27 00:00:20.0 -0700 @@ -1,22 +1,22 @@ -Build status as of Thu Nov 26 07:00:05 2009 +Build status as of Fri Nov 27 07:00:05 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 3 1 0 +ccache 4 1 0 distcc 0 0 0 ldb 33 33 0 -libreplace 2 2 0 +libreplace 2 1 0 lorikeet 0 0 0 -pidl 2 2 0 -ppp 0 0 0 +pidl 23 22 0 +ppp 2 0 0 rsync33 11 0 samba-docs 0 0 0 samba-web0 0 0 samba_3_current 30 28 0 -samba_3_master 31 26 4 -samba_3_next 31 29 12 -samba_4_0_test 32 32 0 +samba_3_master 31 24 3 +samba_3_next 31 30 12 +samba_4_0_test 33 32 0 talloc 2 2 0 tdb 2 2 0
