diff options
| author | Jeremy Allison <jra@samba.org> | 2001-10-18 20:15:12 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-10-18 20:15:12 +0000 |
| commit | c416ff851b4ecc7a44aee9d00d07dd481d8ae2a7 (patch) | |
| tree | a663818999f244e52704caab9906b7857edce355 /source3/smbd/server.c | |
| parent | 9a903a08a7c4f8407b4d6d0937f0bfda932d2ce3 (diff) | |
| download | samba-c416ff851b4ecc7a44aee9d00d07dd481d8ae2a7.tar.gz samba-c416ff851b4ecc7a44aee9d00d07dd481d8ae2a7.tar.bz2 samba-c416ff851b4ecc7a44aee9d00d07dd481d8ae2a7.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.
(This used to be commit 8d23a7441b4687458ee021bfe8880558506eddba)
Diffstat (limited to 'source3/smbd/server.c')
| -rw-r--r-- | source3/smbd/server.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 579649cf0c..2e0fb1868d 100644 --- a/source3/smbd/server.c +++ b/source3/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(); |