From b01958b0bdb1a7115b82fc7029d8ffe630614cff Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 4 Jul 2010 16:08:03 +0200 Subject: s3: Remove serverid_[de]register_self This removes some deep references to procid_self() --- source3/lib/serverid.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'source3/lib/serverid.c') diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c index dc4834b8da..f92c8cfd58 100644 --- a/source3/lib/serverid.c +++ b/source3/lib/serverid.c @@ -76,7 +76,7 @@ static void serverid_fill_key(const struct server_id *id, #endif } -bool serverid_register(const struct server_id *id, uint32_t msg_flags) +bool serverid_register(const struct server_id id, uint32_t msg_flags) { struct db_context *db; struct serverid_key key; @@ -91,7 +91,7 @@ bool serverid_register(const struct server_id *id, uint32_t msg_flags) return false; } - serverid_fill_key(id, &key); + serverid_fill_key(&id, &key); tdbkey = make_tdb_data((uint8_t *)&key, sizeof(key)); rec = db->fetch_locked(db, talloc_tos(), tdbkey); @@ -101,7 +101,7 @@ bool serverid_register(const struct server_id *id, uint32_t msg_flags) } ZERO_STRUCT(data); - data.unique_id = id->unique_id; + data.unique_id = id.unique_id; data.msg_flags = msg_flags; tdbdata = make_tdb_data((uint8_t *)&data, sizeof(data)); @@ -117,15 +117,7 @@ done: return ret; } -bool serverid_register_self(uint32_t msg_flags) -{ - struct server_id pid; - - pid = procid_self(); - return serverid_register(&pid, msg_flags); -} - -bool serverid_deregister(const struct server_id *id) +bool serverid_deregister(struct server_id id) { struct db_context *db; struct serverid_key key; @@ -139,7 +131,7 @@ bool serverid_deregister(const struct server_id *id) return false; } - serverid_fill_key(id, &key); + serverid_fill_key(&id, &key); tdbkey = make_tdb_data((uint8_t *)&key, sizeof(key)); rec = db->fetch_locked(db, talloc_tos(), tdbkey); @@ -160,14 +152,6 @@ done: return ret; } -bool serverid_deregister_self(void) -{ - struct server_id pid; - - pid = procid_self(); - return serverid_deregister(&pid); -} - struct serverid_exists_state { const struct server_id *id; bool exists; -- cgit