[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-956-g48ba640
The branch, master has been updated
via 48ba64010046bece3b54009131f88c851ec82047 (commit)
via 6b8b7665bdbf47e70e0d6d904c1234c03321182d (commit)
from bb7e6f0f51a91e461c18efd392af3e4fc6174c34 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 48ba64010046bece3b54009131f88c851ec82047
Merge: 6b8b7665bdbf47e70e0d6d904c1234c03321182d
bb7e6f0f51a91e461c18efd392af3e4fc6174c34
Author: Andrew Bartlett
Date: Wed Feb 18 17:47:43 2009 +1100
Merge branch 'master' of ssh://git.samba.org/data/git/samba into
master-devel
commit 6b8b7665bdbf47e70e0d6d904c1234c03321182d
Author: Andrew Bartlett
Date: Wed Feb 18 17:44:07 2009 +1100
paper over failure to reprovision with os.unlink()
We need to figure out why the deletes on the database fail, but for
now doing an unlink of templates_tdb isn't too bad.
Andrew Bartlett
---
Summary of changes:
source4/scripting/python/samba/provision.py |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/provision.py
b/source4/scripting/python/samba/provision.py
index 10daf1b..a5b3e83 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -647,7 +647,8 @@ def setup_templatesdb(path, setup_path, session_info,
credentials, lp):
# Wipes the database
try:
templates_ldb.erase()
-except LdbError:
+# This should be 'except LdbError', but on a re-provision the assert in
ldb.erase fires, and we need to catch that too
+except:
os.unlink(path)
templates_ldb.load_ldif_file_add(setup_path("provision_templates_init.ldif"))
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-954-gbb7e6f0
The branch, master has been updated
via bb7e6f0f51a91e461c18efd392af3e4fc6174c34 (commit)
from b1ff79dbb246e717fc4a62c7a615ca7ce9ccc302 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit bb7e6f0f51a91e461c18efd392af3e4fc6174c34
Author: Andrew Tridgell
Date: Wed Feb 18 17:37:45 2009 +1100
Worked around a problem with select/poll/epoll and gnutls
Our packet layer relies on the event system reliably telling us when a
packet is available. When we are using a socket layer like TLS then
things get a bit trickier, as there may be bytes in the encryption
buffer which could be read even if there are no bytes at the socket
level. The GNUTLS library is supposed to prevent this happening by
always leaving some data at the socket level when there is data to be
processed in its buffers, but it seems that this is not always
reliable.
To work around this I have added a new packet option
packet_set_unreliable_select() which tells the packet layer to not
assume that the socket layer has a reliable select, and to instead
keep trying to read from the socket until it gets back no data. This
option is set for the ldap client and server when TLS is negotiated.
This seems to fix the problems with the ldaps tests.
---
Summary of changes:
source4/ldap_server/ldap_extended.c |1 +
source4/ldap_server/ldap_server.c |4 +++
source4/lib/stream/packet.c | 38 ++-
source4/lib/stream/packet.h |1 +
source4/libcli/ldap/ldap_client.c |4 +++
5 files changed, 47 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/ldap_server/ldap_extended.c
b/source4/ldap_server/ldap_extended.c
index 4479eab..66ab4ee 100644
--- a/source4/ldap_server/ldap_extended.c
+++ b/source4/ldap_server/ldap_extended.c
@@ -38,6 +38,7 @@ static void ldapsrv_start_tls(void *private_data)
ctx->conn->sockets.tls = ctx->tls_socket;
ctx->conn->connection->socket = ctx->tls_socket;
packet_set_socket(ctx->conn->packet, ctx->conn->connection->socket);
+ packet_set_unreliable_select(ctx->conn->packet);
}
static NTSTATUS ldapsrv_StartTLS(struct ldapsrv_call *call,
diff --git a/source4/ldap_server/ldap_server.c
b/source4/ldap_server/ldap_server.c
index 61ff387..da44c02 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -386,6 +386,10 @@ static void ldapsrv_accept(struct stream_connection *c)
packet_set_event_context(conn->packet, c->event.ctx);
packet_set_fde(conn->packet, c->event.fde);
packet_set_serialise(conn->packet);
+
+ if (conn->sockets.tls) {
+ packet_set_unreliable_select(conn->packet);
+ }
/* Ensure we don't get packets until the database is ready below */
packet_recv_disable(conn->packet);
diff --git a/source4/lib/stream/packet.c b/source4/lib/stream/packet.c
index f614e94..f5e2b84 100644
--- a/source4/lib/stream/packet.c
+++ b/source4/lib/stream/packet.c
@@ -47,6 +47,8 @@ struct packet_context {
bool busy;
bool destructor_called;
+ bool unreliable_select;
+
struct send_element {
struct send_element *next, *prev;
DATA_BLOB blob;
@@ -176,6 +178,21 @@ _PUBLIC_ void packet_set_nofree(struct packet_context *pc)
pc->nofree = true;
}
+/*
+ tell the packet system that select/poll/epoll on the underlying
+ socket may not be a reliable way to determine if data is available
+ for receive. This happens with underlying socket systems such as the
+ one implemented on top of GNUTLS, where there may be data in
+ encryption/compression buffers that could be received by
+ socket_recv(), while there is no data waiting at the real socket
+ level as seen by select/poll/epoll. The GNUTLS library is supposed
+ to cope with this by always leaving some data sitting in the socket
+ buffer, but it does not seem to be reliable.
+ */
+_PUBLIC_ void packet_set_unreliable_select(struct packet_context *pc)
+{
+ pc->unreliable_select = true;
+}
/*
tell the caller we have an error
@@ -230,6 +247,7 @@ _PUBLIC_ void packet_recv(struct packet_context *pc)
NTSTATUS status;
size_t nread = 0;
DATA_BLOB blob;
+ bool recv_retry = false;
if (pc->processing) {
EVENT_FD_NOT_READABLE(pc->fde);
@@ -269,6 +287,8 @@ _PUBLIC_ void packet_recv(struct packet_context *pc)
return;
}
+again:
+
if (npending + pc->num_read < npending) {
packet_error(pc, NT_STATUS_INVALID_PARAMETER);
return;
@@ -308,17 +328,33 @@ _PUBLIC_ void packet_recv(struct packet_context *pc)
packet_error(pc, status)
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-953-gb1ff79d
The branch, master has been updated
via b1ff79dbb246e717fc4a62c7a615ca7ce9ccc302 (commit)
from 0281166bb9bdf0015085b4f0a3049e7bf5036da2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b1ff79dbb246e717fc4a62c7a615ca7ce9ccc302
Author: Andrew Tridgell
Date: Wed Feb 18 14:46:57 2009 +1100
fixed some of the TLS problems
This fixes two things in the TLS support for Samba4. The first is to
use a somewhat more correct hostname instead of 'Samba' when
generating the test certificates. That allows TLS test clients (such
as gnutls-cli) to connect to Samba4 using auto-generated certificates.
The second fix is to add a call to gcry_control() to tell gcrypt to
use /dev/urandom instead of /dev/random (on systems that support
that). That means that test certificate generation is now very fast,
which was previously an impediment to putting the TLS tests on the
build farm.
---
Summary of changes:
source4/lib/tls/config.m4 |1 +
source4/lib/tls/tls.c | 10 --
source4/lib/tls/tlscert.c | 21 +
3 files changed, 22 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4
index 74c6bd1..0bafc5d 100644
--- a/source4/lib/tls/config.m4
+++ b/source4/lib/tls/config.m4
@@ -39,4 +39,5 @@ if test x$use_gnutls = xyes; then
AC_CHECK_TYPES([gnutls_datum],,,[#include "gnutls/gnutls.h"])
AC_CHECK_TYPES([gnutls_datum_t],,,[#include "gnutls/gnutls.h"])
AC_DEFINE(ENABLE_GNUTLS,1,[Whether we have gnutls support (SSL)])
+ AC_CHECK_HEADERS(gcrypt.h)
fi
diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c
index 99a1505..1014ab0 100644
--- a/source4/lib/tls/tls.c
+++ b/source4/lib/tls/tls.c
@@ -362,7 +362,7 @@ struct tls_params *tls_initialise(TALLOC_CTX *mem_ctx,
struct loadparm_context *
const char *cafile = lp_tls_cafile(tmp_ctx, lp_ctx);
const char *crlfile = lp_tls_crlfile(tmp_ctx, lp_ctx);
const char *dhpfile = lp_tls_dhpfile(tmp_ctx, lp_ctx);
- void tls_cert_generate(TALLOC_CTX *, const char *, const char *, const
char *);
+ void tls_cert_generate(TALLOC_CTX *, const char *, const char *, const
char *, const char *);
params = talloc(mem_ctx, struct tls_params);
if (params == NULL) {
talloc_free(tmp_ctx);
@@ -376,7 +376,13 @@ struct tls_params *tls_initialise(TALLOC_CTX *mem_ctx,
struct loadparm_context *
}
if (!file_exist(cafile)) {
- tls_cert_generate(params, keyfile, certfile, cafile);
+ char *hostname = talloc_asprintf(mem_ctx, "%s.%s",
+lp_netbios_name(lp_ctx),
lp_realm(lp_ctx));
+ if (hostname == NULL) {
+ goto init_failed;
+ }
+ tls_cert_generate(params, hostname, keyfile, certfile, cafile);
+ talloc_free(hostname);
}
ret = gnutls_global_init();
diff --git a/source4/lib/tls/tlscert.c b/source4/lib/tls/tlscert.c
index f2e79f2..62e7a72 100644
--- a/source4/lib/tls/tlscert.c
+++ b/source4/lib/tls/tlscert.c
@@ -24,21 +24,20 @@
#if ENABLE_GNUTLS
#include "gnutls/gnutls.h"
#include "gnutls/x509.h"
+#if HAVE_GCRYPT_H
+#include
+#endif
#define ORGANISATION_NAME "Samba Administration"
#define UNIT_NAME "Samba - temporary autogenerated certificate"
-#define COMMON_NAME "Samba"
#define LIFETIME 700*24*60*60
#define DH_BITS 1024
-void tls_cert_generate(TALLOC_CTX *mem_ctx,
- const char *keyfile, const char *certfile,
- const char *cafile);
-
/*
auto-generate a set of self signed certificates
*/
void tls_cert_generate(TALLOC_CTX *mem_ctx,
+ const char *hostname,
const char *keyfile, const char *certfile,
const char *cafile)
{
@@ -67,8 +66,14 @@ void tls_cert_generate(TALLOC_CTX *mem_ctx,
TLSCHECK(gnutls_global_init());
- DEBUG(0,("Attempting to autogenerate TLS self-signed keys for
https\n"));
+ DEBUG(0,("Attempting to autogenerate TLS self-signed keys for https for
hostname '%s'\n",
+hostname));
+#ifdef HAVE_GCRYPT_H
+ DEBUG(3,("Enabling QUICK mode in gcrypt\n"));
+ gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0);
+#endif
+
DEBUG(3,("Generating private key\n"));
TLSCHECK(gnutls_x509_privkey_init(&key));
TLSCHECK(gnutls_x509_privkey_generate(key, GNUTLS_PK_RSA, DH_BITS,
0));
@@ -87,7 +92,7 @@ void tls_cert_generate(TALLOC_CTX *mem_ctx,
UNIT_NAME, strlen(UNIT_NAME)));
TLSCHECK(gnutls_x509_crt_set_dn_by_
[SCM] CTDB repository - annotated tag ctdb-1.0.72 created - ctdb-1.0.72
The annotated tag, ctdb-1.0.72 has been created
at ac1b900b9550af2d233672b4af88dc97e6382c00 (tag)
tagging e1be8cb2dc32f56eabd537b658b47929818b8d01 (commit)
replaces ctdb-1.0.71
tagged by Ronnie Sahlberg
on Wed Feb 18 13:31:25 2009 +1100
- Log -
tag for 1.0.72
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQBJm3MN2aJ36aon/y8RAgvwAJ9KtCJGz+N2Eb+X07IurOHMvqSjgACfauzs
JuxSkUJXc0TsEGTOgI2c3Y4=
=y9n2
-END PGP SIGNATURE-
Martin Schwenke (63):
Complete rewrite of tools/onnode. Remove old tools/onnode.ssh,
Update Makefile.in for new version of onnode.
When in verbose mode with -p, each line is prefixed with the node
Merge commit 'origin/master' into martins
Signed-off-by: Martin Schwenke
Merge commit 'origin/master' into martins
Signed-off-by: Martin Schwenke
Signed-off-by: Martin Schwenke
Signed-off-by: Martin Schwenke
Merge commit 'origin/master' into martins
Minor documentation fixes.
Changes to onnode. Add "healthy" and "connected" as possible
onnode changes. "ok" is an alias for "healthy", "con" is an alias for
Document the new descriptive node specifications.
Merge commit 'origin/master' into martins
Merge commit 'origin/master' into martins
Merge commit 'origin/master' into martins
Merge branch 'master' into martins
Add some simple tests that can be run from within the tree.
Merge commit 'origin/master' into martins
Move tests/*.c to tests/src/*.c and adjust Makefile.in accordingly.
Incorporate temporary patch from Ronnie that adds --nopublicipcheck
New test 09_ctdb_ping.sh. Add documentation and command-line
4 new tests. Marked more ctdbd.sh tests as done - will remove this
4 new tests. Hacked function node_has_status to support
$PATH only inludes $CTDB_DIR/bin if we're using local sockets. Rename
ctdb_test_init now contains a trap to force ctdb_test_exit to be run
Merge commit 'origin/master' into martins
New test for getmonmode. Overload node_has_status some more to
When running with local daemons, provided there is more than 2 of
Merge commit 'origin/master' into martins
Merge commit 'origin/master' into martins
Merge commit 'origin/master' into martins
Added use of $ctdb_test_exit_hook to function ctdb_test_exit. Removed
Merge commit 'origin/master' into martins
Merge commit 'origin/master' into martins
Merge commit 'origin/master' into martins
With local daemons the sockets are now numbered starting from 0. Fix
Add message about restart to 18_ctdb_freeze.sh.
Merge commit 'origin/master' into martins
Rename $CTDB_NUM_NODES to $CTDB_TEST_NUM_DAEMONS and only set it if
Add a recovery to ctdb_test_exit to improve test stability.
3 new tests. 24_ctdb_getdbmap.sh is only 1/2 implemented but does
Merge commit 'origin/master' into martins
Finish 24_ctdb_getdbmap.sh. New test 25_dumpmemory.sh.
New test 26_ctdb_config_check_error_on_unreachable_ctdb.sh.
Merge commit 'origin/master' into martins
ctdb_test_env now sets $CTDB_TIMEOUT. Fixed
Bug fixes for ctdb_bench from Ronnie.
Remove bench.sh test and replace with new test 51_ctdb_bench.sh.
Remove old ctdbd.sh test script. Remove unneeded nodes.txt and
Delete some unstructured tests ({fetch,peristent,transaction}.sh) and
Merge commit 'origin/master' into martins
Add tests/README. ctdb_test_env and, therefore, run_tests can now be
Test binaries now go in tests/bin and ctdb_test_env now adds this
For now, make tests/run_tests.sh runs the new test suite. Add
Use $CTDB_TEST_WRAPPER in 51_ctdb_bench.sh.
Use $CTDB_TEST_WRAPPER in other tests that need it.
Remove the sorts from 06_ctdb_getpid.sh - the PIDs should be listed in
Git should ignore the test_trigger event script.
Merge commit 'origin/master' into martins
23_ctdb_moveip.sh sanity checks the list of IPs/nodes instead of
Make message in 62_ctdb_persistent_unsafe.sh more informative.
Ronnie Sahlberg (3):
add a licence file
Merge branch 'martins'
new version 1.0.72
root (1):
use netstat to check first and only fall back to netcat if netstat is
unavailable
---
--
CTDB repository
[SCM] CTDB repository - annotated tag ctdb-1.0.71 updated - ctdb-1.0.71
The annotated tag, ctdb-1.0.71 has been updated to 6815eecc894c2c6e4055fee982b1f4b36e193191 (tag) from 72e6025365ad2a62b6a32587a6366b77f36b90ad (which is now obsolete) tagging a6cdf9106074890b76d2eabe496af244e0134d31 (commit) replaces ctdb-1.0.70b tagged by Ronnie Sahlberg on Mon Feb 2 14:08:18 2009 +1100 - Log - tag for release 1.0.71 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBJhmOy2aJ36aon/y8RAvhDAJ9PXJCBwAgRWt1Oe35jA9n6hccjwgCaA3UX VrzD1nI0pbn38KXO83hBXjI= =Q28z -END PGP SIGNATURE- Michael Adam (22): functions: add detect_init_style(). ctdb.init: use detect_init_style() in the init script funcions: make (nice_)service a noop for empty service name events 50.samba: also support suse and ubuntu/debain systems ctdb.init: fix typo makerpms: fix detection of support for --rsyncable flag in gzip. Makefile: remove extra "/" in paths packaging(RPM): detect and use ccache if available events 50.samba: fix control of nmbd without separate nmb service script. Fix verification of IP allocation with ipv6 addresses on Linux. ctdb_sys_have_ip: fix ipv6 support for aix, too. ctdb_util: use the parse_ip() function - avoid code duplication Fix treatment of link local ipv6 addresses: set the scope id. events.d/41.httpd: fix a comment typo autoconf: Make sure the result of the mkdir_has_mode test gets cached. Fix the build on AIX: sys/socket.h needs to be included before ctdb.h packaging: add a maketarball script remove include from public ctdb.h ctdb_check_tcp_ports: cope with multiple locations of netcat or nc ctdb_check_tcp_ports: fail the check if neither netstat nor netcat/nc is found ctdb_check_tcp_ports: correctly detect listeners on ipv6 ::: w/out netcat add a simple test script to test ctdb_check_tcp_ports Ronnie Sahlberg (1): new version 1.0.71 Stefan Metzmacher (1): ctdb_sys_have_ip: don't overwrite input data (setting port to 0) --- -- CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.70b-91-ge1be8cb
The branch, master has been updated via e1be8cb2dc32f56eabd537b658b47929818b8d01 (commit) via fe4eea45c6b5702a794424037c3f2ab4241d5e5e (commit) via 4777b74b1e2eebe54cf27f3303f60e49023e7f6a (commit) via 03dfcf9f284c9926479a8dd4e5acf1f5d2b964aa (commit) via 4928718a346f086f1683c78d52b0bf009c1150a3 (commit) via 80dc86320dde7cc81db8c8fde97cfcbac7914920 (commit) via 4b97bdba3bc4df20efb1aae7d89a1e3430d35ca3 (commit) via 2912c1ade5db1e20bfa3a8017a702cc8a7da36f1 (commit) via 44ec4c57bf9928ef5d5cc117a6c2d92495dac489 (commit) via 5cdbef46b74e6a5ba2383ef025e69fe605fa4f6e (commit) via a497010f67d6a8e68f4d6d7e516b88d2261b1062 (commit) via 3ecce31d3a3f72b9fa851ac99291865c119e551e (commit) via 928c30213fb9f0c32d82995892ccdd8e054c9d6e (commit) via 33cdf3e4bcfadf8e20822ca352babf7acca16821 (commit) via 486ed3b5b483f1c12c2d978ec6564bd33a2c6aee (commit) via e627f8e5fe8e2e3ea423b7dbd12d74597fb4983b (commit) via 2c055831f0d56e42d055e1d72fb6f0db5f71def1 (commit) via 33afe9bae732e62994e5957ee143a9c49571898b (commit) via 099a1605574c7a8d232fd4c2d0c65e55aedeafad (commit) via a99204ad8bd4d3b15c8219762442682a3d1285cf (commit) via f5aeab0390b735291ee82359f50d508619211623 (commit) via da61a9822f66ff227b8859bf15ba76fd9afb9d12 (commit) via f90f6e19952d58b8590fe550ecf2308bd9b065dc (commit) via b7be3de004cb05dad05704096e2a75e128952b18 (commit) via 497c40f69e06776861a780500da1952eb7ea8fc1 (commit) via 4c5eb616f041e4a10d8f8b3251fc3db5a58e726f (commit) via 2a069118fee169460bdf68b9a639b0e96ac85266 (commit) via 86807e8b7b179cbe87e559fb3b1f02c8b1990dc4 (commit) via 674d1660e5602f2fab1eaf219a6b8b5ddf24c402 (commit) via b5eec91bd185c91a09b3f42ed26fee7b13a70d9d (commit) via 6cbe8923ead8226de1c20cfd8718e43fe8525ce1 (commit) via 23bffef2295772f5b795236d60b7fb6ea754b7fb (commit) via 2ecc701869c8bc2d823a8073453c6caf1575dc47 (commit) via 1b00fe0bac36422d30be167a009c452058975a21 (commit) via ec354d602d20700e6769deb798436d08256a49d5 (commit) via 3d59783c0e9478f4766c380945d6200fc654f5d9 (commit) via 4e1c079deb0aafb99d4114bb6504ff5ba1cbdeb4 (commit) via 4ff5875c965f21ab76a5924efd92f1832aeb36d4 (commit) via 805a426aaee5ecfc5bd1c097069fe58f8241dfe2 (commit) via a69545d7dec78eefb85a1598e5db4667cc210bf9 (commit) via e040a989096cf7d5c0cdece1713ff903cb7568f8 (commit) via c6fc68db9061547e73ec2b811e260bd7da7f58fa (commit) via 826e85fe5291067b8d0b9c22918d63024aa6141c (commit) via e5af1e4d945c25cd20d6fb5ef042e6de1aeda4a9 (commit) via 4c54772c5c2fa7d2a25963379b5b96caf0c2521c (commit) via e088116238eb107e9831fccbfd66c1db3d837a3b (commit) via eacb2ef82ea4809d874158756db973dd1e3fc8fc (commit) via f77a91c0828a79f99d0c422f7e09b17c69174907 (commit) via 9c392c9d18e2360360122b7356874fe5cc7cca64 (commit) via aea77353c5996510f09c72cddfb54894ad9048b0 (commit) via b3c431abb79a6c18464129695e482ebc84f3964d (commit) via 6a47302c43eaee93783d83fb976ffce8cdc78be2 (commit) via 05bdafed82106a0d8bfa53cd730eb3e1db68a51f (commit) via 16626eaf9c63adfe780e8f51f9cd97810647e731 (commit) via 19ccbc8a8fbc81b107fdc80afc802a107fc9fb84 (commit) via 79ad588d61a56a062c043eae6aba3370ec10ac61 (commit) via 8314a647d4bc38d9210c32d645d581f210b05cdc (commit) via 81dd4155e92fc9d11ac788a97a5fd3c50488cc80 (commit) via f2e6b7e9d130eba9132eddda1a5e244a542a23ed (commit) via 241971bb95e42a19c8a6d8641eb92b3827b79226 (commit) via 93214ddf89640d65710867fefb4fde094d4aa3a8 (commit) via 747650303b87e50ebc08ef7fa63011e4f19afc4f (commit) via 8119238d1fa672814a7591593b517c3c42859315 (commit) via 98f27a323e234214a161b5766f9c567f47b9dbb7 (commit) via 6b67f180668c7a05c941b4891bd2486601790165 (commit) from 59a04a50e64aae0a89b165d0428e23a8bcf8eb24 (commit) http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master - Log - commit e1be8cb2dc32f56eabd537b658b47929818b8d01 Author: Ronnie Sahlberg Date: Wed Feb 18 13:22:26 2009 +1100 new version 1.0.72 commit fe4eea45c6b5702a794424037c3f2ab4241d5e5e Merge: 59a04a50e64aae0a89b165d0428e23a8bcf8eb24 4777b74b1e2eebe54cf27f3303f60e49023e7f6a Author: Ronnie Sahlberg Date: Wed Feb 18 13:10:03 2009 +1100 Merge branch 'martins' commit 4777b74b1e2eebe54cf27f3303f60e49023e7f6a Author: Martin Schwenke Date: Fri Jan 16 15:50:33 2009 +1100 Make message in 62_ctdb_persistent_unsafe.sh more informative. Signed-off-by: Martin Schwenke commit 03dfcf9f284c9926479a8dd4e5acf1f5d2b964aa Author: Martin Schwenke Date: Fri Jan 16 15:12:40 2009 +1100 23_ctdb_moveip.sh sanity
Build status as of Wed Feb 18 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-02-17 00:00:08.0 + +++ /home/build/master/cache/broken_results.txt 2009-02-18 00:00:37.0 + @@ -1,4 +1,4 @@ -Build status as of Tue Feb 17 00:00:02 2009 +Build status as of Wed Feb 18 00:00:02 2009 Build counts: Tree Total Broken Panic @@ -11,12 +11,12 @@ lorikeet-heimdal 25 14 0 pidl 19 3 0 ppp 12 0 0 -rsync27 7 0 +rsync28 7 0 samba-docs 0 0 0 samba-gtk5 5 0 samba_3_X_devel 27 25 0 -samba_3_X_test 26 22 0 -samba_4_0_test 28 22 1 +samba_3_X_test 26 24 1 +samba_4_0_test 28 23 1 smb-build27 5 0 talloc 28 27 0 tdb 26 8 0
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4979-g8fd6dbc
The branch, v3-3-test has been updated
via 8fd6dbcd5a61c48953974bf1880375b9dd1c88d6 (commit)
from ca2c1eea4a766a3ee0d073520b19ce16f0586678 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 8fd6dbcd5a61c48953974bf1880375b9dd1c88d6
Author: Jeremy Allison
Date: Tue Feb 17 15:55:36 2009 -0800
Don't miss an absolute pathname as a kerberos keytab path. From Glenn
Machin .
Jeremy.
---
Summary of changes:
source/libsmb/clikrb5.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c
index da76c46..3851dce 100644
--- a/source/libsmb/clikrb5.c
+++ b/source/libsmb/clikrb5.c
@@ -1746,6 +1746,11 @@ done:
tmp += 5;
}
+ if (tmp[0] == '/') {
+ /* Treat as a FILE: keytab definition. */
+ found_valid_name = true;
+ }
+
if (found_valid_name) {
if (tmp[0] != '/') {
ret = KRB5_KT_BADNAME;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3473-g9974c09
The branch, v3-2-test has been updated
via 9974c09608d61244133eea8615c37184b0cac57b (commit)
from 47bbea27c8972ca320e90c7c678fe6da28a269f1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 9974c09608d61244133eea8615c37184b0cac57b
Author: Jeremy Allison
Date: Tue Feb 17 15:55:23 2009 -0800
Don't miss an absolute pathname as a kerberos keytab path. From Glenn
Machin .
Jeremy.
---
Summary of changes:
source/libsmb/clikrb5.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c
index 66dd5f6..9fd4914 100644
--- a/source/libsmb/clikrb5.c
+++ b/source/libsmb/clikrb5.c
@@ -1749,6 +1749,11 @@ done:
tmp += 5;
}
+ if (tmp[0] == '/') {
+ /* Treat as a FILE: keytab definition. */
+ found_valid_name = true;
+ }
+
if (found_valid_name) {
if (tmp[0] != '/') {
ret = KRB5_KT_BADNAME;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-952-g0281166
The branch, master has been updated
via 0281166bb9bdf0015085b4f0a3049e7bf5036da2 (commit)
from fab0baeed143464a152375c721c391d975e9b061 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0281166bb9bdf0015085b4f0a3049e7bf5036da2
Author: Jeremy Allison
Date: Tue Feb 17 15:54:33 2009 -0800
Don't miss an absolute pathname as a kerberos keytab path. From Glenn
Machin .
Jeremy.
---
Summary of changes:
source3/libsmb/clikrb5.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index a95a25c..168ca63 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -1756,6 +1756,11 @@ done:
tmp += 5;
}
+ if (tmp[0] == '/') {
+ /* Treat as a FILE: keytab definition. */
+ found_valid_name = true;
+ }
+
if (found_valid_name) {
if (tmp[0] != '/') {
ret = KRB5_KT_BADNAME;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-951-gfab0bae
The branch, master has been updated
via fab0baeed143464a152375c721c391d975e9b061 (commit)
from 3737b758d63dfae13b8aa537210663cf4c5effe8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit fab0baeed143464a152375c721c391d975e9b061
Author: Jeremy Allison
Date: Tue Feb 17 13:43:58 2009 -0800
Fix bug #6117 - Samba 3.3.0: pdbedit -a core dumps.
Jeremy.
---
Summary of changes:
source3/passdb/pdb_tdb.c | 13 -
1 files changed, 12 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index eab9110..143a2e2 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -357,7 +357,7 @@ static NTSTATUS tdbsam_getsampwrid (struct pdb_methods
*my_methods,
/* open the database */
if ( !tdbsam_open( tdbsam_filename ) ) {
- DEBUG(0,("tdbsam_getsampwnam: failed to open %s!\n",
tdbsam_filename));
+ DEBUG(0,("tdbsam_getsampwrid: failed to open %s!\n",
tdbsam_filename));
return NT_STATUS_ACCESS_DENIED;
}
@@ -400,6 +400,11 @@ static bool tdb_delete_samacct_only( struct samu *sam_pass
)
slprintf(keystr, sizeof(keystr)-1, "%s%s", USERPREFIX, name);
/* it's outaa here! 8^) */
+ if ( !tdbsam_open( tdbsam_filename ) ) {
+ DEBUG(0,("tdb_delete_samacct_only: failed to open %s!\n",
+tdbsam_filename));
+ return false;
+ }
status = dbwrap_delete_bystring(db_sam, keystr);
if (!NT_STATUS_IS_OK(status)) {
@@ -777,6 +782,12 @@ static bool tdbsam_new_rid(struct pdb_methods *methods,
uint32 *prid)
rid = BASE_RID; /* Default if not set */
+ if (!tdbsam_open(tdbsam_filename)) {
+ DEBUG(0,("tdbsam_new_rid: failed to open %s!\n",
+ tdbsam_filename));
+ return false;
+ }
+
if (dbwrap_change_uint32_atomic(db_sam, NEXT_RID_STRING, &rid, 1) != 0)
{
DEBUG(3, ("tdbsam_new_rid: Failed to increase %s\n",
NEXT_RID_STRING));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4978-gca2c1ee
The branch, v3-3-test has been updated
via ca2c1eea4a766a3ee0d073520b19ce16f0586678 (commit)
from 6934180fd37417f7bf9b8b107d9cecea1b683720 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit ca2c1eea4a766a3ee0d073520b19ce16f0586678
Author: Jeremy Allison
Date: Tue Feb 17 13:43:28 2009 -0800
Fix bug #6117 - Samba 3.3.0: pdbedit -a core dumps.
Jeremy.
---
Summary of changes:
source/passdb/pdb_tdb.c | 13 -
1 files changed, 12 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/passdb/pdb_tdb.c b/source/passdb/pdb_tdb.c
index eab9110..143a2e2 100644
--- a/source/passdb/pdb_tdb.c
+++ b/source/passdb/pdb_tdb.c
@@ -357,7 +357,7 @@ static NTSTATUS tdbsam_getsampwrid (struct pdb_methods
*my_methods,
/* open the database */
if ( !tdbsam_open( tdbsam_filename ) ) {
- DEBUG(0,("tdbsam_getsampwnam: failed to open %s!\n",
tdbsam_filename));
+ DEBUG(0,("tdbsam_getsampwrid: failed to open %s!\n",
tdbsam_filename));
return NT_STATUS_ACCESS_DENIED;
}
@@ -400,6 +400,11 @@ static bool tdb_delete_samacct_only( struct samu *sam_pass
)
slprintf(keystr, sizeof(keystr)-1, "%s%s", USERPREFIX, name);
/* it's outaa here! 8^) */
+ if ( !tdbsam_open( tdbsam_filename ) ) {
+ DEBUG(0,("tdb_delete_samacct_only: failed to open %s!\n",
+tdbsam_filename));
+ return false;
+ }
status = dbwrap_delete_bystring(db_sam, keystr);
if (!NT_STATUS_IS_OK(status)) {
@@ -777,6 +782,12 @@ static bool tdbsam_new_rid(struct pdb_methods *methods,
uint32 *prid)
rid = BASE_RID; /* Default if not set */
+ if (!tdbsam_open(tdbsam_filename)) {
+ DEBUG(0,("tdbsam_new_rid: failed to open %s!\n",
+ tdbsam_filename));
+ return false;
+ }
+
if (dbwrap_change_uint32_atomic(db_sam, NEXT_RID_STRING, &rid, 1) != 0)
{
DEBUG(3, ("tdbsam_new_rid: Failed to increase %s\n",
NEXT_RID_STRING));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-950-g3737b75
The branch, master has been updated via 3737b758d63dfae13b8aa537210663cf4c5effe8 (commit) from b1b9be46ab84382e1017a157fc8b85a1a2d441eb (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3737b758d63dfae13b8aa537210663cf4c5effe8 Author: Jeremy Allison Date: Tue Feb 17 13:18:10 2009 -0800 Fix warning about missmatch of uint32_t and size_t. Jeremy. --- Summary of changes: source3/lib/winbind_util.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/winbind_util.c b/source3/lib/winbind_util.c index f64a4d3..64f5fb4 100644 --- a/source3/lib/winbind_util.c +++ b/source3/lib/winbind_util.c @@ -306,7 +306,7 @@ bool winbind_get_sid_aliases(TALLOC_CTX *mem_ctx, struct wbcDomainSid *sid_list = NULL; size_t i; uint32_t * rids; - size_t num_rids; + uint32_t num_rids; memcpy(&domain_sid, dom_sid, sizeof(*dom_sid)); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-949-gb1b9be4
The branch, master has been updated via b1b9be46ab84382e1017a157fc8b85a1a2d441eb (commit) via 74940606f715bfc9d99ded2fb1d1da02d037609a (commit) via 2feaaa885a485adb11096cdfc3db223f3b73e1a6 (commit) via 08bef5bba042843cbfc41f1ed701243140dcf298 (commit) from 64cec9984346ce1c8aeb170cd55be6e7e6784919 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b1b9be46ab84382e1017a157fc8b85a1a2d441eb Author: Michael Adam Date: Tue Feb 17 08:59:27 2009 +0100 docs: extend the example in the idmp_rid manpage to configure 2 domains with rid Michael commit 74940606f715bfc9d99ded2fb1d1da02d037609a Author: Michael Adam Date: Tue Feb 17 08:51:39 2009 +0100 docs: extend the idmap_rid manpage Michael commit 2feaaa885a485adb11096cdfc3db223f3b73e1a6 Author: Michael Adam Date: Fri Feb 13 16:40:17 2009 +0100 s3:winbindd: make do_async_domain() static. Michael commit 08bef5bba042843cbfc41f1ed701243140dcf298 Author: Michael Adam Date: Fri Feb 13 13:02:23 2009 +0100 s3:build: improve the check for a working krb5-config. Not only check if it exists and is executable, but also check whether it accepts the command line "krb5-config --libs gssapi". Chris Hoogendyk has reported configure failing on a Solaris machine due to krb5-config raising errors on these options. Michael --- Summary of changes: docs-xml/manpages-3/idmap_rid.8.xml | 43 ++- source3/configure.in|2 +- source3/winbindd/winbindd_async.c | 12 +- source3/winbindd/winbindd_proto.h |6 - 4 files changed, 44 insertions(+), 19 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/idmap_rid.8.xml b/docs-xml/manpages-3/idmap_rid.8.xml index 5eba356..146c4b9 100644 --- a/docs-xml/manpages-3/idmap_rid.8.xml +++ b/docs-xml/manpages-3/idmap_rid.8.xml @@ -42,11 +42,13 @@ base_rid = INTEGER - Defines the base integer used to build SIDs out of an UID or a GID, - and to rebase the UID or GID to be obtained from a SID. User RIDs - by default start at 1000 (512 hexadecimal), this means a good value - for base_rid can be 1000 as the resulting ID is calculated this way: - ID = RID - BASE_RID + LOW RANGE ID. + Defines the base integer used to build SIDs out of a UID or a GID, + and to rebase the UID or GID to be obtained from a SID. + This means SIDs with a RID less than the base rid are filtered. + The default is not to restrict the allowed rids at all, + i.e. a base_rid value of 0. + A good value for the base_rid can be 1000, since user + RIDs by default start at 1000 (512 hexadecimal). Use of this parameter is deprecated. @@ -56,17 +58,46 @@ + THE MAPPING FORMULAS + + The Unix ID for a RID is calculated this way: + + ID = RID - BASE_RID + LOW_RANGE_ID. + + + + Correspondingly, the formula for calculationg the RID for a + given Unix ID is this: + + RID = ID + BASE_RID - LOW_RANGE_ID. + + + + + EXAMPLES - This example shows how to configure a domain with idmap_rid + + This example shows how to configure two domains with idmap_rid, + the principal domain and a trusted domain, leaving the default + id mapping scheme at tdb. The example also demonstrates the use + of the base_rid parameter for the trusted domain. + [global] + security = domain + workgroup = MAIN + idmap backend = tdb idmap uid = 100-199 idmap gid = 100-199 + idmap config MAIN : backend = rid + idmap config MAIN : range = 1 - 4 + idmap config TRUSTED : backend = rid idmap config TRUSTED : range= 5 - 9 + idmap config TRUSTED : base_rid = 1000 diff --git a/source3/configure.in b/source3/configure.in index 4a8d594..691d0a8 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -3185,7 +3185,7 @@ if test x"$with_ads_support" != x"no"; then # check for krb5-config from recent MIT and Heimdal kerberos 5 AC_PATH_PROG(KRB5CONFIG, krb5-config) AC_MSG_CHECKING(for working krb5-config) - if test -x "$KRB5CONFIG"; then + if test -x
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-945-g64cec99
The branch, master has been updated
via 64cec9984346ce1c8aeb170cd55be6e7e6784919 (commit)
via 9877f3d574392681ef121f8c9c038596f6d333dc (commit)
via 742270eb2dd521fa5010786536f000823fb67188 (commit)
via 41234af8c48db99b65a3c5a0e19874dc90e4af05 (commit)
via 055a047e7698d091f6abe2cc350e977aafd121fe (commit)
from df17774412b8a31880ec26f4a23c45ad1213ffdf (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 64cec9984346ce1c8aeb170cd55be6e7e6784919
Author: Günther Deschner
Date: Mon Feb 16 16:42:21 2009 +0100
s4-smbtorture: fix spoolss test after count out,ref idl changes.
Guenther
commit 9877f3d574392681ef121f8c9c038596f6d333dc
Author: Günther Deschner
Date: Mon Feb 16 16:41:48 2009 +0100
s4-spoolss: fix spoolss server after out,ref count pointer changes.
Guenther
commit 742270eb2dd521fa5010786536f000823fb67188
Author: Günther Deschner
Date: Mon Feb 16 16:40:54 2009 +0100
spoolss: fix spoolss helper for out ref count pointer.
Guenther
commit 41234af8c48db99b65a3c5a0e19874dc90e4af05
Author: Günther Deschner
Date: Tue Feb 17 16:15:32 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit 055a047e7698d091f6abe2cc350e977aafd121fe
Author: Günther Deschner
Date: Mon Feb 16 16:25:30 2009 +0100
spoolss: in enum-calls make [out] count a ref pointer.
Guenther
---
Summary of changes:
librpc/gen_ndr/cli_spoolss.c| 56 +-
librpc/gen_ndr/cli_spoolss.h| 28 ++--
librpc/gen_ndr/ndr_spoolss.c| 175 +--
librpc/gen_ndr/spoolss.h| 42 +++---
librpc/gen_ndr/srv_spoolss.c| 105 ++--
librpc/idl/spoolss.idl | 56 +-
librpc/ndr/ndr_spoolss_buf.c|6 +-
source4/ntptr/simple_ldb/ntptr_simple_ldb.c |9 +-
source4/rpc_server/spoolss/dcesrv_spoolss.c | 20 ++--
source4/torture/rpc/samba3rpc.c |4 +-
source4/torture/rpc/spoolss.c | 36 +--
source4/torture/rpc/spoolss_win.c |8 +-
12 files changed, 378 insertions(+), 167 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 0c70b83..72b5e2e 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -13,9 +13,9 @@ NTSTATUS rpccli_spoolss_EnumPrinters(struct rpc_pipe_client
*cli,
uint32_t level /* [in] */,
DATA_BLOB *buffer /* [in] [unique] */,
uint32_t offered /* [in] */,
-union spoolss_PrinterInfo *info /* [out]
[unique,switch_is(level),size_is(count)] */,
+uint32_t *count /* [out] [ref] */,
+union spoolss_PrinterInfo *info /* [out]
[unique,switch_is(level),size_is(*count)] */,
uint32_t *needed /* [out] [ref] */,
-uint32_t count /* [out] */,
WERROR *werror)
{
struct spoolss_EnumPrinters r;
@@ -51,11 +51,11 @@ NTSTATUS rpccli_spoolss_EnumPrinters(struct rpc_pipe_client
*cli,
}
/* Return variables */
+ *count = *r.out.count;
if (info && r.out.info) {
- memcpy(info, r.out.info, count * sizeof(*info));
+ memcpy(info, r.out.info, *count * sizeof(*info));
}
*needed = *r.out.needed;
- return NT_STATUS_NOT_SUPPORTED;
/* Return result */
if (werror) {
@@ -230,9 +230,9 @@ NTSTATUS rpccli_spoolss_EnumJobs(struct rpc_pipe_client
*cli,
uint32_t level /* [in] */,
DATA_BLOB *buffer /* [in] [unique] */,
uint32_t offered /* [in] */,
-union spoolss_JobInfo *info /* [out]
[unique,switch_is(level),size_is(count)] */,
+uint32_t *count /* [out] [ref] */,
+union spoolss_JobInfo *info /* [out]
[unique,switch_is(level),size_is(*count)] */,
uint32_t *needed /* [out] [ref] */,
-uint32_t count /* [out] */,
WERROR *werror)
{
struct spoolss_EnumJobs r;
@@ -269,11 +269,11 @@ NTSTATUS rpccli_spoolss_EnumJobs(struct rpc_pipe_client
*cli,
}
/* Return variables */
+ *count = *r.out.count;
if (info && r.out.info) {
- memcpy(info, r.out.info, count * sizeof(*info));
+ memcpy(info, r.out.info, *count
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4977-g6934180
The branch, v3-3-test has been updated
via 6934180fd37417f7bf9b8b107d9cecea1b683720 (commit)
from 3dc256ad0f1d2b1c131d67e033533dd316eab252 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 6934180fd37417f7bf9b8b107d9cecea1b683720
Author: Günther Deschner
Date: Tue Feb 17 15:42:06 2009 +0100
s3: remove duplicate prototypes for generated rpc server functions.
Guenther
---
Summary of changes:
source/include/includes.h |7 +
source/include/proto.h| 758 -
2 files changed, 7 insertions(+), 758 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/includes.h b/source/include/includes.h
index 65b4242..d95b821 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -792,6 +792,13 @@ enum flush_reason_enum {
#include "librpc/gen_ndr/srv_eventlog.h"
#include "librpc/gen_ndr/srv_winreg.h"
#include "librpc/gen_ndr/srv_initshutdown.h"
+#include "librpc/gen_ndr/srv_netlogon.h"
+#include "librpc/gen_ndr/srv_samr.h"
+#include "librpc/gen_ndr/srv_wkssvc.h"
+#include "librpc/gen_ndr/srv_srvsvc.h"
+#include "librpc/gen_ndr/srv_ntsvcs.h"
+#include "librpc/gen_ndr/srv_dssetup.h"
+#include "librpc/gen_ndr/srv_dfs.h"
/* automatically generated prototypes */
#ifndef NO_PROTO_H
diff --git a/source/include/proto.h b/source/include/proto.h
index fd712c0..716f177 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -8259,68 +8259,11 @@ bool svcctl_io_r_query_service_status_ex(const char
*desc, SVCCTL_R_QUERY_SERVIC
/* The following definitions come from rpc_server/srv_dfs_nt.c */
-void _dfs_GetManagerVersion(pipes_struct *p, struct dfs_GetManagerVersion *r);
-WERROR _dfs_Add(pipes_struct *p, struct dfs_Add *r);
-WERROR _dfs_Remove(pipes_struct *p, struct dfs_Remove *r);
-WERROR _dfs_Enum(pipes_struct *p, struct dfs_Enum *r);
-WERROR _dfs_GetInfo(pipes_struct *p, struct dfs_GetInfo *r);
-WERROR _dfs_SetInfo(pipes_struct *p, struct dfs_SetInfo *r);
-WERROR _dfs_Rename(pipes_struct *p, struct dfs_Rename *r);
-WERROR _dfs_Move(pipes_struct *p, struct dfs_Move *r);
-WERROR _dfs_ManagerGetConfigInfo(pipes_struct *p, struct
dfs_ManagerGetConfigInfo *r);
-WERROR _dfs_ManagerSendSiteInfo(pipes_struct *p, struct
dfs_ManagerSendSiteInfo *r);
-WERROR _dfs_AddFtRoot(pipes_struct *p, struct dfs_AddFtRoot *r);
-WERROR _dfs_RemoveFtRoot(pipes_struct *p, struct dfs_RemoveFtRoot *r);
-WERROR _dfs_AddStdRoot(pipes_struct *p, struct dfs_AddStdRoot *r);
-WERROR _dfs_RemoveStdRoot(pipes_struct *p, struct dfs_RemoveStdRoot *r);
-WERROR _dfs_ManagerInitialize(pipes_struct *p, struct dfs_ManagerInitialize
*r);
-WERROR _dfs_AddStdRootForced(pipes_struct *p, struct dfs_AddStdRootForced *r);
-WERROR _dfs_GetDcAddress(pipes_struct *p, struct dfs_GetDcAddress *r);
-WERROR _dfs_SetDcAddress(pipes_struct *p, struct dfs_SetDcAddress *r);
-WERROR _dfs_FlushFtTable(pipes_struct *p, struct dfs_FlushFtTable *r);
-WERROR _dfs_Add2(pipes_struct *p, struct dfs_Add2 *r);
-WERROR _dfs_Remove2(pipes_struct *p, struct dfs_Remove2 *r);
-WERROR _dfs_EnumEx(pipes_struct *p, struct dfs_EnumEx *r);
-WERROR _dfs_SetInfo2(pipes_struct *p, struct dfs_SetInfo2 *r);
/* The following definitions come from rpc_server/srv_dssetup_nt.c */
-WERROR _dssetup_DsRoleGetPrimaryDomainInformation(pipes_struct *p,
- struct
dssetup_DsRoleGetPrimaryDomainInformation *r);
-WERROR _dssetup_DsRoleDnsNameToFlatName(pipes_struct *p,
- struct dssetup_DsRoleDnsNameToFlatName
*r);
-WERROR _dssetup_DsRoleDcAsDc(pipes_struct *p,
-struct dssetup_DsRoleDcAsDc *r);
-WERROR _dssetup_DsRoleDcAsReplica(pipes_struct *p,
- struct dssetup_DsRoleDcAsReplica *r);
-WERROR _dssetup_DsRoleDemoteDc(pipes_struct *p,
- struct dssetup_DsRoleDemoteDc *r);
-WERROR _dssetup_DsRoleGetDcOperationProgress(pipes_struct *p,
-struct
dssetup_DsRoleGetDcOperationProgress *r);
-WERROR _dssetup_DsRoleGetDcOperationResults(pipes_struct *p,
- struct
dssetup_DsRoleGetDcOperationResults *r);
-WERROR _dssetup_DsRoleCancel(pipes_struct *p,
-struct dssetup_DsRoleCancel *r);
-WERROR _dssetup_DsRoleServerSaveStateForUpgrade(pipes_struct *p,
- struct
dssetup_DsRoleServerSaveStateForUpgrade *r);
-WERROR _dssetup_DsRoleUpgradeDownlevelServer(pipes_struct *p,
-struct
dssetup_DsRoleUpgradeDownlevelServer *r);
-WERROR _dssetup_DsRoleAbortDownlevelServerUpgrade(pipes_struct *p,
- struct
dsset
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3472-g47bbea2
The branch, v3-2-test has been updated
via 47bbea27c8972ca320e90c7c678fe6da28a269f1 (commit)
via e065eff98c9bd57155be824eef319f4c4d191e5e (commit)
via 9edecdaa12fa42a356008b90710475ad9a1ae581 (commit)
via 4a353efc45480d3de91f91f618135faf8eb0429e (commit)
from 37a29ad53eae02a29fbb0bf14731487328150d23 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 47bbea27c8972ca320e90c7c678fe6da28a269f1
Author: Stefan Metzmacher
Date: Tue Feb 17 10:28:37 2009 +0100
s3:make: use pidl/pidl for 'make idl'
metze
(cherry picked from commit 3dc256ad0f1d2b1c131d67e033533dd316eab252)
commit e065eff98c9bd57155be824eef319f4c4d191e5e
Author: Stefan Metzmacher
Date: Tue Feb 17 09:04:58 2009 +0100
librpc: rerun 'PIDL=pidl/pidl make idl'
metze
(cherry picked from commit eb1a2e4aea76462086a4303ba325c4da49e891cd)
commit 9edecdaa12fa42a356008b90710475ad9a1ae581
Author: Stefan Metzmacher
Date: Mon Feb 16 10:20:55 2009 +0100
s3:netlogon: implement _netr_LogonGetCapabilities() with
NT_STATUS_NOT_IMPLEMENTED
This hopefully fixes bug #6100.
metze
(cherry picked from commit fe417b29bd23b7b935669993e0f01de4c7de2378)
(cherry picked from commit 2f858cb914842e9af1331477ec6eb9782dbd0cf5)
commit 4a353efc45480d3de91f91f618135faf8eb0429e
Author: Stefan Metzmacher
Date: Mon Feb 16 10:42:43 2009 +0100
netlogon.idl: add idl for netr_LogonGetCapabilities()
metze
(cherry picked from commit 8339969ed39e4cf3577971869ef2fd127f1c3ae3)
(cherry picked from commit 5410134c70e3302c05b73109610c28dfa1a0dc69)
---
Summary of changes:
source/Makefile.in |4 +-
source/librpc/gen_ndr/cli_netlogon.c | 32 +++--
source/librpc/gen_ndr/cli_netlogon.h | 11 ++-
source/librpc/gen_ndr/ndr_netlogon.c | 221 +++--
source/librpc/gen_ndr/ndr_netlogon.h |5 +-
source/librpc/gen_ndr/netlogon.h | 18 +++-
source/librpc/gen_ndr/srv_netlogon.c | 24 +++--
source/librpc/gen_ndr/srv_netlogon.h |2 +-
source/librpc/idl/netlogon.idl | 13 ++-
source/rpc_server/srv_netlog_nt.c|7 +-
10 files changed, 289 insertions(+), 48 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index 7a30c04..a7ddf9c 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1153,8 +1153,10 @@ IDL_FILES = lsa.idl dfs.idl echo.idl winreg.idl
initshutdown.idl \
epmapper.idl messaging.idl xattr.idl misc.idl samr.idl security.idl \
dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl
+PIDL = "$(srcdir)/pidl/pidl"
+
idl::
- @IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" \
+ @IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" PIDL="$(PIDL)"\
srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS)
diff --git a/source/librpc/gen_ndr/cli_netlogon.c
b/source/librpc/gen_ndr/cli_netlogon.c
index f5b4715..e6b77ee 100644
--- a/source/librpc/gen_ndr/cli_netlogon.c
+++ b/source/librpc/gen_ndr/cli_netlogon.c
@@ -1107,24 +1107,34 @@ NTSTATUS rpccli_netr_DsRGetDCName(struct
rpc_pipe_client *cli,
return werror_to_ntstatus(r.out.result);
}
-NTSTATUS rpccli_netr_NETRLOGONDUMMYROUTINE1(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- WERROR *werror)
+NTSTATUS rpccli_netr_LogonGetCapabilities(struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx,
+ const char *server_name /* [in]
[charset(UTF16)] */,
+ const char *computer_name /* [in]
[unique,charset(UTF16)] */,
+ struct netr_Authenticator *credential
/* [in] [ref] */,
+ struct netr_Authenticator
*return_authenticator /* [in,out] [ref] */,
+ uint32_t query_level /* [in] */,
+ union netr_Capabilities *capabilities
/* [out] [ref,switch_is(query_level)] */)
{
- struct netr_NETRLOGONDUMMYROUTINE1 r;
+ struct netr_LogonGetCapabilities r;
NTSTATUS status;
/* In parameters */
+ r.in.server_name = server_name;
+ r.in.computer_name = computer_name;
+ r.in.credential = credential;
+ r.in.return_authenticator = return_authenticator;
+ r.in.query_level = query_level;
if (DEBUGLEVEL >= 10) {
- NDR_PRINT_IN_DEBUG(netr_NETRLOGONDUMMYROUTINE1, &r);
+ NDR_PRINT_IN_DEBUG(netr_LogonGetCapabilities, &r);
}
status = cli_do_rpc_ndr(cli,
mem_ctx,
PI_N
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-940-gdf17774
The branch, master has been updated
via df17774412b8a31880ec26f4a23c45ad1213ffdf (commit)
via ce71a7c9a753b8f2ec45ba35a5c46c78cacf6739 (commit)
via c1f8ee5cba180d23a3226dec1d69ee248b0fbcd0 (commit)
via 4b353c713858081452cd1cd9c56565022cebc776 (commit)
from dc7f04aac78579edcd171bfcb9de901444c6c819 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit df17774412b8a31880ec26f4a23c45ad1213ffdf
Author: Günther Deschner
Date: Tue Feb 17 04:29:27 2009 +0100
s3-spoolss: remove old spoolss_ResetPrinter.
Guenther
commit ce71a7c9a753b8f2ec45ba35a5c46c78cacf6739
Author: Günther Deschner
Date: Tue Feb 17 04:28:54 2009 +0100
s3-spoolss: use pidl for _spoolss_ResetPrinter.
Guenther
commit c1f8ee5cba180d23a3226dec1d69ee248b0fbcd0
Author: Günther Deschner
Date: Tue Feb 17 10:52:04 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit 4b353c713858081452cd1cd9c56565022cebc776
Author: Günther Deschner
Date: Tue Feb 17 10:47:35 2009 +0100
spoolss: fill in spoolss_ResetPrinter.
Guenther
---
Summary of changes:
librpc/gen_ndr/cli_spoolss.c|6 +++
librpc/gen_ndr/cli_spoolss.h|3 ++
librpc/gen_ndr/ndr_spoolss.c| 65 +++
librpc/gen_ndr/spoolss.h|6 +++
librpc/idl/spoolss.idl |5 ++-
source3/include/proto.h |3 --
source3/include/rpc_spoolss.h | 17 -
source3/rpc_parse/parse_spoolss.c | 42 --
source3/rpc_server/srv_spoolss.c| 22 +---
source3/rpc_server/srv_spoolss_nt.c | 26 +-
10 files changed, 94 insertions(+), 101 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 709aeba..0c70b83 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -2472,12 +2472,18 @@ NTSTATUS rpccli_spoolss_EnumPrintProcDataTypes(struct
rpc_pipe_client *cli,
NTSTATUS rpccli_spoolss_ResetPrinter(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
+struct policy_handle *handle /* [in] [ref]
*/,
+const char *data_type /* [in]
[unique,charset(UTF16)] */,
+struct spoolss_DevmodeContainer
*devmode_ctr /* [in] [ref] */,
WERROR *werror)
{
struct spoolss_ResetPrinter r;
NTSTATUS status;
/* In parameters */
+ r.in.handle = handle;
+ r.in.data_type = data_type;
+ r.in.devmode_ctr = devmode_ctr;
if (DEBUGLEVEL >= 10) {
NDR_PRINT_IN_DEBUG(spoolss_ResetPrinter, &r);
diff --git a/librpc/gen_ndr/cli_spoolss.h b/librpc/gen_ndr/cli_spoolss.h
index 8e0c725..80795c3 100644
--- a/librpc/gen_ndr/cli_spoolss.h
+++ b/librpc/gen_ndr/cli_spoolss.h
@@ -312,6 +312,9 @@ NTSTATUS rpccli_spoolss_EnumPrintProcDataTypes(struct
rpc_pipe_client *cli,
WERROR *werror);
NTSTATUS rpccli_spoolss_ResetPrinter(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
+struct policy_handle *handle /* [in] [ref]
*/,
+const char *data_type /* [in]
[unique,charset(UTF16)] */,
+struct spoolss_DevmodeContainer
*devmode_ctr /* [in] [ref] */,
WERROR *werror);
NTSTATUS rpccli_spoolss_GetPrinterDriver2(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index 5446277..fe1d733 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -17319,6 +17319,21 @@ _PUBLIC_ void
ndr_print_spoolss_EnumPrintProcDataTypes(struct ndr_print *ndr, co
static enum ndr_err_code ndr_push_spoolss_ResetPrinter(struct ndr_push *ndr,
int flags, const struct spoolss_ResetPrinter *r)
{
if (flags & NDR_IN) {
+ if (r->in.handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
+ NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS,
r->in.handle));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.data_type));
+ if (r->in.data_type) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->in.data_type, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->in.data_type, CH_UTF16)));
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4976-g3dc256a
The branch, v3-3-test has been updated via 3dc256ad0f1d2b1c131d67e033533dd316eab252 (commit) via 9d56f847b6fb88ab0529fdc6318dff5389c9d3db (commit) via eb1a2e4aea76462086a4303ba325c4da49e891cd (commit) via 2f858cb914842e9af1331477ec6eb9782dbd0cf5 (commit) via 5410134c70e3302c05b73109610c28dfa1a0dc69 (commit) from 1cbfcd7dcb90c117fa623246d6924e157ec5be3f (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 3dc256ad0f1d2b1c131d67e033533dd316eab252 Author: Stefan Metzmacher Date: Tue Feb 17 10:28:37 2009 +0100 s3:make: use pidl/pidl for 'make idl' metze commit 9d56f847b6fb88ab0529fdc6318dff5389c9d3db Author: Stefan Metzmacher Date: Tue Feb 17 10:28:04 2009 +0100 fix proto.h after idl changes metze commit eb1a2e4aea76462086a4303ba325c4da49e891cd Author: Stefan Metzmacher Date: Tue Feb 17 09:04:58 2009 +0100 librpc: rerun 'PIDL=pidl/pidl make idl' metze commit 2f858cb914842e9af1331477ec6eb9782dbd0cf5 Author: Stefan Metzmacher Date: Mon Feb 16 10:20:55 2009 +0100 s3:netlogon: implement _netr_LogonGetCapabilities() with NT_STATUS_NOT_IMPLEMENTED This hopefully fixes bug #6100. metze (cherry picked from commit fe417b29bd23b7b935669993e0f01de4c7de2378) commit 5410134c70e3302c05b73109610c28dfa1a0dc69 Author: Stefan Metzmacher Date: Mon Feb 16 10:42:43 2009 +0100 netlogon.idl: add idl for netr_LogonGetCapabilities() metze (cherry picked from commit 8339969ed39e4cf3577971869ef2fd127f1c3ae3) --- Summary of changes: source/Makefile.in |4 +- source/include/proto.h |6 +- source/librpc/gen_ndr/cli_netlogon.c | 32 +++-- source/librpc/gen_ndr/cli_netlogon.h | 11 ++- source/librpc/gen_ndr/ndr_netlogon.c | 221 +++-- source/librpc/gen_ndr/ndr_netlogon.h |5 +- source/librpc/gen_ndr/netlogon.h | 18 +++- source/librpc/gen_ndr/srv_netlogon.c | 24 +++-- source/librpc/gen_ndr/srv_netlogon.h |2 +- source/librpc/idl/netlogon.idl | 13 ++- source/rpc_server/srv_netlog_nt.c|7 +- 11 files changed, 292 insertions(+), 51 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 5fe1ead..a77ec48 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1201,8 +1201,10 @@ IDL_FILES = lsa.idl dfs.idl echo.idl winreg.idl initshutdown.idl \ dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl drsuapi.idl drsblobs.idl \ nbt.idl +PIDL = "$(srcdir)/pidl/pidl" + idl:: - @IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" \ + @IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" PIDL="$(PIDL)"\ srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS) diff --git a/source/include/proto.h b/source/include/proto.h index 04ceb83..fd712c0 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -2968,7 +2968,7 @@ _PUBLIC_ void ndr_print_netr_DatabaseRedo(struct ndr_print *ndr, const char *nam _PUBLIC_ void ndr_print_netr_LogonControl2Ex(struct ndr_print *ndr, const char *name, int flags, const struct netr_LogonControl2Ex *r); _PUBLIC_ void ndr_print_netr_NetrEnumerateTrustedDomains(struct ndr_print *ndr, const char *name, int flags, const struct netr_NetrEnumerateTrustedDomains *r); _PUBLIC_ void ndr_print_netr_DsRGetDCName(struct ndr_print *ndr, const char *name, int flags, const struct netr_DsRGetDCName *r); -_PUBLIC_ void ndr_print_netr_NETRLOGONDUMMYROUTINE1(struct ndr_print *ndr, const char *name, int flags, const struct netr_NETRLOGONDUMMYROUTINE1 *r); +_PUBLIC_ void ndr_print_netr_Capabilities(struct ndr_print *ndr, const char *name, const union netr_Capabilities *r); _PUBLIC_ void ndr_print_netr_NETRLOGONSETSERVICEBITS(struct ndr_print *ndr, const char *name, int flags, const struct netr_NETRLOGONSETSERVICEBITS *r); _PUBLIC_ void ndr_print_netr_LogonGetTrustRid(struct ndr_print *ndr, const char *name, int flags, const struct netr_LogonGetTrustRid *r); _PUBLIC_ void ndr_print_netr_NETRLOGONCOMPUTESERVERDIGEST(struct ndr_print *ndr, const char *name, int flags, const struct netr_NETRLOGONCOMPUTESERVERDIGEST *r); @@ -8547,8 +8547,8 @@ WERROR _netr_LogonControl2Ex(pipes_struct *p, struct netr_LogonControl2Ex *r); WERROR _netr_DsRGetDCName(pipes_struct *p, struct netr_DsRGetDCName *r); -WERROR _netr_NETRLOGONDUMMYROUTINE1(pipes_struct *p, - struct netr_NETRLOGONDUMMYROUTINE1 *r); +NTSTATUS _netr_LogonGetCapabilities(pipes_struct *p, + struct netr_LogonGetCapabilities *r); WERROR _netr_NETRLOGONSETSERVICEBITS(pipes_struct *p, struct netr_
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-936-gdc7f04a
The branch, master has been updated via dc7f04aac78579edcd171bfcb9de901444c6c819 (commit) via ea192f08e609fa4c4a48df1b27874b9ae2c1fa40 (commit) from 612c5e746bd4d0059eb8bcb8dbb4944db155f071 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit dc7f04aac78579edcd171bfcb9de901444c6c819 Author: Günther Deschner Date: Tue Feb 17 10:14:58 2009 +0100 s3-netapi: fix Coverity #881 and #882. Guenther commit ea192f08e609fa4c4a48df1b27874b9ae2c1fa40 Author: Volker Lendecke Date: Sat Feb 14 18:01:20 2009 +0100 Fix an invalid typecasting entry->num_of_strings is a uint16_t. Casting it with (int *)&entry->num_of_strings is wrong, because it gives add_string_to_array the illusion that the object "num" points to is an int, which it is not. In case we are running on a machine where "int" is 32 or 64 bits long, what happens with that cast? "add_string_to_array" interprets the byte field that starts where "num_of_strings" starts as an int. Under very particular circumstances this might work in a limited number of cases: When the byte order of an int is such that the lower order bits of the int are stored first, the subsequent bytes which do not belong to the uint16_t anymore happen to be 0 and the result of the increment still fits into the first 2 bytes of that int, i.e. the result is < 65536. The correct solution to this problem is to use the implicit type conversion that happens when an assignment is done. BTW, this bug is found if you compile with -O3 -Wall, it shows up as a warning: rpc_server/srv_eventlog_lib.c:574: warning: dereferencing type-punned pointer will break strict-aliasing rules Thanks, Volker --- Summary of changes: source3/lib/netapi/serverinfo.c | 63 + source3/rpc_server/srv_eventlog_lib.c |8 - 2 files changed, 63 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c index 02396a7..72ceec0 100644 --- a/source3/lib/netapi/serverinfo.c +++ b/source3/lib/netapi/serverinfo.c @@ -98,7 +98,6 @@ static NTSTATUS map_server_info_to_SERVER_INFO_buffer(TALLOC_CTX *mem_ctx, struct SERVER_INFO_403 i403; struct SERVER_INFO_502 i502; struct SERVER_INFO_503 i503; - struct SERVER_INFO_598 i598; struct SERVER_INFO_599 i599; struct SERVER_INFO_1005 i1005; #if 0 @@ -396,13 +395,63 @@ static NTSTATUS map_server_info_to_SERVER_INFO_buffer(TALLOC_CTX *mem_ctx, &num_info); break; - case 598: - ADD_TO_ARRAY(mem_ctx, struct SERVER_INFO_598, i598, -(struct SERVER_INFO_598 **)buffer, -&num_info); - break; - case 599: + i599.sv599_sessopens= i->info599->sessopen; + i599.sv599_opensearch = i->info599->opensearch; + i599.sv599_sizreqbuf= i->info599->sizereqbufs; + i599.sv599_initworkitems= i->info599->initworkitems; + i599.sv599_maxworkitems = i->info599->maxworkitems; + i599.sv599_rawworkitems = i->info599->rawworkitems; + i599.sv599_irpstacksize = i->info599->irpstacksize; + i599.sv599_maxrawbuflen = i->info599->maxrawbuflen; + i599.sv599_sessusers= i->info599->sessusers; + i599.sv599_sessconns= i->info599->sessconns; + i599.sv599_maxpagedmemoryusage = i->info599->maxpagedmemoryusage; + i599.sv599_maxnonpagedmemoryusage = i->info599->maxnonpagedmemoryusage; + i599.sv599_enablesoftcompat = i->info599->enablesoftcompat; + i599.sv599_enableforcedlogoff = i->info599->enableforcedlogoff; + i599.sv599_timesource = i->info599->timesource; + i599.sv599_acceptdownlevelapis = i->info599->acceptdownlevelapis; + i599.sv599_lmannounce = i->info599->lmannounce; + i599.sv599_domain = talloc_strdup(mem_ctx, i->info599->domain); + i599.sv599_maxcopyreadlen = i->info599->maxcopyreadlen; + i599.sv599_maxcopywritelen = i->info599->maxcopywritelen; + i599.sv599_minkeepsearch= i->info599->minkeeps
[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0-101-gda7b6f4
The branch, v3-3-stable has been updated via da7b6f498b725f675bc9e7b4b4f0ba27e3d82941 (commit) via 279582536456ff49c08039873cfc43d1a350013d (commit) via a9fcb593fd0b8a2e9d27870515a5470072672686 (commit) from 0cc465a5086418a90dc7b64894ef33bf4d1ae16e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable - Log - commit da7b6f498b725f675bc9e7b4b4f0ba27e3d82941 Author: Günther Deschner Date: Fri Oct 31 22:39:25 2008 +0100 s3-accessmask: re-run make samba3-idl and remove duplicate copies. Guenther (cherry picked from commit 1cbfcd7dcb90c117fa623246d6924e157ec5be3f) commit 279582536456ff49c08039873cfc43d1a350013d Author: Günther Deschner Date: Tue Feb 17 02:43:12 2009 +0100 s3: re-run make idl. No panic, this just removes the NDR_BUFFER flag from ndr functions when there is no buffer to process. Guenther (cherry picked from commit b424555c5a876b3eb71ec2346e73bd2b6a56a7ea) commit a9fcb593fd0b8a2e9d27870515a5470072672686 Author: Günther Deschner Date: Tue Feb 17 02:35:00 2009 +0100 pidl: add copy of pidl to 3-3-test in order to regenerate librpc code. pidl's reference is 79190992b3820cd028c961c48bdea9b35baf13c9 here. Guenther (cherry picked from commit 55d1dacf4d49abcaace17a5f8a200c319e0389eb) --- Summary of changes: source/include/rpc_secdes.h| 15 - source/librpc/gen_ndr/ndr_dfs.c| 12 +- source/librpc/gen_ndr/ndr_epmapper.c | 48 +- source/librpc/gen_ndr/ndr_eventlog.c | 32 +- source/librpc/gen_ndr/ndr_lsa.c| 242 +- source/librpc/gen_ndr/ndr_netlogon.c | 64 +- source/librpc/gen_ndr/ndr_srvsvc.c | 12 +- source/librpc/gen_ndr/ndr_svcctl.c | 176 +- source/librpc/gen_ndr/ndr_winreg.c | 124 +- source/librpc/gen_ndr/security.h |6 + source/pidl/MANIFEST | 43 + source/pidl/META.yml | 18 + source/pidl/Makefile.PL| 17 + source/pidl/README | 64 + source/pidl/TODO | 47 + source/pidl/config.m4 |9 + source/pidl/config.mk | 31 + source/pidl/expr.yp| 150 ++ source/pidl/idl.yp | 497 source/pidl/lib/Parse/Pidl.pm | 38 + source/pidl/lib/Parse/Pidl/CUtil.pm| 52 + source/pidl/lib/Parse/Pidl/Compat.pm | 163 ++ source/pidl/lib/Parse/Pidl/Dump.pm | 294 +++ source/pidl/lib/Parse/Pidl/Expr.pm | 1442 +++ source/pidl/lib/Parse/Pidl/IDL.pm | 2534 ++ source/pidl/lib/Parse/Pidl/NDR.pm | 1235 + source/pidl/lib/Parse/Pidl/ODL.pm | 117 + source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm | 243 ++ source/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm | 268 ++ source/pidl/lib/Parse/Pidl/Samba4.pm | 119 + source/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm| 155 ++ source/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm | 221 ++ source/pidl/lib/Parse/Pidl/Samba4/COM/Stub.pm | 327 +++ source/pidl/lib/Parse/Pidl/Samba4/EJS.pm | 874 +++ source/pidl/lib/Parse/Pidl/Samba4/Header.pm| 475 source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm| 156 ++ source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm| 2695 source/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm| 328 +++ source/pidl/lib/Parse/Pidl/Samba4/Python.pm| 1216 + source/pidl/lib/Parse/Pidl/Samba4/SWIG.pm | 177 ++ source/pidl/lib/Parse/Pidl/Samba4/TDR.pm | 281 ++ source/pidl/lib/Parse/Pidl/Samba4/Template.pm | 98 + source/pidl/lib/Parse/Pidl/Typelist.pm | 301 +++ source/pidl/lib/Parse/Pidl/Util.pm | 182 ++ .../pidl/lib/Parse/Pidl/Wireshark/Conformance.pm | 439 source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm| 1141 + source/pidl/lib/Parse/Yapp/Driver.pm | 471 source/pidl/pidl | 808 ++ source/pidl/tests/Util.pm | 179 ++ source/pidl/tests/cutil.pl | 21 + source/pidl/tests/dump.pl | 15 + source/pidl/tests/header.pl| 108 + source/pidl/tests/ndr.pl | 558 source/pidl/tests/ndr_align.pl | 143 ++ source/pidl/tests/ndr_alloc.pl | 118 + source/pidl/tes
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-934-g612c5e7
The branch, master has been updated
via 612c5e746bd4d0059eb8bcb8dbb4944db155f071 (commit)
via 48b874e3764a20952dfd5e2957a3074073b480db (commit)
from 046cb24d0ad76b8e01c9c7d0d0146af9f6576047 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 612c5e746bd4d0059eb8bcb8dbb4944db155f071
Author: Kai Blin
Date: Mon Feb 16 23:36:21 2009 +0100
async_sock: Use tevent_timeval instead of timeval functions
commit 48b874e3764a20952dfd5e2957a3074073b480db
Author: Kai Blin
Date: Mon Feb 16 23:34:15 2009 +0100
tevent: Rename ev_timeval* functions to tevent_timeval, export them.
Also add tevent_timeval_add() and tevent_timeval_current_ofs()
to help not depending on lub/util/time.c for things that just need tevent
---
Summary of changes:
lib/async_req/async_req.c|7 +++--
lib/tevent/tevent.h | 19 ++
lib/tevent/tevent_epoll.c|2 +-
lib/tevent/tevent_internal.h |2 -
lib/tevent/tevent_req.c |2 +-
lib/tevent/tevent_select.c |2 +-
lib/tevent/tevent_standard.c |2 +-
lib/tevent/tevent_timed.c| 55 +-
8 files changed, 65 insertions(+), 26 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/async_req/async_req.c b/lib/async_req/async_req.c
index db47bd9..054c9f9 100644
--- a/lib/async_req/async_req.c
+++ b/lib/async_req/async_req.c
@@ -174,7 +174,7 @@ bool async_post_error(struct async_req *req, struct
tevent_context *ev,
{
req->error = error;
- if (tevent_add_timer(ev, req, timeval_zero(),
+ if (tevent_add_timer(ev, req, tevent_timeval_zero(),
async_trigger, req) == NULL) {
return false;
}
@@ -208,7 +208,8 @@ bool async_req_set_timeout(struct async_req *req, struct
tevent_context *ev,
struct timeval to)
{
return (tevent_add_timer(
- ev, req, timeval_current_ofs(to.tv_sec, to.tv_usec),
+ ev, req,
+ tevent_timeval_current_ofs(to.tv_sec, to.tv_usec),
async_req_timedout, req)
!= NULL);
}
@@ -300,7 +301,7 @@ bool async_req_enqueue(struct async_req_queue *queue,
struct tevent_context *ev,
if (!busy) {
struct tevent_timer *te;
- te = tevent_add_timer(ev, e, timeval_zero(),
+ te = tevent_add_timer(ev, e, tevent_timeval_zero(),
async_req_immediate_trigger,
e);
if (te == NULL) {
diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h
index 9c88bb7..8e3d097 100644
--- a/lib/tevent/tevent.h
+++ b/lib/tevent/tevent.h
@@ -300,6 +300,25 @@ bool tevent_req_is_error(struct tevent_req *req,
uint64_t *error);
+int tevent_timeval_compare(const struct timeval *tv1,
+ const struct timeval *tv2);
+
+struct timeval tevent_timeval_zero(void);
+
+struct timeval tevent_timeval_current(void);
+
+struct timeval tevent_timeval_set(uint32_t secs, uint32_t usecs);
+
+struct timeval tevent_timeval_until(const struct timeval *tv1,
+ const struct timeval *tv2);
+
+bool tevent_timeval_is_zero(const struct timeval *tv);
+
+struct timeval tevent_timeval_add(const struct timeval *tv, uint32_t secs,
+ uint32_t usecs);
+
+struct timeval tevent_timeval_current_ofs(uint32_t secs, uint32_t usecs);
+
#ifdef TEVENT_COMPAT_DEFINES
#define event_context tevent_context
diff --git a/lib/tevent/tevent_epoll.c b/lib/tevent/tevent_epoll.c
index d7f446a..0494f55 100644
--- a/lib/tevent/tevent_epoll.c
+++ b/lib/tevent/tevent_epoll.c
@@ -418,7 +418,7 @@ static int epoll_event_loop_once(struct tevent_context *ev)
struct timeval tval;
tval = tevent_common_loop_timer_delay(ev);
- if (ev_timeval_is_zero(&tval)) {
+ if (tevent_timeval_is_zero(&tval)) {
return 0;
}
diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
index a25d2b5..758bdb4 100644
--- a/lib/tevent/tevent_internal.h
+++ b/lib/tevent/tevent_internal.h
@@ -161,8 +161,6 @@ void tevent_common_fd_set_close_fn(struct tevent_fd *fde,
uint16_t tevent_common_fd_get_flags(struct tevent_fd *fde);
void tevent_common_fd_set_flags(struct tevent_fd *fde, uint16_t flags);
-struct timeval ev_timeval_zero(void);
-bool ev_timeval_is_zero(const struct timeval *tv);
struct tevent_timer *tevent_common_add_timer(struct tevent_context *ev,
TALLOC_CTX *mem_ctx,
struct timeval next_event,
diff --git a/lib/tevent/tevent_req.c b/lib/tevent/tevent_req.c
index 8f2d7bb..
