From c54e6b19e395724eb84f6e7157073e8772bc8594 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 6 Aug 2009 13:22:33 +0200 Subject: s3:smbd: add a smbd_server_connection pointer to connection_struct This can be NULL for faked connection structs used in the rpc server or printing code. metze --- source3/include/proto.h | 6 ++---- source3/include/smb.h | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'source3/include') diff --git a/source3/include/proto.h b/source3/include/proto.h index ccd8746603..667e847485 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -6145,8 +6145,7 @@ bool conn_close_all(struct smbd_server_connection *sconn); bool conn_idle_all(struct smbd_server_connection *sconn, time_t t); void conn_clear_vuid_caches(struct smbd_server_connection *sconn, uint16 vuid); void conn_free_internal(connection_struct *conn); -void conn_free(struct smbd_server_connection *sconn, - connection_struct *conn); +void conn_free(connection_struct *conn); void msg_force_tdis(struct messaging_context *msg, void *private_data, uint32_t msg_type, @@ -6984,8 +6983,7 @@ connection_struct *make_connection(struct smbd_server_connection *sconn, const char *service_in, DATA_BLOB password, const char *pdev, uint16 vuid, NTSTATUS *status); -void close_cnum(struct smbd_server_connection *sconn, - connection_struct *conn, uint16 vuid); +void close_cnum(connection_struct *conn, uint16 vuid); /* The following definitions come from smbd/session.c */ diff --git a/source3/include/smb.h b/source3/include/smb.h index e2d670fa04..c33c5363f3 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -546,6 +546,7 @@ struct share_iterator { typedef struct connection_struct { struct connection_struct *next, *prev; + struct smbd_server_connection *sconn; /* can be NULL */ unsigned cnum; /* an index passed over the wire */ struct share_params *params; bool force_user; -- cgit