diff options
| author | Andreas Schneider <asn@samba.org> | 2011-08-19 18:10:29 +0200 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2011-08-21 09:08:25 -0400 |
| commit | 61ada700a6ad010846b132d866c66220e6379054 (patch) | |
| tree | bdcf9da432dc302d5c276ae192fc50fe6332e23c /source3/smbd | |
| parent | 177db0a8802842a0eb9801622bee9f4c1592ef88 (diff) | |
| download | samba-61ada700a6ad010846b132d866c66220e6379054.tar.gz samba-61ada700a6ad010846b132d866c66220e6379054.tar.bz2 samba-61ada700a6ad010846b132d866c66220e6379054.zip | |
s3-id_cache: Use better names for id cache management ops
The IDMAP term is normally associated with Winbind's idmap stuff.
These functions deal with id caching not id mapping.
Signed-off-by: Simo Sorce <idra@samba.org>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/msg_idmap.c | 6 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 2 | ||||
| -rw-r--r-- | source3/smbd/server.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/msg_idmap.c b/source3/smbd/msg_idmap.c index 0a24bb1626..702f545bb1 100644 --- a/source3/smbd/msg_idmap.c +++ b/source3/smbd/msg_idmap.c @@ -86,7 +86,7 @@ static bool id_in_use(const struct user_struct* user, return false; } -static void message_idmap_kill(struct messaging_context *msg_ctx, +static void id_cache_kill(struct messaging_context *msg_ctx, void *private_data, uint32_t msg_type, struct server_id server_id, @@ -106,7 +106,7 @@ static void message_idmap_kill(struct messaging_context *msg_ctx, } } -void msg_idmap_register_kill_msg(struct messaging_context *ctx) +void id_cache_register_kill_msg(struct messaging_context *ctx) { - messaging_register(ctx, NULL, MSG_IDMAP_KILL, message_idmap_kill); + messaging_register(ctx, NULL, ID_CACHE_KILL, id_cache_kill); } diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 554d907d89..289c012b48 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -1182,6 +1182,6 @@ void *avahi_start_register(TALLOC_CTX *mem_ctx, struct tevent_context *ev, /* The following definitions come from smbd/msg_idmap.c */ -void msg_idmap_register_kill_msg(struct messaging_context *ctx); +void id_cache_register_kill_msg(struct messaging_context *ctx); #endif /* _SMBD_PROTO_H_ */ diff --git a/source3/smbd/server.c b/source3/smbd/server.c index e547d38581..26e3c86edf 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -749,8 +749,8 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent, smb_pcap_updated); brl_register_msgs(msg_ctx); - msg_idmap_register_msgs(msg_ctx); - msg_idmap_register_kill_msg(msg_ctx); + id_cache_register_msgs(msg_ctx); + id_cache_register_kill_msg(msg_ctx); #ifdef CLUSTER_SUPPORT if (lp_clustering()) { |