summaryrefslogtreecommitdiffstats
path: root/source/smbd/server.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-01-03 08:28:12 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-01-03 08:28:12 +0000
commit3a7458f9472432ef12c43008414925fd1ce8ea0c (patch)
tree185f6140d3895e4d5304e4ef3f5ce4d7a34a7e82 /source/smbd/server.c
parent96e9fa5f224966531fa8f9cf18cbc4bbb2fe60ed (diff)
downloadsamba-3a7458f9472432ef12c43008414925fd1ce8ea0c.tar.gz
samba-3a7458f9472432ef12c43008414925fd1ce8ea0c.tar.xz
samba-3a7458f9472432ef12c43008414925fd1ce8ea0c.zip
Merge from HEAD - make Samba compile with -Wwrite-strings without additional
warnings. (Adds a lot of const). Andrew Bartlett
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 7581eb60016..94849f9f5cd 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -179,11 +179,12 @@ static BOOL open_sockets_smbd(BOOL is_daemon,const char *smb_ports)
if (!smb_ports) {
ports = lp_smb_ports();
if (!ports || !*ports) {
- ports = SMB_PORTS;
+ ports = smb_xstrdup(SMB_PORTS);
+ } else {
+ ports = smb_xstrdup(ports);
}
- ports = strdup(ports);
} else {
- ports = strdup(smb_ports);
+ ports = smb_xstrdup(smb_ports);
}
if (lp_interfaces() && lp_bind_interfaces_only()) {
@@ -539,7 +540,7 @@ static void decrement_smbd_process_count(void)
Exit the server.
****************************************************************************/
-void exit_server(char *reason)
+void exit_server(const char *reason)
{
static int firsttime=1;
extern char *last_inbuf;