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, 6 insertions, 4 deletions

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 62019d4036..3d17ec1123 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -148,15 +148,17 @@ static BOOL do_command(char *dest, char *msg_name, char *params)
 			fprintf(stderr,"MSG_PROFILE needs a parameter\n");
 			return(False);
 		}
-		if (strequal(params, "on")) {
-			v = 2;
-		} else if (strequal(params, "off")) {
+		if (strequal(params, "off")) {
 			v = 0;
 		} else if (strequal(params, "count")) {
 			v = 1;
+		} else if (strequal(params, "on")) {
+			v = 2;
+		} else if (strequal(params, "flush")) {
+			v = 3;
 		} else {
 		    fprintf(stderr,
-			"MSG_PROFILE parameter must be on, off, or count\n");
+			"MSG_PROFILE parameter must be off, count, on, or flush\n");
 		    return(False);
 		}
 		send_message(dest, MSG_PROFILE, &v, sizeof(int));