From 148eaba3dadb1d0bd3ac3ef53da3d9811636e89a Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 19 Aug 1998 01:49:34 +0000
Subject: Makefile.in: Moved blocking lock code into smbd/blocking.c for link
 purposes. include/includes.h: Added nterr.h. locking/locking.c: Moved
 blocking lock code into smbd/blocking.c for link purposes. smbd/close.c:
 Added blocking lock removal to file close. smbd/filename.c: Tidied up
 unix_convert() so I could read it (:-) in preparation                  for
 the stat_cache code. smbd/nttrans.c: Added WRITE_ATTRIBUTES check.
 smbd/reply.c: Fixed multibyte char problem in wildcard mask. Jeremy.

---
 source/smbd/reply.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'source/smbd/reply.c')

diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index 6b91d9d152a..28fed8bc043 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -1051,14 +1051,24 @@ int reply_search(connection_struct *conn, char *inbuf,char *outbuf, int dum_size
   mask_convert(mask);
 
   {
-    for (p=mask; *p; p++)
+    int skip;
+    p = mask;
+    while(*p)
+    {
+      if((skip = skip_multibyte_char( *p )) != 0 )
       {
-	if (*p != '?' && *p != '*' && !isdoschar(*p))
-	  {
-	    DEBUG(5,("Invalid char [%c] in search mask?\n",*p));
-	    *p = '?';
-	  }
+        p += skip;
       }
+      else
+      {
+        if (*p != '?' && *p != '*' && !isdoschar(*p))
+        {
+          DEBUG(5,("Invalid char [%c] in search mask?\n",*p));
+          *p = '?';
+        }
+        p++;
+      }
+    }
   }
 
   if (!strchr(mask,'.') && strlen(mask)>8)
@@ -3569,8 +3579,8 @@ dev = %x, inode = %x\n",
     count = IVAL(data,SMB_LKLEN_OFFSET(i)); 
     offset = IVAL(data,SMB_LKOFF_OFFSET(i)); 
     if(!do_lock(fsp,conn,count,offset, ((locktype & 1) ? F_RDLCK : F_WRLCK),
-                &eclass, &ecode))
-#if 0 /* JRATEST - blocking lock code. */
+                &eclass, &ecode)) {
+#if 0 /* JRATEST */
       if((ecode == ERRlock) && (lock_timeout != 0)) {
         /*
          * A blocking lock was requested. Package up
@@ -3579,8 +3589,10 @@ dev = %x, inode = %x\n",
          */
         if(push_blocking_lock_request(inbuf, length, lock_timeout, i))
           return -1;
+      }
 #endif /* JRATEST */
       break;
+    }
   }
 
   /* If any of the above locks failed, then we must unlock
-- 
cgit