From 578cbf1139e5a09df6160ea9ee6766190c566893 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 27 Apr 2011 08:57:41 +0200 Subject: s4:libcli/smb2: convert smb2_connect_*() to tevent_req metze --- source4/librpc/rpc/dcerpc_connect.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'source4/librpc') diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index 842ef432063..c236399b529 100644 --- a/source4/librpc/rpc/dcerpc_connect.c +++ b/source4/librpc/rpc/dcerpc_connect.c @@ -186,16 +186,18 @@ static void continue_pipe_open_smb2(struct composite_context *ctx) /* Stage 2 of ncacn_np_smb2: Open a named pipe after successful smb2 connection */ -static void continue_smb2_connect(struct composite_context *ctx) +static void continue_smb2_connect(struct tevent_req *subreq) { struct composite_context *open_req; - struct composite_context *c = talloc_get_type(ctx->async.private_data, - struct composite_context); + struct composite_context *c = + tevent_req_callback_data(subreq, + struct composite_context); struct pipe_np_smb2_state *s = talloc_get_type(c->private_data, struct pipe_np_smb2_state); /* receive result of smb2 connect request */ - c->status = smb2_connect_recv(ctx, c, &s->tree); + c->status = smb2_connect_recv(subreq, c, &s->tree); + TALLOC_FREE(subreq); if (!composite_is_ok(c)) return; /* prepare named pipe open parameters */ @@ -220,7 +222,7 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb2_send( { struct composite_context *c; struct pipe_np_smb2_state *s; - struct composite_context *conn_req; + struct tevent_req *subreq; struct smbcli_options options; /* composite context allocation and setup */ @@ -247,17 +249,17 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb2_send( lpcfg_smbcli_options(lp_ctx, &options); /* send smb2 connect request */ - conn_req = smb2_connect_send(mem_ctx, s->io.binding->host, + subreq = smb2_connect_send(s, c->event_ctx, + s->io.binding->host, lpcfg_parm_string_list(mem_ctx, lp_ctx, NULL, "smb2", "ports", NULL), - "IPC$", - s->io.resolve_ctx, - s->io.creds, - c->event_ctx, - &options, - lpcfg_socket_options(lp_ctx), - lpcfg_gensec_settings(mem_ctx, lp_ctx) - ); - composite_continue(c, conn_req, continue_smb2_connect, c); + "IPC$", + s->io.resolve_ctx, + s->io.creds, + &options, + lpcfg_socket_options(lp_ctx), + lpcfg_gensec_settings(mem_ctx, lp_ctx)); + if (composite_nomem(subreq, c)) return c; + tevent_req_set_callback(subreq, continue_smb2_connect, c); return c; } -- cgit From 85eb4377dbc9e2d25e0ee2e358e785347b09f0a7 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 2 May 2011 10:05:46 +1000 Subject: s4:cluster Rename .id to .pid in server_id This also changes some DEBUG messages to use cluster_id_string() rather than .id, to isolate them from this and other changes. Andrew Bartlett --- source4/librpc/idl/server_id4.idl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/librpc') diff --git a/source4/librpc/idl/server_id4.idl b/source4/librpc/idl/server_id4.idl index 486143546b6..872d3067566 100644 --- a/source4/librpc/idl/server_id4.idl +++ b/source4/librpc/idl/server_id4.idl @@ -5,8 +5,9 @@ interface server_id { /* id used to identify a endpoint, possibly in a cluster */ typedef [public] struct { - hyper id; + hyper pid; uint32 id2; uint32 node; + udlong unique_id; } server_id; } -- cgit From 4c8de5ab135d7d8462e264f616225122945c7682 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 2 May 2011 10:53:18 +1000 Subject: s4-cluster Rename server_id.node -> vnn to match Samba3 --- source4/librpc/idl/server_id4.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/librpc') diff --git a/source4/librpc/idl/server_id4.idl b/source4/librpc/idl/server_id4.idl index 872d3067566..728818f6291 100644 --- a/source4/librpc/idl/server_id4.idl +++ b/source4/librpc/idl/server_id4.idl @@ -7,7 +7,7 @@ interface server_id typedef [public] struct { hyper pid; uint32 id2; - uint32 node; + uint32 vnn; udlong unique_id; } server_id; } -- cgit From cdd802af8319e0b0744d8e727cef75526269ece2 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 3 May 2011 10:40:33 +1000 Subject: s4-messaging Rename messaging -> imessaging This avoid symbol and structure conflicts between Samba3 and Samba4, and chooses a less generic name. Andrew Bartlett --- source4/librpc/rpc/pyrpc_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/librpc') diff --git a/source4/librpc/rpc/pyrpc_util.c b/source4/librpc/rpc/pyrpc_util.c index 3821638fb34..7784c81cef5 100644 --- a/source4/librpc/rpc/pyrpc_util.c +++ b/source4/librpc/rpc/pyrpc_util.c @@ -72,9 +72,9 @@ static NTSTATUS pyrpc_irpc_connect(TALLOC_CTX *mem_ctx, const char *irpc_server, struct loadparm_context *lp_ctx, struct dcerpc_binding_handle **binding_handle) { - struct messaging_context *msg; + struct imessaging_context *msg; - msg = messaging_client_init(mem_ctx, lpcfg_messaging_path(mem_ctx, lp_ctx), event_ctx); + msg = imessaging_client_init(mem_ctx, lpcfg_imessaging_path(mem_ctx, lp_ctx), event_ctx); NT_STATUS_HAVE_NO_MEMORY(msg); *binding_handle = irpc_binding_handle_by_name(mem_ctx, msg, irpc_server, table); -- cgit From 14f99167f600ae9a3351d4ff7d089e54ca3149ac Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 9 May 2011 11:00:18 +0200 Subject: build: Remove --disable-s3build so we can rely on these subsystems This will make it easier to write code that uses the whole codebase. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Mon May 9 12:25:33 CEST 2011 on sn-devel-104 --- source4/librpc/wscript_build | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'source4/librpc') diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index ce015ccaa52..e9456074f69 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -92,11 +92,6 @@ bld.SAMBA_LIBRARY('dcerpc-samba4', bld.SAMBA_PIDL_TABLES('GEN_NDR_TABLES', 'gen_ndr/tables.c') -if bld.env.enable_s3build: - s3_ndr = "NDR_WBINT" -else: - s3_ndr = "" - bld.SAMBA_SUBSYSTEM('ndr-table', source='../../librpc/ndr/ndr_table.c gen_ndr/tables.c', public_deps='''ndr-standard NDR_AUDIOSRV NDR_DSBACKUP NDR_EFS @@ -109,7 +104,7 @@ bld.SAMBA_SUBSYSTEM('ndr-table', NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND NDR_FRSRPC NDR_FRSAPI NDR_FRSTRANS NDR_NFS4ACL NDR_NTP_SIGND NDR_DCOM NDR_WMI NDR_NAMED_PIPE_AUTH NDR_NTLMSSP NDR_DFSBLOBS NDR_DNSP - NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG ''' + s3_ndr, + NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG NDR_WBINT''', depends_on='GEN_NDR_TABLES' ) -- cgit From 5d2dbf93b3bfed193c6d8224be6e1d3af7e66d0f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 6 Jun 2011 10:13:41 +1000 Subject: s4-ipv6: allow for IPv6 in dcerpc socket calls --- source4/librpc/rpc/dcerpc_sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/librpc') diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c index f0451ac6745..1cd4d7121ef 100644 --- a/source4/librpc/rpc/dcerpc_sock.c +++ b/source4/librpc/rpc/dcerpc_sock.c @@ -389,7 +389,7 @@ static void continue_ip_resolve_name(struct composite_context *ctx) if (!composite_is_ok(c)) return; /* prepare server address using host ip:port and transport name */ - s->srvaddr = socket_address_from_strings(s->conn, "ipv4", s->address, s->port); + s->srvaddr = socket_address_from_strings(s->conn, "ip", s->address, s->port); if (composite_nomem(s->srvaddr, c)) return; /* resolve_nbt_name gives only ipv4 ... - send socket open request */ @@ -423,7 +423,7 @@ static void continue_ipv6_open_socket(struct composite_context *ctx) talloc_free(s->srvaddr); /* prepare server address using host:ip and transport name */ - s->srvaddr = socket_address_from_strings(s->conn, "ipv4", s->address, s->port); + s->srvaddr = socket_address_from_strings(s->conn, "ip", s->address, s->port); if (composite_nomem(s->srvaddr, c)) return; /* try IPv4 if IPv6 fails */ -- cgit From 66aec3cf67595c7aec5d10775892dad2538caf65 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 6 Jun 2011 10:43:05 +1000 Subject: s4-ipv6: removed the old unused ipv6 code in dcerpc_sock.c the code is now generic to both V4 and V6 --- source4/librpc/rpc/dcerpc_sock.c | 49 +++++----------------------------------- 1 file changed, 6 insertions(+), 43 deletions(-) (limited to 'source4/librpc') diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c index 1cd4d7121ef..1dd993d94b2 100644 --- a/source4/librpc/rpc/dcerpc_sock.c +++ b/source4/librpc/rpc/dcerpc_sock.c @@ -371,10 +371,7 @@ struct pipe_tcp_state { }; -#if 0 /* disabled till we can resolve names to ipv6 addresses */ -static void continue_ipv6_open_socket(struct composite_context *ctx); -#endif -static void continue_ipv4_open_socket(struct composite_context *ctx); +static void continue_ip_open_socket(struct composite_context *ctx); static void continue_ip_resolve_name(struct composite_context *ctx); static void continue_ip_resolve_name(struct composite_context *ctx) @@ -383,7 +380,7 @@ static void continue_ip_resolve_name(struct composite_context *ctx) struct composite_context); struct pipe_tcp_state *s = talloc_get_type(c->private_data, struct pipe_tcp_state); - struct composite_context *sock_ipv4_req; + struct composite_context *sock_ip_req; c->status = resolve_name_recv(ctx, s, &s->address); if (!composite_is_ok(c)) return; @@ -392,53 +389,19 @@ static void continue_ip_resolve_name(struct composite_context *ctx) s->srvaddr = socket_address_from_strings(s->conn, "ip", s->address, s->port); if (composite_nomem(s->srvaddr, c)) return; - /* resolve_nbt_name gives only ipv4 ... - send socket open request */ - sock_ipv4_req = dcerpc_pipe_open_socket_send(c, s->conn, s->localaddr, + sock_ip_req = dcerpc_pipe_open_socket_send(c, s->conn, s->localaddr, s->srvaddr, s->target_hostname, NULL, NCACN_IP_TCP); - composite_continue(c, sock_ipv4_req, continue_ipv4_open_socket, c); + composite_continue(c, sock_ip_req, continue_ip_open_socket, c); } -/* - Stage 2 of dcerpc_pipe_open_tcp_send: receive result of pipe open request - on IPv6 and send the request on IPv4 unless IPv6 transport succeeded. -*/ -#if 0 /* disabled till we can resolve names to ipv6 addresses */ -static void continue_ipv6_open_socket(struct composite_context *ctx) -{ - struct composite_context *c = talloc_get_type(ctx->async.private_data, - struct composite_context); - struct pipe_tcp_state *s = talloc_get_type(c->private_data, - struct pipe_tcp_state); - struct composite_context *sock_ipv4_req; - - /* receive result of socket open request */ - c->status = dcerpc_pipe_open_socket_recv(ctx); - if (NT_STATUS_IS_OK(c->status)) { - composite_done(c); - return; - } - - talloc_free(s->srvaddr); - - /* prepare server address using host:ip and transport name */ - s->srvaddr = socket_address_from_strings(s->conn, "ip", s->address, s->port); - if (composite_nomem(s->srvaddr, c)) return; - - /* try IPv4 if IPv6 fails */ - sock_ipv4_req = dcerpc_pipe_open_socket_send(c, s->conn, s->localaddr, - s->srvaddr, s->target_hostname, - NCACN_IP_TCP); - composite_continue(c, sock_ipv4_req, continue_ipv4_open_socket, c); -} -#endif /* Stage 2 of dcerpc_pipe_open_tcp_send: receive result of pipe open request - on IPv4 transport. + on IP transport. */ -static void continue_ipv4_open_socket(struct composite_context *ctx) +static void continue_ip_open_socket(struct composite_context *ctx) { struct composite_context *c = talloc_get_type(ctx->async.private_data, struct composite_context); -- cgit From 907cdb5de7f16a2540299aeba211bf2a5ae6fafe Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 6 Jun 2011 14:58:28 +1000 Subject: s4-modules Remove lp_ctx from init functions that no longer need it Now that we don't allow the smb.conf to change the modules dir, many functions that simply load modules or initialise a subsytem that may load modules no longer need an lp_ctx. Andrew Bartlett --- source4/librpc/rpc/dcerpc.c | 4 ++-- source4/librpc/rpc/dcerpc.h | 2 +- source4/librpc/rpc/pyrpc_util.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/librpc') diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index cc728668667..c199dc700ac 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -76,9 +76,9 @@ struct rpc_request { } async; }; -_PUBLIC_ NTSTATUS dcerpc_init(struct loadparm_context *lp_ctx) +_PUBLIC_ NTSTATUS dcerpc_init() { - return gensec_init(lp_ctx); + return gensec_init(); } static void dcerpc_connection_dead(struct dcecli_connection *conn, NTSTATUS status); diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index 5ca6246343d..22afdf880fa 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -198,7 +198,7 @@ NTSTATUS dcerpc_bind_auth_schannel(TALLOC_CTX *tmp_ctx, struct loadparm_context *lp_ctx, uint8_t auth_level); struct tevent_context *dcerpc_event_context(struct dcerpc_pipe *p); -NTSTATUS dcerpc_init(struct loadparm_context *lp_ctx); +NTSTATUS dcerpc_init(void); struct smbcli_tree *dcerpc_smb_tree(struct dcecli_connection *c); uint16_t dcerpc_smb_fnum(struct dcecli_connection *c); NTSTATUS dcerpc_secondary_context(struct dcerpc_pipe *p, diff --git a/source4/librpc/rpc/pyrpc_util.c b/source4/librpc/rpc/pyrpc_util.c index 7784c81cef5..385acc87e59 100644 --- a/source4/librpc/rpc/pyrpc_util.c +++ b/source4/librpc/rpc/pyrpc_util.c @@ -119,7 +119,7 @@ PyObject *py_dcerpc_interface_init_helper(PyTypeObject *type, PyObject *args, Py return NULL; } - status = dcerpc_init(lp_ctx); + status = dcerpc_init(); if (!NT_STATUS_IS_OK(status)) { PyErr_SetNTSTATUS(status); talloc_free(mem_ctx); -- cgit From 7ebafb000a79e9317b267ae09b9fa9b0685b9209 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Mon, 6 Jun 2011 12:50:16 +0200 Subject: s4:librpc/rpc/dcerpc.c - janitorial: use "void" for functions without arguments Probably a mistake in commit 907cdb5de7f16a2540299aeba211bf2a5ae6fafe. Reviewed-by: Tridge --- source4/librpc/rpc/dcerpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/librpc') diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index c199dc700ac..110da57c939 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -76,7 +76,7 @@ struct rpc_request { } async; }; -_PUBLIC_ NTSTATUS dcerpc_init() +_PUBLIC_ NTSTATUS dcerpc_init(void) { return gensec_init(); } -- cgit From 8d803d5a0a9a7815c4e6fcbd9b7c652fb85e94dd Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 8 May 2011 18:28:17 +0200 Subject: s4-cluster Use task_id instead of id2 to clarify server_id structure This seems a clearer and more acceptable name. Andrew Bartlett Signed-off-by: Andrew Tridgell --- source4/librpc/idl/server_id4.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/librpc') diff --git a/source4/librpc/idl/server_id4.idl b/source4/librpc/idl/server_id4.idl index 728818f6291..eb191e37b74 100644 --- a/source4/librpc/idl/server_id4.idl +++ b/source4/librpc/idl/server_id4.idl @@ -6,7 +6,7 @@ interface server_id /* id used to identify a endpoint, possibly in a cluster */ typedef [public] struct { hyper pid; - uint32 id2; + uint32 task_id; uint32 vnn; udlong unique_id; } server_id; -- cgit From d057116cc2e454ba097d0dcb22e16108a05a4a1b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 2 May 2011 10:55:20 +1000 Subject: server_id.idl: Bring server_id.idl in common Andrew Bartlett Signed-off-by: Andrew Tridgell --- source4/librpc/idl/opendb.idl | 2 +- source4/librpc/idl/s4_notify.idl | 2 +- source4/librpc/idl/wscript_build | 2 +- source4/librpc/wscript_build | 9 +-------- 4 files changed, 4 insertions(+), 11 deletions(-) (limited to 'source4/librpc') diff --git a/source4/librpc/idl/opendb.idl b/source4/librpc/idl/opendb.idl index 4973cd09826..b76992960af 100644 --- a/source4/librpc/idl/opendb.idl +++ b/source4/librpc/idl/opendb.idl @@ -7,7 +7,7 @@ ntvfs/common/opendb.c */ -import "server_id4.idl"; +import "server_id.idl"; [ pointer_default(unique) diff --git a/source4/librpc/idl/s4_notify.idl b/source4/librpc/idl/s4_notify.idl index 89ade2991c9..1d4c33470d4 100644 --- a/source4/librpc/idl/s4_notify.idl +++ b/source4/librpc/idl/s4_notify.idl @@ -7,7 +7,7 @@ the change notify buffers */ -import "server_id4.idl"; +import "server_id.idl"; [ pointer_default(unique) diff --git a/source4/librpc/idl/wscript_build b/source4/librpc/idl/wscript_build index 6fe3690b335..a35dc797688 100644 --- a/source4/librpc/idl/wscript_build +++ b/source4/librpc/idl/wscript_build @@ -6,7 +6,7 @@ topinclude=os.path.join(bld.srcnode.abspath(), 'librpc/idl') bld.SAMBA_PIDL_LIST('PIDL', source='''irpc.idl nfs4acl.idl s4_notify.idl ntp_signd.idl - opendb.idl sasl_helpers.idl server_id4.idl winbind.idl + opendb.idl sasl_helpers.idl winbind.idl winsif.idl winsrepl.idl winstation.idl''', options="--includedir=%s --header --ndr-parser --client --python --server" % topinclude, output_dir='../gen_ndr') diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index e9456074f69..efde567bf8b 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -4,13 +4,6 @@ bld.RECURSE('../../librpc/idl') bld.RECURSE('../../librpc/tools') bld.RECURSE('idl') -bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID4', - source='gen_ndr/ndr_server_id4.c', - deps='ndr', - public_headers='gen_ndr/server_id4.h', - header_path='gen_ndr' - ) - bld.SAMBA_SUBSYSTEM('NDR_WINSTATION', source='gen_ndr/ndr_winstation.c', @@ -52,7 +45,7 @@ bld.SAMBA_SUBSYSTEM('NDR_OPENDB', bld.SAMBA_SUBSYSTEM('NDR_NOTIFY', source='gen_ndr/ndr_s4_notify.c', - public_deps='ndr NDR_SERVER_ID4' + public_deps='ndr NDR_SERVER_ID' ) -- cgit From a772797a384a1142c5af95bd06c14a141dea38d7 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 2 May 2011 11:10:12 +1000 Subject: librpc/idr Use the Samba3 notify.idl in common. The extra fields in the structure that Samba4 does not use should not bother it. Andrew Bartlett Signed-off-by: Andrew Tridgell --- source4/librpc/idl/s4_notify.idl | 58 ---------------------------------------- source4/librpc/idl/wscript_build | 2 +- source4/librpc/wscript_build | 8 +----- 3 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 source4/librpc/idl/s4_notify.idl (limited to 'source4/librpc') diff --git a/source4/librpc/idl/s4_notify.idl b/source4/librpc/idl/s4_notify.idl deleted file mode 100644 index 1d4c33470d4..00000000000 --- a/source4/librpc/idl/s4_notify.idl +++ /dev/null @@ -1,58 +0,0 @@ -#include "idl_types.h" - -/* - IDL structures for notify change code - - this defines the structures used in the notify database code, and - the change notify buffers -*/ - -import "server_id.idl"; - -[ - pointer_default(unique) -] -interface notify -{ - - /* structure used in the notify database */ - typedef [public] struct { - server_id server; - uint32 filter; /* filter to apply in this directory */ - uint32 subdir_filter; /* filter to apply in child directories */ - utf8string path; - uint32 path_len; /* saves some computation on search */ - pointer private_data; - } notify_entry; - - /* - to allow for efficient search for matching entries, we - divide them by the directory depth, with a separate array - per depth. The entries within each depth are sorted by path, - allowing for a bisection search. - - The max_mask and max_mask_subdir at each depth is the - bitwise or of the filters and subdir filters for all entries - at that depth. This allows a depth to be quickly skipped if - no entries will match the target filter - */ - typedef struct { - uint32 max_mask; - uint32 max_mask_subdir; - uint32 num_entries; - notify_entry entries[num_entries]; - } notify_depth; - - typedef [public] struct { - uint32 num_depths; - notify_depth depth[num_depths]; - } notify_array; - - /* structure sent between servers in notify messages */ - typedef [public] struct { - uint32 action; - utf8string path; - pointer private_data; - } notify_event; - -} diff --git a/source4/librpc/idl/wscript_build b/source4/librpc/idl/wscript_build index a35dc797688..59b16766ea5 100644 --- a/source4/librpc/idl/wscript_build +++ b/source4/librpc/idl/wscript_build @@ -5,7 +5,7 @@ import os topinclude=os.path.join(bld.srcnode.abspath(), 'librpc/idl') bld.SAMBA_PIDL_LIST('PIDL', - source='''irpc.idl nfs4acl.idl s4_notify.idl ntp_signd.idl + source='''irpc.idl nfs4acl.idl ntp_signd.idl opendb.idl sasl_helpers.idl winbind.idl winsif.idl winsrepl.idl winstation.idl''', options="--includedir=%s --header --ndr-parser --client --python --server" % topinclude, diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index efde567bf8b..39541b6a33b 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -43,12 +43,6 @@ bld.SAMBA_SUBSYSTEM('NDR_OPENDB', ) -bld.SAMBA_SUBSYSTEM('NDR_NOTIFY', - source='gen_ndr/ndr_s4_notify.c', - public_deps='ndr NDR_SERVER_ID' - ) - - bld.SAMBA_SUBSYSTEM('NDR_NTP_SIGND', source='gen_ndr/ndr_ntp_signd.c', public_deps='ndr' @@ -69,7 +63,7 @@ bld.SAMBA_SUBSYSTEM('NDR_WINBIND', # create a grouping library to consolidate our samba4 specific NDR code bld.SAMBA_LIBRARY('ndr-samba4', source=[], - deps='NDR_WINBIND NDR_IRPC NDR_NFS4ACL NDR_OPENDB NDR_NOTIFY ndr-table', + deps='NDR_WINBIND NDR_IRPC NDR_NFS4ACL NDR_OPENDB ndr-table', private_library=True, grouping_library=True ) -- cgit From 77c612fc21da944aa6c84e52c127713fcaf9a071 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 10 Jun 2011 09:36:37 +1000 Subject: s4-librpc Remove unsued server_id4.idl --- source4/librpc/idl/server_id4.idl | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 source4/librpc/idl/server_id4.idl (limited to 'source4/librpc') diff --git a/source4/librpc/idl/server_id4.idl b/source4/librpc/idl/server_id4.idl deleted file mode 100644 index eb191e37b74..00000000000 --- a/source4/librpc/idl/server_id4.idl +++ /dev/null @@ -1,13 +0,0 @@ -[ - pointer_default(unique) -] -interface server_id -{ - /* id used to identify a endpoint, possibly in a cluster */ - typedef [public] struct { - hyper pid; - uint32 task_id; - uint32 vnn; - udlong unique_id; - } server_id; -} -- cgit