Fixes from Stefan Esser

- Avoid double free in dir_name
- Disable checkin-prog and update-prog

gnu/dist/cvs/src/server.c

@@ -981,9 +981,6 @@ dirswitch (dir, repos)
 	return;
     }
 
-    if (dir_name != NULL)
-	free (dir_name);
-
     dir_len = strlen (dir);
 
     /* Check for a trailing '/'.  This is not ISDIRSEP because \ in the
@@ -999,6 +996,9 @@ dirswitch (dir, repos)
 	return;
     }
 
+    if (dir_name != NULL)
+	free (dir_name);
+
     dir_name = malloc (strlen (server_temp_dir) + dir_len + 40);
     if (dir_name == NULL)
     {
@@ -4754,8 +4754,13 @@ struct request requests[] =
   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),