diff options
Diffstat (limited to 'devel/cvs/patches/patch-ar')
| -rw-r--r-- | devel/cvs/patches/patch-ar | 50 |
1 files changed, 42 insertions, 8 deletions
diff --git a/devel/cvs/patches/patch-ar b/devel/cvs/patches/patch-ar index e53f427a093..dca0498ed3a 100644 --- a/devel/cvs/patches/patch-ar +++ b/devel/cvs/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.6 2003/01/15 22:49:38 wiz Exp $ +$NetBSD: patch-ar,v 1.7 2003/01/16 14:46:08 christos Exp $ ---- src/server.c.orig Wed Jan 15 23:00:31 2003 -+++ src/server.c -@@ -772,6 +772,7 @@ E Protocol error: Root says \"%s\" but p +--- src/server.c.orig Thu Jan 16 09:37:28 2003 ++++ src/server.c Thu Jan 16 09:44:24 2003 +@@ -772,6 +772,7 @@ nothing. But for rsh, we need to do it now. */ parse_config (current_parsed_root->directory); @@ -10,7 +10,7 @@ $NetBSD: patch-ar,v 1.6 2003/01/15 22:49:38 wiz Exp $ path = xmalloc (strlen (current_parsed_root->directory) + sizeof (CVSROOTADM) + 2); -@@ -789,6 +790,7 @@ E Protocol error: Root says \"%s\" but p +@@ -789,6 +790,7 @@ pending_error = save_errno; } free (path); @@ -18,7 +18,27 @@ $NetBSD: patch-ar,v 1.6 2003/01/15 22:49:38 wiz Exp $ #ifdef HAVE_PUTENV env = xmalloc (strlen (CVSROOT_ENV) + strlen (current_parsed_root->directory) + 2); -@@ -2174,6 +2176,8 @@ serve_global_option (arg) +@@ -971,9 +973,6 @@ + return; + } + +- if (dir_name != NULL) +- free (dir_name); +- + dir_len = strlen (dir); + + /* Check for a trailing '/'. This is not ISDIRSEP because \ in the +@@ -989,6 +988,9 @@ + return; + } + ++ if (dir_name != NULL) ++ free (dir_name); ++ + dir_name = xmalloc (strlen (server_temp_dir) + dir_len + 40); + if (dir_name == NULL) + { +@@ -2174,6 +2176,8 @@ { case 'n': noexec = 1; @@ -27,7 +47,21 @@ $NetBSD: patch-ar,v 1.6 2003/01/15 22:49:38 wiz Exp $ break; case 'q': quiet = 1; -@@ -5237,6 +5241,7 @@ switch_to_user (username) +@@ -4745,8 +4749,13 @@ + REQ_LINE("Max-dotdot", serve_max_dotdot, 0), + REQ_LINE("Static-directory", serve_static_directory, 0), + REQ_LINE("Sticky", serve_sticky, 0), ++#ifdef notdef + REQ_LINE("Checkin-prog", serve_checkin_prog, 0), + REQ_LINE("Update-prog", serve_update_prog, 0), ++#else ++ REQ_LINE("Checkin-prog", serve_noop, 0), ++ REQ_LINE("Update-prog", serve_noop, 0), ++#endif + REQ_LINE("Entry", serve_entry, RQ_ESSENTIAL), + REQ_LINE("Kopt", serve_kopt, 0), + REQ_LINE("Checkin-time", serve_checkin_time, 0), +@@ -5237,6 +5246,7 @@ const char *username; { struct passwd *pw; @@ -35,7 +69,7 @@ $NetBSD: patch-ar,v 1.6 2003/01/15 22:49:38 wiz Exp $ pw = getpwnam (username); if (pw == NULL) -@@ -5296,7 +5301,15 @@ error 0 %s: no such user\n", username); +@@ -5296,7 +5306,15 @@ } } |