diff options
| author | Jeremy Allison <jra@samba.org> | 2007-12-10 11:30:37 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-12-10 11:30:37 -0800 |
| commit | 7faee02d0d351c5c039e8f1be7e82ce3a93cbe96 (patch) | |
| tree | f79fc09f414f9873d9a985e380b6384c24d00315 /source3/nmbd | |
| parent | 0c0054fe1615a504d103da94149d1c1729abb8e2 (diff) | |
| download | samba-7faee02d0d351c5c039e8f1be7e82ce3a93cbe96.tar.gz samba-7faee02d0d351c5c039e8f1be7e82ce3a93cbe96.tar.bz2 samba-7faee02d0d351c5c039e8f1be7e82ce3a93cbe96.zip | |
Remove the char[1024] strings from dynconfig. Replace
them with malloc'ing accessor functions. Should save a
lot of static space :-).
Jeremy.
(This used to be commit 52dc5eaef2106015b3a8b659e818bdb15ad94b05)
Diffstat (limited to 'source3/nmbd')
| -rw-r--r-- | source3/nmbd/nmbd.c | 17 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_winsserver.c | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index 52f1cd15f5..344831ddca 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -288,8 +288,8 @@ static bool reload_nmbd_services(bool test) if ( lp_loaded() ) { const char *fname = lp_configfile(); - if (file_exist(fname,NULL) && !strcsequal(fname,dyn_CONFIGFILE)) { - strlcpy(dyn_CONFIGFILE,fname,sizeof(dyn_CONFIGFILE)); + if (file_exist(fname,NULL) && !strcsequal(fname,get_dyn_CONFIGFILE())) { + set_dyn_CONFIGFILE(fname); test = False; } } @@ -297,7 +297,7 @@ static bool reload_nmbd_services(bool test) if ( test && !lp_file_list_changed() ) return(True); - ret = lp_load( dyn_CONFIGFILE, True , False, False, True); + ret = lp_load(get_dyn_CONFIGFILE(), True , False, False, True); /* perhaps the config filename is now set */ if ( !test ) { @@ -710,7 +710,7 @@ static bool open_sockets(bool isdaemon, int port) static bool no_process_group; static bool log_stdout; poptContext pc; - static char *p_lmhosts = dyn_LMHOSTSFILE; + char *p_lmhosts = NULL; int opt; enum { OPT_DAEMON = 1000, @@ -772,7 +772,7 @@ static bool open_sockets(bool isdaemon, int port) if (!override_logfile) { char *logfile = NULL; - if (asprintf(&logfile, "%s/log.nmbd", dyn_LOGFILEBASE) < 0) { + if (asprintf(&logfile, "%s/log.nmbd", get_dyn_LOGFILEBASE()) < 0) { exit(1); } lp_set_logfile(logfile); @@ -903,8 +903,11 @@ static bool open_sockets(bool isdaemon, int port) } /* Load in any static local names. */ - load_lmhosts_file(p_lmhosts); - DEBUG(3,("Loaded hosts file %s\n", p_lmhosts)); + if (p_lmhosts) { + set_dyn_LMHOSTSFILE(p_lmhosts); + } + load_lmhosts_file(get_dyn_LMHOSTSFILE()); + DEBUG(3,("Loaded hosts file %s\n", get_dyn_LMHOSTSFILE())); /* If we are acting as a WINS server, initialise data structures. */ if( !initialise_wins() ) { diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c index 7344a29fe4..96938b011a 100644 --- a/source3/nmbd/nmbd_winsserver.c +++ b/source3/nmbd/nmbd_winsserver.c @@ -2366,7 +2366,7 @@ void wins_write_database(time_t t, bool background) } } - if (asprintf(&fname, "%s/%s", dyn_STATEDIR(), WINS_LIST) < 0) { + if (asprintf(&fname, "%s/%s", get_dyn_STATEDIR(), WINS_LIST) < 0) { goto err_exit; } /* This is safe as the 0 length means "don't expand". */ |