svn commit: samba r21251 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_25/source/smbd

[vlendec at samba.org]

Author: vlendec
Date: 2007-02-08 21:57:41 +0000 (Thu, 08 Feb 2007)
New Revision: 21251

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21251

Log:
Okay, after Jeremy has kindly tested this, check it in :-)

Attached find a workaround that works for me. This is not the "correct" fix,
to me it seems our DFS referral marshalling is broken. Vista requests level 4,
we reply with level 2, and Vista seems not to like that. If we reply with
level 3 it seems more happy.

Needs more work!

Volker
Modified:
   branches/SAMBA_3_0/source/smbd/msdfs.c
   branches/SAMBA_3_0_25/source/smbd/msdfs.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/msdfs.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/msdfs.c	2007-02-08 21:48:09 UTC (rev 21250)
+++ branches/SAMBA_3_0/source/smbd/msdfs.c	2007-02-08 21:57:41 UTC (rev 21251)
@@ -865,9 +865,13 @@
 
 	/* create the referral depeding on version */
 	DEBUG(10,("max_referral_level :%d\n",max_referral_level));
-	if(max_referral_level<2 || max_referral_level>3) {
+
+	if (max_referral_level < 2) {
 		max_referral_level = 2;
 	}
+	if (max_referral_level > 3) {
+		max_referral_level = 3;
+	}
 
 	switch(max_referral_level) {
 	case 2:

Modified: branches/SAMBA_3_0_25/source/smbd/msdfs.c
===================================================================
--- branches/SAMBA_3_0_25/source/smbd/msdfs.c	2007-02-08 21:48:09 UTC (rev 21250)
+++ branches/SAMBA_3_0_25/source/smbd/msdfs.c	2007-02-08 21:57:41 UTC (rev 21251)
@@ -865,9 +865,13 @@
 
 	/* create the referral depeding on version */
 	DEBUG(10,("max_referral_level :%d\n",max_referral_level));
-	if(max_referral_level<2 || max_referral_level>3) {
+
+	if (max_referral_level < 2) {
 		max_referral_level = 2;
 	}
+	if (max_referral_level > 3) {
+		max_referral_level = 3;
+	}
 
 	switch(max_referral_level) {
 	case 2: