summaryrefslogtreecommitdiff
path: root/devel/cvs-devel/files/patch-normalize_correct_roots
blob: b8ab013f3b8e61736c2554477e46f8e8e4fff31f (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
# Apply patch from 120042, which only tries to parse pserver, gserver
# and kserver methods when doing cvs login.  (closes: #120042).
#
# Patch from Horms <horms@vergenet.net>
diff -Nur src/login.c src/login.c
--- src/login.c	2006-02-26 22:10:42.000000000 +0800
+++ src/login.c	2006-02-26 22:25:14.000000000 +0800
@@ -200,11 +200,21 @@
 	    return NULL;
 	}
 	*p = ' ';
-	tmp_root_canonical = normalize_cvsroot (tmp_root);
-	if (strcmp (cvsroot_canonical, tmp_root_canonical) == 0)
-	    password = p + 1;
-
-	free (tmp_root_canonical);
+	switch (tmp_root->method)
+	{
+	    case gserver_method:
+	    case pserver_method:
+#ifdef HAVE_KERBEROS
+	    case kserver_method:
+#endif /* HAVE_KERBEROS */
+		tmp_root_canonical = normalize_cvsroot (tmp_root);
+		if (strcmp (cvsroot_canonical, tmp_root_canonical) == 0)
+	    	    password = p + 1;
+		free (tmp_root_canonical);
+		break;
+	    default:
+		break;
+	}
     }
 
     return password;