[cvsnt] cvs sserver protocol problem while forcing encryption - patch (fix)

[Stellars Henson]

uh, there was a little "literal" bug in my patch - i've 
moved brackets in both original and patched version. the 
proper patch according to original cvsnt sources goes here...

sorry


-- 
Stell
-------------- next part --------------
diff -uNr cvsnt-2.5.03.2260-old/src/client.cpp cvsnt-2.5.03.2260/src/client.cpp
--- cvsnt-2.5.03.2260-old/src/client.cpp	2006-02-16 22:47:27.000000000 +0100
+++ cvsnt-2.5.03.2260/src/client.cpp	2006-05-08 02:47:55.000000000 +0200
@@ -3659,7 +3659,8 @@
     if (status ! 		error (1, status, "writing to server");
 
-	if (cvsencrypt && rootless_encryption)
+	//cover sserver encryption bug - turn off encryption if method is sserver
+	if (cvsencrypt && rootless_encryption && strcasecmp(current_parsed_root->method,"sserver") )
 	{
 		/* Turn on encryption before turning on compression.  We do
 		not want to try to compress the encrypted stream.  Instead,
@@ -3731,7 +3732,8 @@
 	}
 	}
 
-	if (cvsauthenticate && !cvsencrypt && rootless_encryption)
+	//cover sserver encryption bug - turn off encryption if method is sserver
+	if (cvsauthenticate && (!cvsencrypt || strcasecmp(current_parsed_root->method,"sserver")) && rootless_encryption)
 	{
 		/* Turn on authentication after turning on compression, so
 		that we can compress the authentication information.  We