[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via e6b4b1b tevent/poll: use fde-additional_flags to hold the array
index
via f23ff66 tevent: change tevent_fd-additional_flags to uint64_t
from a13560b s3: sid-domain_sid in winbindd_samr sam_rids_to_names
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit e6b4b1baca1169c3ac53d6afdbd6a3aac365eb4b
Author: Stefan Metzmacher me...@samba.org
Date: Wed Mar 2 15:22:09 2011 +0100
tevent/poll: use fde-additional_flags to hold the array index
metze
(cherry picked from commit b7d5ddfa61d3b4c797dcee64cb23eb97cc55759c)
commit f23ff66388edee724cb3c562aa6164c1be6d1230
Author: Stefan Metzmacher me...@samba.org
Date: Wed Mar 2 15:20:46 2011 +0100
tevent: change tevent_fd-additional_flags to uint64_t
metze
(cherry picked from commit 20284f2a8429b5250ffb70e7124fa81115385c58)
---
Summary of changes:
lib/tevent/tevent_internal.h |2 +-
lib/tevent/tevent_poll.c | 23 ++-
2 files changed, 7 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
index 3d71bfd..9227f90 100644
--- a/lib/tevent/tevent_internal.h
+++ b/lib/tevent/tevent_internal.h
@@ -162,7 +162,7 @@ struct tevent_fd {
const char *handler_name;
const char *location;
/* this is private for the events_ops implementation */
- uint16_t additional_flags;
+ uint64_t additional_flags;
void *additional_data;
};
diff --git a/lib/tevent/tevent_poll.c b/lib/tevent/tevent_poll.c
index cda028a..712255b 100644
--- a/lib/tevent/tevent_poll.c
+++ b/lib/tevent/tevent_poll.c
@@ -35,7 +35,7 @@ struct poll_event_context {
*/
struct pollfd *fds;
struct tevent_fd **fd_events;
- int num_fds;
+ uint64_t num_fds;
/* information for exiting from the event loop */
int exit_code;
@@ -64,7 +64,7 @@ static int poll_event_fd_destructor(struct tevent_fd *fde)
struct tevent_context *ev = fde-event_ctx;
struct poll_event_context *poll_ev = NULL;
struct tevent_fd *moved_fde;
- long del_idx;
+ uint64_t del_idx = fde-additional_flags;
if (ev == NULL) {
goto done;
@@ -73,15 +73,10 @@ static int poll_event_fd_destructor(struct tevent_fd *fde)
poll_ev = talloc_get_type_abort(
ev-additional_data, struct poll_event_context);
- /*
-* Assume a void * can carry enough bits to hold num_fds.
-*/
- del_idx = (long)(fde-additional_data);
-
moved_fde = poll_ev-fd_events[poll_ev-num_fds-1];
poll_ev-fd_events[del_idx] = moved_fde;
poll_ev-fds[del_idx] = poll_ev-fds[poll_ev-num_fds-1];
- moved_fde-additional_data = (void *)del_idx;
+ moved_fde-additional_flags = del_idx;
poll_ev-num_fds -= 1;
done:
@@ -149,10 +144,7 @@ static struct tevent_fd *poll_event_add_fd(struct
tevent_context *ev,
pfd-events |= (POLLOUT);
}
- /*
-* Assume a void * can carry enough bits to hold num_fds.
-*/
- fde-additional_data = (void *)(long)poll_ev-num_fds;
+ fde-additional_flags = poll_ev-num_fds;
poll_ev-fd_events[poll_ev-num_fds] = fde;
poll_ev-num_fds += 1;
@@ -169,7 +161,7 @@ static void poll_event_set_fd_flags(struct tevent_fd *fde,
uint16_t flags)
{
struct poll_event_context *poll_ev = talloc_get_type_abort(
fde-event_ctx-additional_data, struct poll_event_context);
- long idx;
+ uint64_t idx = fde-additional_flags;
uint16_t pollflags = 0;
if (flags TEVENT_FD_READ) {
@@ -179,7 +171,6 @@ static void poll_event_set_fd_flags(struct tevent_fd *fde,
uint16_t flags)
pollflags |= (POLLOUT);
}
- idx = (long)(fde-additional_data);
poll_ev-fds[idx].events = pollflags;
fde-flags = flags;
@@ -237,11 +228,9 @@ static int poll_event_loop_poll(struct tevent_context *ev,
the handler to remove itself when called */
for (fde = ev-fd_events; fde; fde = fde-next) {
struct pollfd *pfd;
- long pfd_idx;
+ uint64_t pfd_idx = fde-additional_flags;
uint16_t flags = 0;
- pfd_idx = (long)(fde-additional_data);
-
pfd = poll_ev-fds[pfd_idx];
if (pfd-revents (POLLIN|POLLHUP|POLLERR)) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b738e09 librpc/rpc: move dcerpc_binding_handle stuff to rpc_common.h
via 5657c96 s3:librpc/rpc: remove unused dcerpc_pipe define hack
via c774a50 s4:librpc/rpc: s/struct dcerpc_connection/struct
dcecli_connection/g
via 6771ade pidl:Samba4/NDR/Client: fix arguments to warning()
via f3465da pidl:Samba4/NDR/Parser: fix compiler warnings in 'pipe'
related code
from 0726b29 s3:idmap_ldap: fix a few typos in a comment
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b738e092a22edb192243d2eee10c31a370be71e3
Author: Stefan Metzmacher me...@samba.org
Date: Fri Mar 11 10:31:25 2011 +0100
librpc/rpc: move dcerpc_binding_handle stuff to rpc_common.h
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Fri Mar 11 12:28:08 CET 2011 on sn-devel-104
commit 5657c96714518b90b04b5283c87c4d0050eb2418
Author: Stefan Metzmacher me...@samba.org
Date: Fri Mar 11 09:56:10 2011 +0100
s3:librpc/rpc: remove unused dcerpc_pipe define hack
metze
commit c774a50aaf12924ff89430ae9d91e77d97616c72
Author: Stefan Metzmacher me...@samba.org
Date: Fri Mar 11 08:27:00 2011 +0100
s4:librpc/rpc: s/struct dcerpc_connection/struct dcecli_connection/g
The name 'struct dcerpc_connection' will be used in the new generic
dcerpc code. It will be used for client and server.
metze
commit 6771ade5e7933af57b286870d73e7773521b8fdd
Author: Stefan Metzmacher me...@samba.org
Date: Fri Mar 11 09:01:00 2011 +0100
pidl:Samba4/NDR/Client: fix arguments to warning()
We want the file:line: information displayed.
metze
commit f3465da07242cfa3f45da668c7ffa86e8beacf0e
Author: Stefan Metzmacher me...@samba.org
Date: Fri Mar 11 09:00:13 2011 +0100
pidl:Samba4/NDR/Parser: fix compiler warnings in 'pipe' related code
metze
---
Summary of changes:
librpc/rpc/rpc_common.h | 103 +++-
pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm |2 +-
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |6 +-
source3/librpc/rpc/dcerpc.h | 156 +-
source4/librpc/rpc/dcerpc.c | 48 +-
source4/librpc/rpc/dcerpc.h | 146 +++-
source4/librpc/rpc/dcerpc_smb.c | 38
source4/librpc/rpc/dcerpc_smb2.c | 36
source4/librpc/rpc/dcerpc_sock.c | 46 +-
source4/librpc/rpc/dcerpc_util.c |4 +-
source4/librpc/wscript_build |5 +-
11 files changed, 209 insertions(+), 381 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/rpc/rpc_common.h b/librpc/rpc/rpc_common.h
index 3f5216b..5d1bde0 100644
--- a/librpc/rpc/rpc_common.h
+++ b/librpc/rpc/rpc_common.h
@@ -1,8 +1,41 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ Copyright (C) Stefan Metzmacher 2010-2011
+ Copyright (C) Andrew Tridgell 2010-2011
+ Copyright (C) Simo Sorce 2010
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/.
+*/
+
#ifndef __DEFAULT_LIBRPC_RPCCOMMON_H__
#define __DEFAULT_LIBRPC_RPCCOMMON_H__
+struct dcerpc_binding_handle;
+struct GUID;
+struct ndr_interface_table;
+struct ndr_interface_call;
+struct ndr_push;
+struct ndr_pull;
+struct ncacn_packet;
+struct tevent_context;
+struct tstream_context;
+
/* The following definitions come from ../librpc/rpc/dcerpc_error.c */
+const char *dcerpc_errstr(TALLOC_CTX *mem_ctx, uint32_t fault_code);
+NTSTATUS dcerpc_fault_to_nt_status(uint32_t fault_code);
/* The following definitions come from ../librpc/rpc/binding.c */
@@ -52,6 +85,58 @@ NTSTATUS dcerpc_read_ncacn_packet_recv(struct tevent_req
*req,
/* The following definitions come from ../librpc/rpc/binding_handle.c */
+struct dcerpc_binding_handle_ops {
+ const char *name;
+
+ bool (*is_connected)(struct dcerpc_binding_handle *h);
+ uint32_t (*set_timeout)(struct dcerpc_binding_handle *h,
+ uint32_t timeout);
+
+ struct tevent_req *(*raw_call_send)(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 872d0fe pidl:Samba4/NDR/Client: fix arguments to warning()
via 8669419 pidl:Samba4/NDR/Parser: fix compiler warnings in 'pipe'
related code
from e6b4b1b tevent/poll: use fde-additional_flags to hold the array
index
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 872d0fed26c62a8a5342e5a32a7ce50aecf9c910
Author: Stefan Metzmacher me...@samba.org
Date: Fri Mar 11 09:01:00 2011 +0100
pidl:Samba4/NDR/Client: fix arguments to warning()
We want the file:line: information displayed.
metze
(cherry picked from commit 6771ade5e7933af57b286870d73e7773521b8fdd)
commit 8669419b261edc36ebb23f01c42f056b1581c5be
Author: Stefan Metzmacher me...@samba.org
Date: Fri Mar 11 09:00:13 2011 +0100
pidl:Samba4/NDR/Parser: fix compiler warnings in 'pipe' related code
metze
(cherry picked from commit f3465da07242cfa3f45da668c7ffa86e8beacf0e)
---
Summary of changes:
pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm |2 +-
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
index ab4f524..c796b46 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
@@ -743,7 +743,7 @@ sub ParseFunction($$$)
$self-pidl_both( * dcerpc_$fn-{NAME}());
$self-pidl_both( */);
$self-pidl_both();
- warning($fn, $fn-{NAME}: dcerpc client does not support pipe
yet);
+ warning($fn-{ORIGINAL}, $fn-{NAME}: dcerpc client does not
support pipe yet);
return;
}
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index f84610d..7cda272 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -2466,7 +2466,7 @@ sub ParseGeneratePipeArray($$$)
$self-deindent;
$self-pidl(},);
}
- $self-pidl({ NULL, NULL, 0, NULL, NULL, NULL, NULL });
+ $self-pidl({ NULL, NULL, 0, NULL, NULL, NULL });
$self-deindent;
$self-pidl(};);
$self-pidl();
@@ -2523,11 +2523,11 @@ sub FunctionCallEntry($$)
my $out_pipes_ptr = NULL;
if ($in_pipes) {
- $in_pipes_ptr = \$d-{NAME}_in_pipes;
+ $in_pipes_ptr = $d-{NAME}_in_pipes;
}
if ($out_pipes) {
- $out_pipes_ptr = \$d-{NAME}_out_pipes;
+ $out_pipes_ptr = $d-{NAME}_out_pipes;
}
$self-pidl(\t{);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 70c75b9 s3: Fix a typo from b738e09 librpc/rpc: move dcerpc_binding_handle stuff to rpc_common.h http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 70c75b9ddfdc9801be0b5ba89cd095e974c22626 Author: Volker Lendecke v...@samba.org Date: Thu Mar 10 17:11:37 2011 +0100 s3: Fix a typo Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Fri Mar 11 13:15:00 CET 2011 on sn-devel-104 --- Summary of changes: source3/rpc_client/cli_lsarpc.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c index 0dbe813..0e87d92 100644 --- a/source3/rpc_client/cli_lsarpc.c +++ b/source3/rpc_client/cli_lsarpc.c @@ -160,7 +160,7 @@ NTSTATUS rpccli_lsa_open_policy2(struct rpc_pipe_client *cli, /* Lookup a list of sids * * internal version withOUT memory allocation of the target arrays. - * this assumes suffciently sized arrays to store domains, names and types. */ + * this assumes sufficiently sized arrays to store domains, names and types. */ static NTSTATUS dcerpc_lsa_lookup_sids_noalloc(struct dcerpc_binding_handle *h, TALLOC_CTX *mem_ctx, -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 2219149 s3: Fix a typo from 872d0fe pidl:Samba4/NDR/Client: fix arguments to warning() http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 2219149ffef21b4447e9d1a92512e0e03b550650 Author: Volker Lendecke v...@samba.org Date: Thu Mar 10 17:11:37 2011 +0100 s3: Fix a typo Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Fri Mar 11 13:15:00 CET 2011 on sn-devel-104 (cherry picked from commit 70c75b9ddfdc9801be0b5ba89cd095e974c22626) --- Summary of changes: source3/rpc_client/cli_lsarpc.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c index 0dbe813..0e87d92 100644 --- a/source3/rpc_client/cli_lsarpc.c +++ b/source3/rpc_client/cli_lsarpc.c @@ -160,7 +160,7 @@ NTSTATUS rpccli_lsa_open_policy2(struct rpc_pipe_client *cli, /* Lookup a list of sids * * internal version withOUT memory allocation of the target arrays. - * this assumes suffciently sized arrays to store domains, names and types. */ + * this assumes sufficiently sized arrays to store domains, names and types. */ static NTSTATUS dcerpc_lsa_lookup_sids_noalloc(struct dcerpc_binding_handle *h, TALLOC_CTX *mem_ctx, -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a051b40 samba_abi: Also sort ABI files properly so symbols end up
in the right version.
via 1d1e5cb Sort by release component integer values rather than using
standard string sort.
from 70c75b9 s3: Fix a typo
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a051b400756fa9dc5f6d61b49b2886cf00be5081
Author: Jelmer Vernooij jel...@samba.org
Date: Sat Mar 12 01:58:17 2011 +0100
samba_abi: Also sort ABI files properly so symbols end up in the right
version.
Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Sat Mar 12 02:45:20 CET 2011 on sn-devel-104
commit 1d1e5cbd27e3253eb77c04a832eab6ede5d67826
Author: Jelmer Vernooij jel...@canonical.com
Date: Sat Mar 12 01:09:31 2011 +0100
Sort by release component integer values rather than using standard string
sort.
This makes sure tevent 0.9.9 is considered to be older than 0.9.10 and
0.9.11
---
Summary of changes:
buildtools/wafsamba/samba_abi.py |9 +++--
1 files changed, 7 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index 396a7fc..990e1e5 100644
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -10,6 +10,8 @@ abi_type_maps = {
'struct __va_list_tag *' : 'va_list'
}
+version_key = lambda x: map(int, x.split(.))
+
def normalise_signature(sig):
'''normalise a signature from gdb'''
sig = sig.strip()
@@ -162,7 +164,8 @@ def abi_write_vscript(vscript, libname, current_version,
versions, symmap, abi_m
f = open(vscript, mode='w')
last_key =
-for k in sorted(versions):
+versions = sorted(versions, key=version_key)
+for k in versions:
symver = %s_%s % (libname, k)
if symver == current_version:
break
@@ -204,7 +207,9 @@ def ABI_VSCRIPT(bld, libname, abi_directory, version,
vscript, abi_match=None):
'''generate a vscript file for our public libraries'''
if abi_directory:
source = bld.path.ant_glob('%s/%s-[0-9]*.sigs' % (abi_directory,
libname))
-source = sorted(source.split())
+def abi_file_key(path):
+return version_key(path[:-len(.sigs)].rsplit(-)[-1])
+source = sorted(source.split(), key=abi_file_key)
else:
source = ''
--
Samba Shared Repository
