The branch, master has been updated
via 5f13710ced2565355c3cdcef04067cacdf74a9ad (commit)
via 96f176dbd84090fd18b8c796f869ddaa2da39e59 (commit)
via f3f2dfc51a25080290e13ed1d1f8c85932e0be31 (commit)
via 15239f742cfcebe0bce4dbf4cb74eb2e8dcab364 (commit)
via 06a24497dc167853bbd2171e50945595a62c5623 (commit)
from 99f021d0ef5f1e8e7793c28f1c5ed03912218142 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5f13710ced2565355c3cdcef04067cacdf74a9ad
Author: Stefan Metzmacher <me...@samba.org>
Date: Sun Feb 1 00:03:47 2009 +0100
s4:irpc: avoid c++ reserved word 'private'
metze
commit 96f176dbd84090fd18b8c796f869ddaa2da39e59
Author: Stefan Metzmacher <me...@samba.org>
Date: Sun Feb 1 00:02:17 2009 +0100
s4:lib/messaging: fix warnings in testsuite
metze
commit f3f2dfc51a25080290e13ed1d1f8c85932e0be31
Author: Stefan Metzmacher <me...@samba.org>
Date: Sat Jan 31 23:57:02 2009 +0100
s4:lib/messaging: avoid c++ reserved word 'private'
metze
commit 15239f742cfcebe0bce4dbf4cb74eb2e8dcab364
Author: Stefan Metzmacher <me...@samba.org>
Date: Sat Jan 31 23:43:43 2009 +0100
s4:kdc: avoid c++ reserved word 'private'
metze
commit 06a24497dc167853bbd2171e50945595a62c5623
Author: Stefan Metzmacher <me...@samba.org>
Date: Sat Jan 31 23:32:01 2009 +0100
s4:nbt_server/wins/: fix compiler warnings in winsdb.c
metze
-----------------------------------------------------------------------
Summary of changes:
source4/kdc/hdb-samba4.c | 52 ++++++++++++++--------------
source4/kdc/kdc.c | 15 ++++----
source4/kdc/pac-glue.c | 34 +++++++++---------
source4/lib/messaging/irpc.h | 18 +++++-----
source4/lib/messaging/messaging.c | 42 +++++++++++-----------
source4/lib/messaging/tests/irpc.c | 12 +++---
source4/libcli/composite/composite.c | 2 +-
source4/libcli/finddcs.c | 2 +-
source4/libcli/wbclient/wbclient.c | 4 +-
source4/nbt_server/irpc.c | 5 ++-
source4/nbt_server/wins/winsdb.c | 2 +-
source4/nbt_server/wins/winswack.c | 4 +-
source4/smb_server/management.c | 6 ++-
source4/winbind/wb_irpc.c | 4 +-
source4/wrepl_server/wrepl_apply_records.c | 12 +++---
source4/wrepl_server/wrepl_scavenging.c | 4 +-
16 files changed, 111 insertions(+), 107 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index 937839d..daeed77 100644
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -186,9 +186,9 @@ static HDBFlags uf2HDBFlags(krb5_context context, int
userAccountControl, enum h
return flags;
}
-static int hdb_ldb_destructor(struct hdb_ldb_private *private)
+static int hdb_ldb_destructor(struct hdb_ldb_private *p)
{
- hdb_entry_ex *entry_ex = private->entry_ex;
+ hdb_entry_ex *entry_ex = p->entry_ex;
free_hdb_entry(&entry_ex->entry);
return 0;
}
@@ -509,7 +509,7 @@ static krb5_error_code LDB_message2entry(krb5_context
context, HDB *db,
"nCName",
ldb_dn_new(mem_ctx,
(struct ldb_context *)db->hdb_db, NULL));
- struct hdb_ldb_private *private;
+ struct hdb_ldb_private *p;
NTTIME acct_expiry;
struct ldb_message_element *objectclasses;
@@ -531,19 +531,19 @@ static krb5_error_code LDB_message2entry(krb5_context
context, HDB *db,
goto out;
}
- private = talloc(mem_ctx, struct hdb_ldb_private);
- if (!private) {
+ p = talloc(mem_ctx, struct hdb_ldb_private);
+ if (!p) {
ret = ENOMEM;
goto out;
}
- private->entry_ex = entry_ex;
- private->iconv_convenience = lp_iconv_convenience(lp_ctx);
- private->netbios_name = lp_netbios_name(lp_ctx);
+ p->entry_ex = entry_ex;
+ p->iconv_convenience = lp_iconv_convenience(lp_ctx);
+ p->netbios_name = lp_netbios_name(lp_ctx);
- talloc_set_destructor(private, hdb_ldb_destructor);
+ talloc_set_destructor(p, hdb_ldb_destructor);
- entry_ex->ctx = private;
+ entry_ex->ctx = p;
entry_ex->free_entry = hdb_ldb_free_entry;
userAccountControl = ldb_msg_find_attr_as_uint(msg,
"userAccountControl", 0);
@@ -655,7 +655,7 @@ static krb5_error_code LDB_message2entry(krb5_context
context, HDB *db,
entry_ex->entry.generation = NULL;
/* Get keys from the db */
- ret = LDB_message2entry_keys(context, private->iconv_convenience,
private, msg, userAccountControl, entry_ex);
+ ret = LDB_message2entry_keys(context, p->iconv_convenience, p, msg,
userAccountControl, entry_ex);
if (ret) {
/* Could be bougus data in the entry, or out of memory */
goto out;
@@ -679,9 +679,9 @@ static krb5_error_code LDB_message2entry(krb5_context
context, HDB *db,
}
- private->msg = talloc_steal(private, msg);
- private->realm_ref_msg = talloc_steal(private, realm_ref_msg);
- private->samdb = (struct ldb_context *)db->hdb_db;
+ p->msg = talloc_steal(p, msg);
+ p->realm_ref_msg = talloc_steal(p, realm_ref_msg);
+ p->samdb = (struct ldb_context *)db->hdb_db;
out:
if (ret != 0) {
@@ -712,24 +712,24 @@ static krb5_error_code
LDB_trust_message2entry(krb5_context context, HDB *db,
struct samr_Password password_hash;
const struct ldb_val *password_val;
struct trustAuthInOutBlob password_blob;
- struct hdb_ldb_private *private;
+ struct hdb_ldb_private *p;
enum ndr_err_code ndr_err;
int i, ret, trust_direction_flags;
- private = talloc(mem_ctx, struct hdb_ldb_private);
- if (!private) {
+ p = talloc(mem_ctx, struct hdb_ldb_private);
+ if (!p) {
ret = ENOMEM;
goto out;
}
- private->entry_ex = entry_ex;
- private->iconv_convenience = lp_iconv_convenience(lp_ctx);
- private->netbios_name = lp_netbios_name(lp_ctx);
+ p->entry_ex = entry_ex;
+ p->iconv_convenience = lp_iconv_convenience(lp_ctx);
+ p->netbios_name = lp_netbios_name(lp_ctx);
- talloc_set_destructor(private, hdb_ldb_destructor);
+ talloc_set_destructor(p, hdb_ldb_destructor);
- entry_ex->ctx = private;
+ entry_ex->ctx = p;
entry_ex->free_entry = hdb_ldb_free_entry;
/* use 'whenCreated' */
@@ -756,7 +756,7 @@ static krb5_error_code LDB_trust_message2entry(krb5_context
context, HDB *db,
goto out;
}
- ndr_err = ndr_pull_struct_blob(password_val, mem_ctx,
private->iconv_convenience, &password_blob,
+ ndr_err = ndr_pull_struct_blob(password_val, mem_ctx,
p->iconv_convenience, &password_blob,
(ndr_pull_flags_fn_t)ndr_pull_trustAuthInOutBlob);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
ret = EINVAL;
@@ -868,9 +868,9 @@ static krb5_error_code LDB_trust_message2entry(krb5_context
context, HDB *db,
}
- private->msg = talloc_steal(private, msg);
- private->realm_ref_msg = NULL;
- private->samdb = (struct ldb_context *)db->hdb_db;
+ p->msg = talloc_steal(p, msg);
+ p->realm_ref_msg = NULL;
+ p->samdb = (struct ldb_context *)db->hdb_db;
out:
if (ret != 0) {
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index c11c4a6..48ef5c5 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -200,9 +200,9 @@ static void kdc_recv_handler(struct kdc_socket *kdc_socket)
handle fd events on a KDC socket
*/
static void kdc_socket_handler(struct tevent_context *ev, struct tevent_fd
*fde,
- uint16_t flags, void *private)
+ uint16_t flags, void *private_data)
{
- struct kdc_socket *kdc_socket = talloc_get_type(private, struct
kdc_socket);
+ struct kdc_socket *kdc_socket = talloc_get_type(private_data, struct
kdc_socket);
if (flags & EVENT_FD_WRITE) {
kdc_send_handler(kdc_socket);
}
@@ -219,9 +219,9 @@ static void kdc_tcp_terminate_connection(struct
kdc_tcp_connection *kdcconn, con
/*
receive a full packet on a KDC connection
*/
-static NTSTATUS kdc_tcp_recv(void *private, DATA_BLOB blob)
+static NTSTATUS kdc_tcp_recv(void *private_data, DATA_BLOB blob)
{
- struct kdc_tcp_connection *kdcconn = talloc_get_type(private,
+ struct kdc_tcp_connection *kdcconn = talloc_get_type(private_data,
struct
kdc_tcp_connection);
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
TALLOC_CTX *tmp_ctx = talloc_new(kdcconn);
@@ -293,9 +293,10 @@ static void kdc_tcp_recv_handler(struct stream_connection
*conn, uint16_t flags)
/*
called on a tcp recv error
*/
-static void kdc_tcp_recv_error(void *private, NTSTATUS status)
+static void kdc_tcp_recv_error(void *private_data, NTSTATUS status)
{
- struct kdc_tcp_connection *kdcconn = talloc_get_type(private, struct
kdc_tcp_connection);
+ struct kdc_tcp_connection *kdcconn = talloc_get_type(private_data,
+ struct kdc_tcp_connection);
kdc_tcp_terminate_connection(kdcconn, nt_errstr(status));
}
@@ -565,7 +566,7 @@ static NTSTATUS kdc_check_generic_kerberos(struct
irpc_message *msg,
struct PAC_Validate pac_validate;
DATA_BLOB srv_sig;
struct PAC_SIGNATURE_DATA kdc_sig;
- struct kdc_server *kdc = talloc_get_type(msg->private, struct
kdc_server);
+ struct kdc_server *kdc = talloc_get_type(msg->private_data, struct
kdc_server);
enum ndr_err_code ndr_err;
krb5_enctype etype;
int ret;
diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index 74bec85..1a0df8e 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -111,8 +111,8 @@ krb5_error_code samba_kdc_get_pac(void *priv,
krb5_error_code ret;
NTSTATUS nt_status;
struct auth_serversupplied_info *server_info;
- struct hdb_ldb_private *private = talloc_get_type(client->ctx, struct
hdb_ldb_private);
- TALLOC_CTX *mem_ctx = talloc_named(private, 0, "samba_get_pac context");
+ struct hdb_ldb_private *p = talloc_get_type(client->ctx, struct
hdb_ldb_private);
+ TALLOC_CTX *mem_ctx = talloc_named(p, 0, "samba_get_pac context");
unsigned int userAccountControl;
if (!mem_ctx) {
@@ -120,16 +120,16 @@ krb5_error_code samba_kdc_get_pac(void *priv,
}
/* The user account may be set not to want the PAC */
- userAccountControl = ldb_msg_find_attr_as_uint(private->msg,
"userAccountControl", 0);
+ userAccountControl = ldb_msg_find_attr_as_uint(p->msg,
"userAccountControl", 0);
if (userAccountControl & UF_NO_AUTH_DATA_REQUIRED) {
*pac = NULL;
return 0;
}
- nt_status = authsam_make_server_info(mem_ctx, private->samdb,
- private->netbios_name,
- private->msg,
- private->realm_ref_msg,
+ nt_status = authsam_make_server_info(mem_ctx, p->samdb,
+ p->netbios_name,
+ p->msg,
+ p->realm_ref_msg,
data_blob(NULL, 0),
data_blob(NULL, 0),
&server_info);
@@ -139,7 +139,7 @@ krb5_error_code samba_kdc_get_pac(void *priv,
return ENOMEM;
}
- ret = make_pac(context, mem_ctx, private->iconv_convenience,
server_info, pac);
+ ret = make_pac(context, mem_ctx, p->iconv_convenience, server_info,
pac);
talloc_free(mem_ctx);
return ret;
@@ -156,25 +156,25 @@ krb5_error_code samba_kdc_reget_pac(void *priv,
krb5_context context,
unsigned int userAccountControl;
- struct hdb_ldb_private *private = talloc_get_type(server->ctx, struct
hdb_ldb_private);
+ struct hdb_ldb_private *p = talloc_get_type(server->ctx, struct
hdb_ldb_private);
struct auth_serversupplied_info *server_info_out;
- TALLOC_CTX *mem_ctx = talloc_named(private, 0, "samba_get_pac context");
+ TALLOC_CTX *mem_ctx = talloc_named(p, 0, "samba_get_pac context");
if (!mem_ctx) {
return ENOMEM;
}
/* The service account may be set not to want the PAC */
- userAccountControl = ldb_msg_find_attr_as_uint(private->msg,
"userAccountControl", 0);
+ userAccountControl = ldb_msg_find_attr_as_uint(p->msg,
"userAccountControl", 0);
if (userAccountControl & UF_NO_AUTH_DATA_REQUIRED) {
talloc_free(mem_ctx);
*pac = NULL;
return 0;
}
- ret = kerberos_pac_to_server_info(mem_ctx, private->iconv_convenience,
+ ret = kerberos_pac_to_server_info(mem_ctx, p->iconv_convenience,
*pac, context, &server_info_out);
/* We will compleatly regenerate this pac */
@@ -185,7 +185,7 @@ krb5_error_code samba_kdc_reget_pac(void *priv,
krb5_context context,
return ret;
}
- ret = make_pac(context, mem_ctx, private->iconv_convenience,
server_info_out, pac);
+ ret = make_pac(context, mem_ctx, p->iconv_convenience, server_info_out,
pac);
talloc_free(mem_ctx);
return ret;
@@ -236,7 +236,7 @@ krb5_error_code samba_kdc_check_client_access(void *priv,
krb5_error_code ret;
NTSTATUS nt_status;
TALLOC_CTX *tmp_ctx = talloc_new(entry_ex->ctx);
- struct hdb_ldb_private *private = talloc_get_type(entry_ex->ctx, struct
hdb_ldb_private);
+ struct hdb_ldb_private *p = talloc_get_type(entry_ex->ctx, struct
hdb_ldb_private);
char *name, *workstation = NULL;
HostAddresses *addresses = req->req_body.addresses;
int i;
@@ -272,10 +272,10 @@ krb5_error_code samba_kdc_check_client_access(void *priv,
/* we allow all kinds of trusts here */
nt_status = authsam_account_ok(tmp_ctx,
- private->samdb,
+ p->samdb,
MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT |
MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT,
- private->msg,
- private->realm_ref_msg,
+ p->msg,
+ p->realm_ref_msg,
workstation,
name, true);
free(name);
diff --git a/source4/lib/messaging/irpc.h b/source4/lib/messaging/irpc.h
index fa91a14..3c51882 100644
--- a/source4/lib/messaging/irpc.h
+++ b/source4/lib/messaging/irpc.h
@@ -30,7 +30,7 @@
*/
struct irpc_message {
struct server_id from;
- void *private;
+ void *private_data;
struct irpc_header header;
struct ndr_pull *ndr;
bool defer_reply;
@@ -48,10 +48,10 @@ struct irpc_message {
typedef NTSTATUS (*irpc_function_t)(struct irpc_message *, void *r);
/* register a server function with the irpc messaging system */
-#define IRPC_REGISTER(msg_ctx, pipename, funcname, function, private) \
+#define IRPC_REGISTER(msg_ctx, pipename, funcname, function, private_data) \
irpc_register(msg_ctx, &ndr_table_ ## pipename, \
NDR_ ## funcname, \
- (irpc_function_t)function, private)
+ (irpc_function_t)function, private_data)
/* make a irpc call */
#define IRPC_CALL(msg_ctx, server_id, pipename, funcname, ptr, ctx) \
@@ -76,22 +76,22 @@ struct irpc_request {
TALLOC_CTX *mem_ctx;
struct {
void (*fn)(struct irpc_request *);
- void *private;
+ void *private_data;
} async;
};
struct loadparm_context;
-typedef void (*msg_callback_t)(struct messaging_context *msg, void *private,
+typedef void (*msg_callback_t)(struct messaging_context *msg, void
*private_data,
uint32_t msg_type,
struct server_id server_id, DATA_BLOB *data);
NTSTATUS messaging_send(struct messaging_context *msg, struct server_id
server,
uint32_t msg_type, DATA_BLOB *data);
-NTSTATUS messaging_register(struct messaging_context *msg, void *private,
+NTSTATUS messaging_register(struct messaging_context *msg, void *private_data,
uint32_t msg_type,
msg_callback_t fn);
-NTSTATUS messaging_register_tmp(struct messaging_context *msg, void *private,
+NTSTATUS messaging_register_tmp(struct messaging_context *msg, void
*private_data,
msg_callback_t fn, uint32_t *msg_type);
struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx,
const char *dir,
@@ -104,14 +104,14 @@ struct messaging_context
*messaging_client_init(TALLOC_CTX *mem_ctx,
struct tevent_context *ev);
NTSTATUS messaging_send_ptr(struct messaging_context *msg, struct server_id
server,
uint32_t msg_type, void *ptr);
-void messaging_deregister(struct messaging_context *msg, uint32_t msg_type,
void *private);
+void messaging_deregister(struct messaging_context *msg, uint32_t msg_type,
void *private_data);
NTSTATUS irpc_register(struct messaging_context *msg_ctx,
const struct ndr_interface_table *table,
- int call, irpc_function_t fn, void *private);
+ int call, irpc_function_t fn, void *private_data);
struct irpc_request *irpc_call_send(struct messaging_context *msg_ctx,
struct server_id server_id,
const struct ndr_interface_table *table,
diff --git a/source4/lib/messaging/messaging.c
b/source4/lib/messaging/messaging.c
index decad7b..cfceeff 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -64,7 +64,7 @@ struct messaging_context {
struct dispatch_fn {
struct dispatch_fn *next, *prev;
uint32_t msg_type;
- void *private;
+ void *private_data;
msg_callback_t fn;
};
@@ -94,7 +94,7 @@ static void irpc_handler(struct messaging_context *, void *,
/*
A useful function for testing the message system.
*/
-static void ping_message(struct messaging_context *msg, void *private,
+static void ping_message(struct messaging_context *msg, void *private_data,
uint32_t msg_type, struct server_id src, DATA_BLOB
*data)
{
DEBUG(1,("INFO: Received PING message from server %u.%u [%.*s]\n",
@@ -109,7 +109,7 @@ static void ping_message(struct messaging_context *msg,
void *private,
static NTSTATUS irpc_uptime(struct irpc_message *msg,
struct irpc_uptime *r)
{
- struct messaging_context *ctx = talloc_get_type(msg->private, struct
messaging_context);
+ struct messaging_context *ctx = talloc_get_type(msg->private_data,
struct messaging_context);
*r->out.start_time = timeval_to_nttime(&ctx->start_time);
return NT_STATUS_OK;
}
@@ -149,7 +149,7 @@ static void messaging_dispatch(struct messaging_context
*msg, struct messaging_r
next = d->next;
data.data = rec->packet.data + sizeof(*rec->header);
data.length = rec->header->length;
- d->fn(msg, d->private, d->msg_type, rec->header->from, &data);
+ d->fn(msg, d->private_data, d->msg_type, rec->header->from,
&data);
}
rec->header->length = 0;
}
@@ -217,9 +217,9 @@ static NTSTATUS try_send(struct messaging_rec *rec)
retry backed off messages
*/
static void msg_retry_timer(struct tevent_context *ev, struct tevent_timer
*te,
- struct timeval t, void *private)
+ struct timeval t, void *private_data)
{
- struct messaging_context *msg = talloc_get_type(private,
+ struct messaging_context *msg = talloc_get_type(private_data,
struct
messaging_context);
msg->retry_te = NULL;
@@ -339,9 +339,9 @@ static void messaging_recv_handler(struct messaging_context
*msg)
handle a socket event
*/
static void messaging_handler(struct tevent_context *ev, struct tevent_fd
*fde,
- uint16_t flags, void *private)
+ uint16_t flags, void *private_data)
{
- struct messaging_context *msg = talloc_get_type(private,
+ struct messaging_context *msg = talloc_get_type(private_data,
struct
messaging_context);
if (flags & EVENT_FD_WRITE) {
messaging_send_handler(msg);
@@ -355,7 +355,7 @@ static void messaging_handler(struct tevent_context *ev,
struct tevent_fd *fde,
/*
Register a dispatch function for a particular message type.
*/
-NTSTATUS messaging_register(struct messaging_context *msg, void *private,
+NTSTATUS messaging_register(struct messaging_context *msg, void *private_data,
uint32_t msg_type, msg_callback_t fn)
{
struct dispatch_fn *d;
@@ -376,7 +376,7 @@ NTSTATUS messaging_register(struct messaging_context *msg,
void *private,
d = talloc_zero(msg->dispatch, struct dispatch_fn);
NT_STATUS_HAVE_NO_MEMORY(d);
d->msg_type = msg_type;
- d->private = private;
+ d->private_data = private_data;
d->fn = fn;
DLIST_ADD(msg->dispatch[msg_type], d);
@@ -388,7 +388,7 @@ NTSTATUS messaging_register(struct messaging_context *msg,
void *private,
register a temporary message handler. The msg_type is allocated
above MSG_TMP_BASE
*/
-NTSTATUS messaging_register_tmp(struct messaging_context *msg, void *private,
+NTSTATUS messaging_register_tmp(struct messaging_context *msg, void
*private_data,
msg_callback_t fn, uint32_t *msg_type)
{
struct dispatch_fn *d;
@@ -396,7 +396,7 @@ NTSTATUS messaging_register_tmp(struct messaging_context
*msg, void *private,
d = talloc_zero(msg->dispatch, struct dispatch_fn);
NT_STATUS_HAVE_NO_MEMORY(d);
- d->private = private;
+ d->private_data = private_data;
d->fn = fn;
id = idr_get_new_above(msg->dispatch_tree, d, MSG_TMP_BASE, UINT16_MAX);
@@ -414,7 +414,7 @@ NTSTATUS messaging_register_tmp(struct messaging_context
*msg, void *private,
/*
De-register the function for a particular message type.
*/
-void messaging_deregister(struct messaging_context *msg, uint32_t msg_type,
void *private)
+void messaging_deregister(struct messaging_context *msg, uint32_t msg_type,
void *private_data)
{
struct dispatch_fn *d, *next;
@@ -429,7 +429,7 @@ void messaging_deregister(struct messaging_context *msg,
uint32_t msg_type, void
for (d = msg->dispatch[msg_type]; d; d = next) {
next = d->next;
- if (d->private == private) {
+ if (d->private_data == private_data) {
DLIST_REMOVE(msg->dispatch[msg_type], d);
talloc_free(d);
}
@@ -631,7 +631,7 @@ struct irpc_list {
const struct ndr_interface_table *table;
int callnum;
irpc_function_t fn;
- void *private;
+ void *private_data;
};
@@ -640,7 +640,7 @@ struct irpc_list {
*/
NTSTATUS irpc_register(struct messaging_context *msg_ctx,
const struct ndr_interface_table *table,
- int callnum, irpc_function_t fn, void *private)
+ int callnum, irpc_function_t fn, void *private_data)
{
struct irpc_list *irpc;
@@ -659,7 +659,7 @@ NTSTATUS irpc_register(struct messaging_context *msg_ctx,
irpc->table = table;
irpc->callnum = callnum;
irpc->fn = fn;
- irpc->private = private;
+ irpc->private_data = private_data;
irpc->uuid = irpc->table->syntax_id.uuid;
--
Samba Shared Repository
