Changeset 165 for branches/samba-3.0/source/smbd/msdfs.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

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

branches/samba-3.0/source/smbd/msdfs.c

@@ -714 +714 @@
                                 char **ppdata, 
                                 struct junction_map *junction,
-                                int consumedcnt,
                                 BOOL self_referral)
 {
@@ -771 +770 @@
 
         /* create the header */
-        SSVAL(pdata,0,consumedcnt * 2); /* path consumed */
+        SSVAL(pdata,0,requestedpathlen - 2); /* UCS2 of path consumed minus
+
         SSVAL(pdata,2,junction->referral_count); /* number of referral in this pkt */
         if(self_referral) {
@@ -815 +815 @@
                                 char **ppdata, 
                                 struct junction_map *junction,
-                                int consumedcnt,
                                 BOOL self_referral)
 {
@@ -853 +852 @@
 
         /* 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) {
@@ -975 +976 @@
         case 2:
                 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);
+                                                     self_referral);
                 break;
         default: