Don't put a \n on the end of the arg to exit_server()

(This used to be commit dfb8566220c3e90ca2b757ea124f53aed103269e)

diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index a47553dcd19d756360693c09590e16e13c0bc6e2..ddc8f3cd2de65c07fa5b0f76789289166bce1ce6 100644 (file)
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -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");
 }
 
 /****************************************************************************

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 252ae6e0ea4c2efc98a8f7acfb0150ac7d668266..0d2a99b3f07eca4de944e494591dda8b974c0f5f 100644 (file)
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -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.");
 }
 
 /****************************************************************************

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 59c8f1e97b499f8ec779c3592e486e4fb5584389..1e2858ae260382bfadd5c5ad75ad3ee3eabfdb80 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -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;
 }

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 93a69255c03ac451d610118978812f61184d1393..4047ffa8d7043c89fe9e26acdfa198b5dd743d59 100644 (file)
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -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)

diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index d333e0f75a138e56a7743c4e1aa7790003f617ac..52df3558aa7a81678396618de902fde9d47f16fe 100644 (file)
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -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.");
 }
 
 /****************************************************************************

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 1d8d2bae3e1490bb7f53df81cb0ba9de6303e944..c68d5d101b6908d91c61fbb62c2f78cfb70c2d2e 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -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( &params[ IVAL(inbuf, smb_nts_ParameterDisplacement)], 
               smb_base(inbuf) + IVAL(inbuf, smb_nts_ParameterOffset), parameter_count);

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 340a0a3906e89acb0f82692f0ca04b0fe7ad3d6b..844e7d812a9163907eaf7c9899de7e18468c6e41 100644 (file)
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -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;

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index cf01cd2cf5b9945cd36abec9e2c9bb0ff0e79fea..b020cdd5d7282e8e142ecb666716a51e63469093 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -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++;
 }

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 54238e90e7d21dde7e020c29248e4739f11d1a6a..9ff74eae056487683d2cc0c6e4f2d25c6878ae70 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -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);

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 9b0fd379cf6db73b78165e412fa8da8135008977..a5a54751c3122016f9ba2fd248ec4b45f194031b 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -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) {