diff options
Diffstat (limited to 'source3/winbindd')
| -rw-r--r-- | source3/winbindd/winbindd.c | 7 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_proto.h | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index 411f079137..afb1ba53fa 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/winbindd/winbindd.c @@ -199,6 +199,7 @@ static void terminate(bool is_parent) #endif if (is_parent) { + serverid_deregister_self(); pidfile_unlink(); } @@ -1232,7 +1233,11 @@ int main(int argc, char **argv, char **envp) } /* get broadcast messages */ - claim_connection(NULL,"",FLAG_MSG_GENERAL|FLAG_MSG_DBWRAP); + + if (!serverid_register_self(FLAG_MSG_GENERAL|FLAG_MSG_DBWRAP)) { + DEBUG(1, ("Could not register myself in serverid.tdb\n")); + exit(1); + } /* React on 'smbcontrol winbindd reload-config' in the same way as to SIGHUP signal */ diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index ae468436b6..7567eea770 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -40,14 +40,6 @@ void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token); void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid, int n_groups, gid_t *groups); -/* The following definitions come from smbd/connection.c */ - -bool yield_connection(connection_struct *conn, const char *name); -int count_current_connections( const char *sharename, bool clear ); -bool claim_connection(connection_struct *conn, const char *name, - uint32 msg_flags); -bool register_message_flags(bool doreg, uint32 msg_flags); - /* The following definitions come from winbindd/winbindd.c */ struct event_context *winbind_event_context(void); |