mirror of
https://github.com/samba-team/samba.git
synced 2025-01-22 22:04:08 +03:00
Don't put a \n on the end of the arg to exit_server()
(This used to be commit dfb8566220c3e90ca2b757ea124f53aed103269e)
This commit is contained in:
parent
59bc781854
commit
d876260d88
@ -81,7 +81,7 @@ void init_rpc_pipe_hnd(void)
|
||||
{
|
||||
bmap = bitmap_allocate(MAX_OPEN_PIPES);
|
||||
if (!bmap)
|
||||
exit_server("out of memory in init_rpc_pipe_hnd\n");
|
||||
exit_server("out of memory in init_rpc_pipe_hnd");
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
|
@ -134,7 +134,7 @@ static void send_blocking_reply(char *outbuf, int outsize)
|
||||
smb_setlen(outbuf,outsize - 4);
|
||||
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("send_blocking_reply: send_smb failed.\n");
|
||||
exit_server("send_blocking_reply: send_smb failed.");
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@ -178,7 +178,7 @@ static void generic_blocking_lock_error(blocking_lock_record *blr, NTSTATUS stat
|
||||
|
||||
ERROR_NT(status);
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("generic_blocking_lock_error: send_smb failed.\n");
|
||||
exit_server("generic_blocking_lock_error: send_smb failed.");
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
|
@ -58,7 +58,7 @@ void init_dptrs(void)
|
||||
dptr_bmap = bitmap_allocate(MAX_DIRECTORY_HANDLES);
|
||||
|
||||
if (!dptr_bmap)
|
||||
exit_server("out of memory in init_dptrs\n");
|
||||
exit_server("out of memory in init_dptrs");
|
||||
|
||||
dptrs_init = True;
|
||||
}
|
||||
|
@ -118,7 +118,7 @@ void send_trans_reply(char *outbuf,
|
||||
|
||||
show_msg(outbuf);
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("send_trans_reply: send_smb failed.\n");
|
||||
exit_server("send_trans_reply: send_smb failed.");
|
||||
|
||||
tot_data_sent = this_ldata;
|
||||
tot_param_sent = this_lparam;
|
||||
@ -152,7 +152,7 @@ void send_trans_reply(char *outbuf,
|
||||
|
||||
show_msg(outbuf);
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("send_trans_reply: send_smb failed.\n");
|
||||
exit_server("send_trans_reply: send_smb failed.");
|
||||
|
||||
tot_data_sent += this_ldata;
|
||||
tot_param_sent += this_lparam;
|
||||
@ -377,7 +377,7 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
|
||||
srvstr_pull(inbuf, name, smb_buf(inbuf), sizeof(name), -1, STR_TERMINATE);
|
||||
|
||||
if (dscnt > tdscnt || pscnt > tpscnt) {
|
||||
exit_server("invalid trans parameters\n");
|
||||
exit_server("invalid trans parameters");
|
||||
}
|
||||
|
||||
if (tdscnt) {
|
||||
@ -416,7 +416,7 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
|
||||
outsize = set_message(outbuf,0,0,True);
|
||||
show_msg(outbuf);
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("reply_trans: send_smb failed.\n");
|
||||
exit_server("reply_trans: send_smb failed.");
|
||||
}
|
||||
|
||||
/* receive the rest of the trans packet */
|
||||
@ -457,7 +457,7 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
|
||||
dscnt += dcnt;
|
||||
|
||||
if (dscnt > tdscnt || pscnt > tpscnt) {
|
||||
exit_server("invalid trans parameters\n");
|
||||
exit_server("invalid trans parameters");
|
||||
}
|
||||
|
||||
if (pcnt)
|
||||
|
@ -61,7 +61,7 @@ static void change_notify_reply_packet(char *inbuf, NTSTATUS error_code)
|
||||
set_message(outbuf,18,0,False);
|
||||
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("change_notify_reply_packet: send_smb failed.\n");
|
||||
exit_server("change_notify_reply_packet: send_smb failed.");
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
|
@ -91,7 +91,7 @@ static int send_nt_replies(char *inbuf, char *outbuf, int bufsize, NTSTATUS nt_e
|
||||
|
||||
if(params_to_send == 0 && data_to_send == 0) {
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("send_nt_replies: send_smb failed.\n");
|
||||
exit_server("send_nt_replies: send_smb failed.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -221,7 +221,7 @@ static int send_nt_replies(char *inbuf, char *outbuf, int bufsize, NTSTATUS nt_e
|
||||
|
||||
/* Send the packet */
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("send_nt_replies: send_smb failed.\n");
|
||||
exit_server("send_nt_replies: send_smb failed.");
|
||||
|
||||
pp += params_sent_thistime;
|
||||
pd += data_sent_thistime;
|
||||
@ -1734,7 +1734,7 @@ due to being in oplock break state.\n" ));
|
||||
num_data_sofar = data_count;
|
||||
|
||||
if (parameter_count > total_parameter_count || data_count > total_data_count)
|
||||
exit_server("reply_nttrans: invalid sizes in packet.\n");
|
||||
exit_server("reply_nttrans: invalid sizes in packet.");
|
||||
|
||||
if(setup) {
|
||||
memcpy( setup, &inbuf[smb_nt_SetupStart], setup_count);
|
||||
@ -1757,7 +1757,7 @@ due to being in oplock break state.\n" ));
|
||||
of the parameter/data bytes */
|
||||
outsize = set_message(outbuf,0,0,True);
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("reply_nttrans: send_smb failed.\n");
|
||||
exit_server("reply_nttrans: send_smb failed.");
|
||||
|
||||
while( num_data_sofar < total_data_count || num_params_sofar < total_parameter_count) {
|
||||
BOOL ret;
|
||||
@ -1785,7 +1785,7 @@ due to being in oplock break state.\n" ));
|
||||
num_params_sofar += (parameter_count = IVAL(inbuf,smb_nts_ParameterCount));
|
||||
num_data_sofar += ( data_count = IVAL(inbuf, smb_nts_DataCount));
|
||||
if (num_params_sofar > total_parameter_count || num_data_sofar > total_data_count)
|
||||
exit_server("reply_nttrans2: data overflow in secondary nttrans packet\n");
|
||||
exit_server("reply_nttrans2: data overflow in secondary nttrans packet");
|
||||
|
||||
memcpy( ¶ms[ IVAL(inbuf, smb_nts_ParameterDisplacement)],
|
||||
smb_base(inbuf) + IVAL(inbuf, smb_nts_ParameterOffset), parameter_count);
|
||||
|
@ -571,7 +571,7 @@ BOOL oplock_break_level2(files_struct *fsp, BOOL local_request, int token)
|
||||
|
||||
prepare_break_message( outbuf, fsp, False);
|
||||
if (!send_smb(smbd_server_fd(), outbuf))
|
||||
exit_server("oplock_break_level2: send_smb failed.\n");
|
||||
exit_server("oplock_break_level2: send_smb failed.");
|
||||
}
|
||||
|
||||
/*
|
||||
@ -709,7 +709,7 @@ static BOOL oplock_break(SMB_DEV_T dev, SMB_INO_T inode, unsigned long file_id,
|
||||
fsp->sent_oplock_break = using_levelII? LEVEL_II_BREAK_SENT:EXCLUSIVE_BREAK_SENT;
|
||||
|
||||
if (!send_smb(smbd_server_fd(), outbuf))
|
||||
exit_server("oplock_break: send_smb failed.\n");
|
||||
exit_server("oplock_break: send_smb failed.");
|
||||
|
||||
/* We need this in case a readraw crosses on the wire. */
|
||||
global_oplock_break = True;
|
||||
|
@ -884,7 +884,7 @@ void process_smb(char *inbuf, char *outbuf)
|
||||
}
|
||||
else
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("process_smb: send_smb failed.\n");
|
||||
exit_server("process_smb: send_smb failed.");
|
||||
}
|
||||
trans_num++;
|
||||
}
|
||||
|
@ -1377,7 +1377,7 @@ int reply_unlink(connection_struct *conn, char *inbuf,char *outbuf, int dum_size
|
||||
void fail_readraw(void)
|
||||
{
|
||||
pstring errstr;
|
||||
slprintf(errstr, sizeof(errstr)-1, "FAIL ! reply_readbraw: socket write fail (%s)\n",
|
||||
slprintf(errstr, sizeof(errstr)-1, "FAIL ! reply_readbraw: socket write fail (%s)",
|
||||
strerror(errno) );
|
||||
exit_server(errstr);
|
||||
}
|
||||
@ -1767,7 +1767,7 @@ int reply_writebraw(connection_struct *conn, char *inbuf,char *outbuf, int size,
|
||||
SSVALS(outbuf,smb_vwv0,-1);
|
||||
outsize = set_message(outbuf,Protocol>PROTOCOL_COREPLUS?1:0,0,True);
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("reply_writebraw: send_smb failed.\n");
|
||||
exit_server("reply_writebraw: send_smb failed.");
|
||||
|
||||
/* Now read the raw data into the buffer and write it */
|
||||
if (read_smb_length(smbd_server_fd(),inbuf,SMB_SECONDARY_WAIT) == -1) {
|
||||
@ -2467,7 +2467,7 @@ int reply_echo(connection_struct *conn,
|
||||
smb_setlen(outbuf,outsize - 4);
|
||||
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("reply_echo: send_smb failed.\n");
|
||||
exit_server("reply_echo: send_smb failed.");
|
||||
}
|
||||
|
||||
DEBUG(3,("echo %d times\n", smb_reverb));
|
||||
@ -3885,7 +3885,7 @@ int reply_readbmpx(connection_struct *conn, char *inbuf,char *outbuf,int length,
|
||||
SSVAL(outbuf,smb_vwv7,smb_offset(data,outbuf));
|
||||
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("reply_readbmpx: send_smb failed.\n");
|
||||
exit_server("reply_readbmpx: send_smb failed.");
|
||||
|
||||
total_read += nread;
|
||||
startpos += nread;
|
||||
@ -4041,7 +4041,7 @@ int reply_writebmpx(connection_struct *conn, char *inbuf,char *outbuf, int size,
|
||||
/* We need to send both a primary and a secondary response */
|
||||
smb_setlen(outbuf,outsize - 4);
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("reply_writebmpx: send_smb failed.\n");
|
||||
exit_server("reply_writebmpx: send_smb failed.");
|
||||
|
||||
/* Now the secondary */
|
||||
outsize = set_message(outbuf,1,0,True);
|
||||
|
@ -65,7 +65,7 @@ static int send_trans2_replies(char *outbuf, int bufsize, char *params,
|
||||
if(params_to_send == 0 && data_to_send == 0)
|
||||
{
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("send_trans2_replies: send_smb failed.\n");
|
||||
exit_server("send_trans2_replies: send_smb failed.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -161,7 +161,7 @@ static int send_trans2_replies(char *outbuf, int bufsize, char *params,
|
||||
|
||||
/* Send the packet */
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("send_trans2_replies: send_smb failed.\n");
|
||||
exit_server("send_trans2_replies: send_smb failed.");
|
||||
|
||||
pp += params_sent_thistime;
|
||||
pd += data_sent_thistime;
|
||||
@ -2489,7 +2489,7 @@ int reply_trans2(connection_struct *conn,
|
||||
of the parameter/data bytes */
|
||||
outsize = set_message(outbuf,0,0,True);
|
||||
if (!send_smb(smbd_server_fd(),outbuf))
|
||||
exit_server("reply_trans2: send_smb failed.\n");
|
||||
exit_server("reply_trans2: send_smb failed.");
|
||||
|
||||
while (num_data_sofar < total_data ||
|
||||
num_params_sofar < total_params) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user