diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-25 13:00:22 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-31 00:32:07 +0200 |
| commit | 8524924a460349a9aa56db475d771b8884fbe517 (patch) | |
| tree | e96bf4378c676fdf8f4d2ba6f993aea9837e315e /source3/smbd/proto.h | |
| parent | c981d4fa1269569a1c2db4bf72a67a357aacd69f (diff) | |
| download | samba-8524924a460349a9aa56db475d771b8884fbe517.tar.gz samba-8524924a460349a9aa56db475d771b8884fbe517.tar.bz2 samba-8524924a460349a9aa56db475d771b8884fbe517.zip | |
s3-smbd provide struct smbd_server_connection * to conn_snum_used
This provides the 'sconn' parameter to this key functions, that
is currently duplicated in dummysmbd.c, which causes duplicate symbol
issues in the waf build.
This has natrually caused a number of consequential changes across the
codebase, includning not passing a messaging context into initial
reload_services():
This causes problems because the global smbd_server_connection isn't
yet set up, as there isn't a connection here, just the initial
process.
Andrew Bartlett
Diffstat (limited to 'source3/smbd/proto.h')
| -rw-r--r-- | source3/smbd/proto.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 589d45dade..5b45574bc5 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -94,7 +94,7 @@ NTSTATUS delete_all_streams(connection_struct *conn, const char *fname); void conn_init(struct smbd_server_connection *sconn); int conn_num_open(struct smbd_server_connection *sconn); -bool conn_snum_used(int snum); +bool conn_snum_used(struct smbd_server_connection *sconn, int snum); connection_struct *conn_find(struct smbd_server_connection *sconn, unsigned cnum); connection_struct *conn_new(struct smbd_server_connection *sconn); @@ -407,7 +407,8 @@ bool create_junction(TALLOC_CTX *ctx, struct junction_map *jucn); bool create_msdfs_link(const struct junction_map *jucn); bool remove_msdfs_link(const struct junction_map *jucn); -struct junction_map *enum_msdfs_links(TALLOC_CTX *ctx, size_t *p_num_jn); +struct junction_map *enum_msdfs_links(struct smbd_server_connection *sconn, + TALLOC_CTX *ctx, size_t *p_num_jn); NTSTATUS resolve_dfspath(TALLOC_CTX *ctx, connection_struct *conn, bool dfs_pathnames, |