$NetBSD: patch-al,v 1.3 2008/01/17 11:03:03 tnn Exp $

--- src/client.c.orig	2006-06-08 16:36:03.000000000 +0200
+++ src/client.c
@@ -4497,6 +4497,16 @@ start_server ()
 		error (1, 0,
 		       "This server does not support the global -n option.");
 	}
+	if (nolock && !noexec)
+	{
+	    if (have_global)
+	    {
+		send_to_server ("Global_option -u\012", 0);
+	    }
+	    else
+		error (1, 0,
+		       "This server does not support the global -u option.");
+	}
 	if (quiet)
 	{
 	    if (have_global)
@@ -4789,7 +4799,7 @@ start_rsh_server (root, to_server, from_
     int child_pid;
 
     if (!cvs_rsh)
-	cvs_rsh = "rsh";
+	cvs_rsh = RSH_DFLT;
     if (!cvs_server)
 	cvs_server = "cvs";