allow local_machine and remote_machine (%L and %m macros) to contain

spaces
(This used to be commit 93f0619e049d1598db0c3022aeccf33910b0550f)

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 06b96b13d9f4b76076d82e4e1304fbb7291c1976..c903c7a1fd28ddd03f8c37002b6dfed497431f5f 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -73,7 +73,6 @@ int reply_special(char *inbuf,char *outbuf)
        pstring name1,name2;
        extern fstring remote_machine;
        extern fstring local_machine;
-       char *p;
        int len;
        char name_type = 0;
        
@@ -96,21 +95,18 @@ int reply_special(char *inbuf,char *outbuf)
                         name1,name2));      
 
                fstrcpy(remote_machine,name2);
+               remote_machine[15] = 0;
                trim_string(remote_machine," "," ");
-               p = strchr(remote_machine,' ');
                strlower(remote_machine);
-               if (p) *p = 0;
 
                fstrcpy(local_machine,name1);
-               trim_string(local_machine," "," ");
                len = strlen(local_machine);
                if (len == 16) {
                        name_type = local_machine[15];
                        local_machine[15] = 0;
                }
-               p = strchr(local_machine,' ');
+               trim_string(local_machine," "," ");
                strlower(local_machine);
-               if (p) *p = 0;
 
                if (name_type == 'R') {
                        /* We are being asked for a pathworks session ---