diff options
| -rw-r--r-- | source4/smb_server/smb/receive.c | 4 | ||||
| -rw-r--r-- | source4/smb_server/smb/search.c | 4 | ||||
| -rw-r--r-- | source4/smb_server/smb/trans2.c | 4 | ||||
| -rw-r--r-- | source4/smb_server/smb2/find.c | 4 | ||||
| -rw-r--r-- | source4/smb_server/smb2/receive.c | 4 | ||||
| -rw-r--r-- | source4/smb_server/smb_server.c | 8 |
6 files changed, 14 insertions, 14 deletions
diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c index 0afa3a652d..03631f8f0b 100644 --- a/source4/smb_server/smb/receive.c +++ b/source4/smb_server/smb/receive.c @@ -351,9 +351,9 @@ static const struct smb_message_struct receive a SMB request header from the wire, forming a request_context from the result ****************************************************************************/ -NTSTATUS smbsrv_recv_smb_request(void *private, DATA_BLOB blob) +NTSTATUS smbsrv_recv_smb_request(void *private_data, DATA_BLOB blob) { - struct smbsrv_connection *smb_conn = talloc_get_type(private, struct smbsrv_connection); + struct smbsrv_connection *smb_conn = talloc_get_type(private_data, struct smbsrv_connection); struct smbsrv_request *req; struct timeval cur_time = timeval_current(); uint8_t command; diff --git a/source4/smb_server/smb/search.c b/source4/smb_server/smb/search.c index 90b2331271..bf4721757b 100644 --- a/source4/smb_server/smb/search.c +++ b/source4/smb_server/smb/search.c @@ -65,9 +65,9 @@ static bool find_fill_info(struct smbsrv_request *req, } /* callback function for search first/next */ -static bool find_callback(void *private, const union smb_search_data *file) +static bool find_callback(void *private_data, const union smb_search_data *file) { - struct search_state *state = (struct search_state *)private; + struct search_state *state = (struct search_state *)private_data; return find_fill_info(state->req, file); } diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c index 40ffeeef48..e0f6438dc6 100644 --- a/source4/smb_server/smb/trans2.c +++ b/source4/smb_server/smb/trans2.c @@ -800,9 +800,9 @@ static NTSTATUS find_fill_info(struct find_state *state, } /* callback function for trans2 findfirst/findnext */ -static bool find_callback(void *private, const union smb_search_data *file) +static bool find_callback(void *private_data, const union smb_search_data *file) { - struct find_state *state = talloc_get_type(private, struct find_state); + struct find_state *state = talloc_get_type(private_data, struct find_state); struct smb_trans2 *trans = state->op->trans; uint_t old_length; diff --git a/source4/smb_server/smb2/find.c b/source4/smb_server/smb2/find.c index 32b280c5c2..10fcda9434 100644 --- a/source4/smb_server/smb2/find.c +++ b/source4/smb_server/smb2/find.c @@ -40,9 +40,9 @@ struct smb2srv_find_state { }; /* callback function for SMB2 Find */ -static bool smb2srv_find_callback(void *private, const union smb_search_data *file) +static bool smb2srv_find_callback(void *private_data, const union smb_search_data *file) { - struct smb2srv_find_state *state = talloc_get_type(private, struct smb2srv_find_state); + struct smb2srv_find_state *state = talloc_get_type(private_data, struct smb2srv_find_state); struct smb2_find *info = state->info; uint32_t old_length; NTSTATUS status; diff --git a/source4/smb_server/smb2/receive.c b/source4/smb_server/smb2/receive.c index c3607f0a33..5a857e133f 100644 --- a/source4/smb_server/smb2/receive.c +++ b/source4/smb_server/smb2/receive.c @@ -449,9 +449,9 @@ notcon: return NT_STATUS_OK; } -NTSTATUS smbsrv_recv_smb2_request(void *private, DATA_BLOB blob) +NTSTATUS smbsrv_recv_smb2_request(void *private_data, DATA_BLOB blob) { - struct smbsrv_connection *smb_conn = talloc_get_type(private, struct smbsrv_connection); + struct smbsrv_connection *smb_conn = talloc_get_type(private_data, struct smbsrv_connection); struct smb2srv_request *req; struct timeval cur_time = timeval_current(); uint32_t protocol_version; diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index e9531d8b39..a18440bfa8 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -34,10 +34,10 @@ #include "dsdb/samdb/samdb.h" #include "param/param.h" -static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) +static NTSTATUS smbsrv_recv_generic_request(void *private_data, DATA_BLOB blob) { NTSTATUS status; - struct smbsrv_connection *smb_conn = talloc_get_type(private, struct smbsrv_connection); + struct smbsrv_connection *smb_conn = talloc_get_type(private_data, struct smbsrv_connection); uint32_t protocol_version; /* see if its a special NBT packet */ @@ -109,9 +109,9 @@ static void smbsrv_send(struct stream_connection *conn, uint16_t flags) /* handle socket recv errors */ -static void smbsrv_recv_error(void *private, NTSTATUS status) +static void smbsrv_recv_error(void *private_data, NTSTATUS status) { - struct smbsrv_connection *smb_conn = talloc_get_type(private, struct smbsrv_connection); + struct smbsrv_connection *smb_conn = talloc_get_type(private_data, struct smbsrv_connection); smbsrv_terminate_connection(smb_conn, nt_errstr(status)); } |