diff options
| author | Samba Release Account <samba-bugs@samba.org> | 1997-06-11 01:03:06 +0000 |
|---|---|---|
| committer | Samba Release Account <samba-bugs@samba.org> | 1997-06-11 01:03:06 +0000 |
| commit | c6e63aa896a10656f6205828e744b722fc72f8ac (patch) | |
| tree | a491f34425b6a5c47c4284c18e30c53cc57d112f /source3/nmbd/nmbd.c | |
| parent | 56adabeed7739cf800000adbf3d9530f2174442a (diff) | |
| download | samba-c6e63aa896a10656f6205828e744b722fc72f8ac.tar.gz samba-c6e63aa896a10656f6205828e744b722fc72f8ac.tar.bz2 samba-c6e63aa896a10656f6205828e744b722fc72f8ac.zip | |
Makefile: Added quoata changes for Linux from Thorvald Natvig
Makefile.RPM: Added quoata changes for Linux from Thorvald Natvig
charset.c: Large changes to add multiple client code pages.
charset.h: Changed charset_initialise() proto.
client.c: Fixed message sending bug. Changed charset_initialise().
ipc.c: Fixed #ifdef compile problems.
loadparm.c: Added "client code page" option.
nmbd.c: Changed charset_initialise(). Fixed lmhosts read.
nmblookup.c: Changed charset_initialise().
proto.h: Added lp_client_code_page(void).
quotas.c: Added quoata changes for Linux from Thorvald Natvig
reply.c: Changed debug level. Made SMBecho ignore tid.
server.c: Changed charset_initialise().
smb.h: Added DEFAULT_CLIENT_CODE_PAGE as 850.
smbpasswd.c: Changed charset_initialise().
status.c: Changed charset_initialise().
testparm.c: Changed charset_initialise().
testprns.c: Changed charset_initialise().
Jeremy Allison (jallison@whistle.com)
(This used to be commit 957025bace1bcff34d21a6caeca498e85abccb23)
Diffstat (limited to 'source3/nmbd/nmbd.c')
| -rw-r--r-- | source3/nmbd/nmbd.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index dc3f642cd6..75544535af 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -421,7 +421,7 @@ static void usage(char *pname) setup_logging(argv[0],False); - charset_initialise(); + charset_initialise(-1); #ifdef LMHOSTSFILE strcpy(host_file,LMHOSTSFILE); @@ -498,12 +498,19 @@ static void usage(char *pname) if (!reload_services(False)) return(-1); + charset_initialise(lp_client_code_page()); + init_structs(); reload_services(True); strcpy(myworkgroup, lp_workgroup()); + if (strequal(myworkgroup,"*")) { + DEBUG(0,("ERROR: a workgroup name of * is no longer supported\n")); + exit(1); + } + set_samba_nb_type(); if (!is_daemon && !is_a_socket(0)) { @@ -546,27 +553,22 @@ static void usage(char *pname) if (!open_sockets(is_daemon,port)) return 1; - if (*host_file) { - load_hosts_file(host_file); - DEBUG(3,("Loaded hosts file\n")); - } - load_interfaces(); add_my_subnets(myworkgroup); add_my_names(); - if (strequal(myworkgroup,"*")) { - DEBUG(0,("ERROR: a workgroup name of * is no longer supported\n")); - exit(1); - } - DEBUG(3,("Checked names\n")); load_netbios_names(); DEBUG(3,("Loaded names\n")); + if (*host_file) { + load_hosts_file(host_file); + DEBUG(3,("Loaded hosts file\n")); + } + write_browse_list(time(NULL)); DEBUG(3,("Dumped names\n")); |