diff options
| author | Gerald Carter <jerry@samba.org> | 2005-09-30 17:13:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:04:48 -0500 |
| commit | 54abd2aa66069e6baf7769c496f46d9dba18db39 (patch) | |
| tree | 9cf8e88168011797319ba9e9866749201b1eac1e /source3/smbd/server.c | |
| parent | 4a2cc231d22a82ed21771a72508f15d21ed63227 (diff) | |
| download | samba-54abd2aa66069e6baf7769c496f46d9dba18db39.tar.gz samba-54abd2aa66069e6baf7769c496f46d9dba18db39.tar.xz samba-54abd2aa66069e6baf7769c496f46d9dba18db39.zip | |
r10656: BIG merge from trunk. Features not copied over
* \PIPE\unixinfo
* winbindd's {group,alias}membership new functions
* winbindd's lookupsids() functionality
* swat (trunk changes to be reverted as per discussion with Deryck)
(This used to be commit 939c3cb5d78e3a2236209b296aa8aba8bdce32d3)
Diffstat (limited to 'source3/smbd/server.c')
| -rw-r--r-- | source3/smbd/server.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 1ff03174fe1..8310b408d07 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -96,7 +96,7 @@ static void killkids(void) somewhere else. ****************************************************************************/ -static void msg_sam_sync(int UNUSED(msg_type), pid_t UNUSED(pid), +static void msg_sam_sync(int UNUSED(msg_type), struct process_id UNUSED(pid), void *UNUSED(buf), size_t UNUSED(len)) { DEBUG(10, ("** sam sync message received, ignoring\n")); @@ -107,7 +107,8 @@ static void msg_sam_sync(int UNUSED(msg_type), pid_t UNUSED(pid), somewhere else. ****************************************************************************/ -static void msg_sam_repl(int msg_type, pid_t pid, void *buf, size_t len) +static void msg_sam_repl(int msg_type, struct process_id pid, + void *buf, size_t len) { uint32 low_serial; @@ -140,7 +141,8 @@ static BOOL open_sockets_inetd(void) return True; } -static void msg_exit_server(int msg_type, pid_t src, void *buf, size_t len) +static void msg_exit_server(int msg_type, struct process_id src, + void *buf, size_t len) { exit_server("Got a SHUTDOWN message"); } @@ -621,9 +623,6 @@ void exit_server(const char *reason) print_notify_send_messages(3); /* 3 second timeout. */ - /* run all registered exit events */ - smb_run_exit_events(); - /* delete our entry in the connections database. */ yield_connection(NULL,""); |