Changeset 228 for branches/samba-3.2.x/source/smbd/msdfs.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/smbd/msdfs.c (modified) (5 diffs)

branches/samba-3.2.x/source/smbd/msdfs.c

@@ -896 +896 @@
                                 char **ppdata,
                                 struct junction_map *junction,
-                                int consumedcnt,
                                 bool self_referral)
 {
@@ -961 +960 @@
 
         /* create the header */
-        SSVAL(pdata,0,consumedcnt * 2); /* path consumed */
+        SSVAL(pdata,0,requestedpathlen - 2); /* UCS2 of path consumed minus
+                                                2 byte null */
         /* number of referral in this pkt */
         SSVAL(pdata,2,junction->referral_count);
@@ -1010 +1010 @@
                                 char **ppdata,
                                 struct junction_map *junction,
-                                int consumedcnt,
                                 bool self_referral)
 {
@@ -1057 +1056 @@
 
         /* create the header */
-        SSVAL(pdata,0,consumedcnt * 2); /* path consumed */
+        SSVAL(pdata,0,reqpathlen - 2); /* UCS2 of path consumed minus
+                                          2 byte null */
         SSVAL(pdata,2,junction->referral_count); /* number of referral */
         if(self_referral) {
@@ -1197 +1197 @@
                 reply_size = setup_ver2_dfs_referral(pathnamep,
                                         ppdata, junction,
-                                        consumedcnt, self_referral);
+                                        self_referral);
                 break;
         case 3:
                 reply_size = setup_ver3_dfs_referral(pathnamep, ppdata,
-                                        junction, consumedcnt, self_referral);
+                                        junction, self_referral);
                 break;
         default: