changes to sync with 2.2. tree

.cvsignore              remove config.h - not in this directory
include/profile.h       profile changes
lib/messages.c          added message to return debug level
libsmb/clierror.c       cast to get rid of compiler warning
libsmb/smbencrypt.c     cast to get rid of compiler warning
profile/profile.c       add flush profile stats changes for profile struct
rpc_parse/parse_samr.c  fix for compiler warning
rpc_server/srv_samr.c   cast to get rid of compiler warning
smbd/ipc.c              profile stats
message.c               profile stats
smbd/negprot.c          profile stats
smbd/nttrans.c          profile stats
smbd/trans2.c           profile stats
utils/smbcontrol.c      new flush stats command
(This used to be commit bbb24daa25dca4e4b6b1f8942cd84ee3aa1bed8e)

1 files changed, 20 insertions, 4 deletions

diff --git a/source3/smbd/message.c b/source3/smbd/message.c
index a65539affa..ab3c841d9c 100644
--- a/source3/smbd/message.c
+++ b/source3/smbd/message.c
@@ -111,11 +111,14 @@ int reply_sends(connection_struct *conn,
   int len;
   char *orig,*dest,*msg;
   int outsize = 0;
+  START_PROFILE(SMBsends);
 
   msgpos = 0;
 
-  if (! (*lp_msg_command()))
+  if (! (*lp_msg_command())) {
+    END_PROFILE(SMBsends);
     return(ERROR(ERRSRV,ERRmsgoff));
+  }
 
   outsize = set_message(outbuf,0,0,True);
 
@@ -138,6 +141,7 @@ int reply_sends(connection_struct *conn,
 
   msg_deliver();
 
+  END_PROFILE(SMBsends);
   return(outsize);
 }
 
@@ -150,9 +154,12 @@ int reply_sendstrt(connection_struct *conn,
 {
   char *orig,*dest;
   int outsize = 0;
+  START_PROFILE(SMBsendstrt);
 
-  if (! (*lp_msg_command()))
+  if (! (*lp_msg_command())) {
+    END_PROFILE(SMBsendstrt);
     return(ERROR(ERRSRV,ERRmsgoff));
+  }
 
   outsize = set_message(outbuf,1,0,True);
 
@@ -167,6 +174,7 @@ int reply_sendstrt(connection_struct *conn,
 
   DEBUG( 3, ( "SMBsendstrt (from %s to %s)\n", msgfrom, msgto ) );
 
+  END_PROFILE(SMBsendstrt);
   return(outsize);
 }
 
@@ -180,9 +188,12 @@ int reply_sendtxt(connection_struct *conn,
   int len;
   int outsize = 0;
   char *msg;
+  START_PROFILE(SMBsendtxt);
 
-  if (! (*lp_msg_command()))
+  if (! (*lp_msg_command())) {
+    END_PROFILE(SMBsendtxt);
     return(ERROR(ERRSRV,ERRmsgoff));
+  }
 
   outsize = set_message(outbuf,0,0,True);
 
@@ -196,6 +207,7 @@ int reply_sendtxt(connection_struct *conn,
 
   DEBUG( 3, ( "SMBsendtxt\n" ) );
 
+  END_PROFILE(SMBsendtxt);
   return(outsize);
 }
 
@@ -207,9 +219,12 @@ int reply_sendend(connection_struct *conn,
 		  char *inbuf,char *outbuf, int dum_size, int dum_buffsize)
 {
   int outsize = 0;
+  START_PROFILE(SMBsendend);
 
-  if (! (*lp_msg_command()))
+  if (! (*lp_msg_command())) {
+    END_PROFILE(SMBsendend);
     return(ERROR(ERRSRV,ERRmsgoff));
+  }
 
   outsize = set_message(outbuf,0,0,True);
 
@@ -217,6 +232,7 @@ int reply_sendend(connection_struct *conn,
 
   msg_deliver();
 
+  END_PROFILE(SMBsendend);
   return(outsize);
 }