diff options
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/msdfs.c | 2 | ||||
| -rw-r--r-- | source3/smbd/server.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c index 98a41e4ec3..4ae735633b 100644 --- a/source3/smbd/msdfs.c +++ b/source3/smbd/msdfs.c @@ -481,7 +481,7 @@ static NTSTATUS dfs_path_lookup(TALLOC_CTX *ctx, * unix_convert later in the codepath. * If we needed to remember what we'd resolved in * dp->reqpath (as the original code did) we'd - * pstrcpy(localhost, dp->reqpath) on any code + * copy (localhost, dp->reqpath) on any code * path below that returns True - but I don't * think this is needed. JRA. */ diff --git a/source3/smbd/server.c b/source3/smbd/server.c index aa85aca77e..328993f6b0 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -726,12 +726,12 @@ void reload_printers(void) bool reload_services(bool test) { bool ret; - + if (lp_loaded()) { char *fname = lp_configfile(); if (file_exist(fname, NULL) && !strcsequal(fname, dyn_CONFIGFILE)) { - pstrcpy(dyn_CONFIGFILE, fname); + strlcpy(dyn_CONFIGFILE, fname,sizeof(dyn_CONFIGFILE)); test = False; } } @@ -755,7 +755,7 @@ bool reload_services(bool test) load_interfaces(); - if (smbd_server_fd() != -1) { + if (smbd_server_fd() != -1) { set_socket_options(smbd_server_fd(),"SO_KEEPALIVE"); set_socket_options(smbd_server_fd(), lp_socket_options()); } |