summaryrefslogtreecommitdiffstats
path: root/source/smbd/server.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-10-18 20:15:12 +0000
committerJeremy Allison <jra@samba.org>2001-10-18 20:15:12 +0000
commit8d23a7441b4687458ee021bfe8880558506eddba (patch)
treea1d58b46bde8898a9c04cce7fe931fdc9b8f2aff /source/smbd/server.c
parentd8262286ddb6105a9d3b0730912447ea2401a3fb (diff)
downloadsamba-8d23a7441b4687458ee021bfe8880558506eddba.tar.gz
samba-8d23a7441b4687458ee021bfe8880558506eddba.tar.xz
samba-8d23a7441b4687458ee021bfe8880558506eddba.zip
Merge the become_XXX -> change_to_XXX fixes from 2.2.2 to HEAD.
Ensure make_conection() can only be called as root. Jeremy.
Diffstat (limited to 'source/smbd/server.c')
-rw-r--r--source/smbd/server.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source/smbd/server.c b/source/smbd/server.c
index 579649cf0c4..2e0fb1868d4 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -247,7 +247,7 @@ max can be %d\n",
/* check for sighup processing */
if (reload_after_sighup) {
- unbecome_user();
+ change_to_root_user();
DEBUG(1,("Reloading services after SIGHUP\n"));
reload_services(False);
reload_after_sighup = False;
@@ -393,7 +393,7 @@ BOOL reload_services(BOOL test)
reset_stat_cache();
/* this forces service parameters to be flushed */
- become_service(NULL,True);
+ set_current_service(NULL,True);
return(ret);
}
@@ -479,10 +479,11 @@ void exit_server(char *reason)
extern char *last_inbuf;
- if (!firsttime) exit(0);
+ if (!firsttime)
+ exit(0);
firsttime = 0;
- unbecome_user();
+ change_to_root_user();
DEBUG(2,("Closing connections\n"));
conn_close_all();