merge from 2.2

(This used to be commit e30a3be954c0eacb3ccffdaa1165a9f0e8b93a23)

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 6707721651316c3c017487baa99b219dd3e468ee..53d5b40698c5dbbf002e73197e4ca14f210fa2c6 100644 (file)
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -401,6 +401,7 @@ static uint32 process_cmd(struct cli_state *cli, char *cmd)
        pstring buf;
        char *p = cmd;
        uint32 result=0;
+       int len = 0;
 
        if (cmd[strlen(cmd) - 1] == '\n')
                cmd[strlen(cmd) - 1] = '\0';
@@ -409,6 +410,11 @@ static uint32 process_cmd(struct cli_state *cli, char *cmd)
                return 0;
        }
 
+        /* strip the trainly \n if it exsists */
+       len = strlen(buf);
+       if (buf[len-1] == '\n')
+               buf[len-1] = '\0';
+
        /* Search for matching commands */
 
        for (temp_list = cmd_list; temp_list; temp_list = temp_list->next) {