s3:smb2cli: don't terminate the pathname in smb2cli_query_directory()
authorStefan Metzmacher <metze@samba.org>
Mon, 5 Sep 2011 16:22:57 +0000 (18:22 +0200)
committerStefan Metzmacher <metze@samba.org>
Wed, 7 Sep 2011 06:33:41 +0000 (08:33 +0200)
Windows generates NT_STATUS_OBJECT_NAME_INVALID otherwise.

metze

source3/libsmb/smb2cli_query_directory.c

index 2286f2ce6f17d25672a6cdd4e58ac4534fe00750..4a0e69b5349073003e1470f31bc931f95f991034 100644 (file)
@@ -59,12 +59,17 @@ struct tevent_req *smb2cli_query_directory_send(TALLOC_CTX *mem_ctx,
        }
 
        if (!convert_string_talloc(state, CH_UNIX, CH_UTF16,
-                                  mask, strlen(mask)+1,
+                                  mask, strlen(mask),
                                   &dyn, &dyn_len)) {
                tevent_req_oom(req);
                return tevent_req_post(req, ev);
        }
 
+       if (strlen(mask) == 0) {
+               TALLOC_FREE(dyn);
+               dyn_len = 0;
+       }
+
        fixed = state->fixed;
        SSVAL(fixed, 0, 33);
        SCVAL(fixed, 2, level);