diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2007-09-10 19:11:09 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2007-09-10 19:11:09 +0000 |
| commit | 8e23536af846e85fe2dc2aa971e102f3c12ab8dc (patch) | |
| tree | 2df74c24ed8e952cbc9e9ce826fc0fe88b1ae577 | |
| parent | b3c8c11717dc2654a849620f8f2671da4b4042fd (diff) | |
remove my addition of portnumber for rsh in CVSROOT.
while it sounds like a "good" idea some people convinced me otherwise.
mostly because this breaks compat with GNU cvs.
| -rw-r--r-- | usr.bin/cvs/client.c | 7 | ||||
| -rw-r--r-- | usr.bin/cvs/cvs.h | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/root.c | 6 |
3 files changed, 5 insertions, 12 deletions
diff --git a/usr.bin/cvs/client.c b/usr.bin/cvs/client.c index 0902ef60bc0..c1ededca87d 100644 --- a/usr.bin/cvs/client.c +++ b/usr.bin/cvs/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.78 2007/09/10 14:06:14 joris Exp $ */ +/* $OpenBSD: client.c,v 1.79 2007/09/10 19:11:08 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -234,11 +234,6 @@ cvs_client_connect_to_server(void) argv[argc++] = current_cvsroot->cr_user; } - if (current_cvsroot->cr_port != NULL) { - argv[argc++] = "-p"; - argv[argc++] = current_cvsroot->cr_port; - } - argv[argc++] = current_cvsroot->cr_host; argv[argc++] = cmd; argv[argc++] = "server"; diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h index 693ace54f6a..4396b8ca0a0 100644 --- a/usr.bin/cvs/cvs.h +++ b/usr.bin/cvs/cvs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.h,v 1.144 2007/09/10 14:06:14 joris Exp $ */ +/* $OpenBSD: cvs.h,v 1.145 2007/09/10 19:11:08 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -208,7 +208,7 @@ struct cvsroot { char *cr_pass; char *cr_host; char *cr_dir; - char *cr_port; + u_int cr_port; /* connection data */ u_int cr_flags; diff --git a/usr.bin/cvs/root.c b/usr.bin/cvs/root.c index 9ca716e0596..99258fbc87f 100644 --- a/usr.bin/cvs/root.c +++ b/usr.bin/cvs/root.c @@ -1,4 +1,4 @@ -/* $OpenBSD: root.c,v 1.42 2007/09/10 14:06:14 joris Exp $ */ +/* $OpenBSD: root.c,v 1.43 2007/09/10 19:11:08 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -133,12 +133,10 @@ cvsroot_parse(const char *str) pp = strchr(sp, ':'); if (pp != NULL) { *(pp++) = '\0'; - - i = strtonum(pp, 1, 65535, &errstr); + root->cr_port = strtonum(pp, 1, 65535, &errstr); if (errstr != NULL) fatal("port specification in CVSROOT is %s", errstr); - root->cr_port = pp; } root->cr_host = sp; |