diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
| commit | 6d139ca4680abcbda5110f2f0886aa038ff62088 (patch) | |
| tree | 7d61db40fb058bcbf08ccd8e0dadc365b819371b /source4/smb_server/smb_server.c | |
| parent | 4a9b3052caeb8bb144803b49dcfae82395172bc3 (diff) | |
| parent | afa960cbbcd609123d710c301e7a9a070c1fed70 (diff) | |
| download | samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.gz samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.bz2 samba-6d139ca4680abcbda5110f2f0886aa038ff62088.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
librpc/ndr.pc.in
Diffstat (limited to 'source4/smb_server/smb_server.c')
| -rw-r--r-- | source4/smb_server/smb_server.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index e9531d8b39..6206a03b21 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 */ @@ -88,7 +88,7 @@ void smbsrv_terminate_connection(struct smbsrv_connection *smb_conn, const char */ static void smbsrv_recv(struct stream_connection *conn, uint16_t flags) { - struct smbsrv_connection *smb_conn = talloc_get_type(conn->private, + struct smbsrv_connection *smb_conn = talloc_get_type(conn->private_data, struct smbsrv_connection); DEBUG(10,("smbsrv_recv\n")); @@ -101,7 +101,7 @@ static void smbsrv_recv(struct stream_connection *conn, uint16_t flags) */ static void smbsrv_send(struct stream_connection *conn, uint16_t flags) { - struct smbsrv_connection *smb_conn = talloc_get_type(conn->private, + struct smbsrv_connection *smb_conn = talloc_get_type(conn->private_data, struct smbsrv_connection); packet_queue_run(smb_conn->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)); } @@ -148,7 +148,7 @@ static void smbsrv_accept(struct stream_connection *conn) smb_conn->lp_ctx = conn->lp_ctx; smb_conn->connection = conn; - conn->private = smb_conn; + conn->private_data = smb_conn; smb_conn->statistics.connect_time = timeval_current(); |