[distcc] distcc-over-ssh!

Wayne Davison wayned at users.sourceforge.net
Wed Apr 2 03:00:59 GMT 2003


On Wed, Apr 02, 2003 at 10:46:15AM +1000, Martin Pool wrote:
> On  1 Apr 2003, Wayne Davison <wayned at users.sourceforge.net> wrote:
> > (I'm testing CVS + all my remaining patches.)
> 
> What else do you have?

I'm using 3 prior submissions that haven't been dealt with yet:

 - Change host-options to trailing ",OPT" values (instead of infix
   '/N').

 - Enable masquerade-dir PATH-stripping in distccd (with the variable
   DISTCCD_PATH to let the power user force any PATH they like).

 - Added a QVER (version query) request.

I've created a slightly reworked version of the ,OPT changes.  I
removed the ",timeout=" stuff (that I never actually hooked up, but had
only included as a test of the option-parsing code).  I'm also not sure
if you liked the defines for LOCALHOST and LOCALHOST_LEN, so I left them
out in this version.

Here's were you can grab it:

    http://www.blorf.net/distcc-hostopt.patch

The PATH-stripping patch and the QVER patch are basically the same as
before (just updated with the latest line offsets and context):

    http://www.blorf.net/distccd-path.patch
    http://www.blorf.net/distccd-version.patch

If you don't want to use the QVER change, at least fix the bug in
dcc_r_request_header():

--- src/serve.c	31 Mar 2003 08:36:37 -0000	1.83
+++ src/serve.c	2 Apr 2003 02:42:27 -0000
@@ -87,8 +87,8 @@
 static int dcc_r_request_header(int ifd)
 {
     int vers;
     
-    if (dcc_r_token_int(ifd, "DIST", &vers) == -1) {
+    if (dcc_r_token_int(ifd, "DIST", &vers) != 0) {
         rs_log_error("client did not provide distcc magic fairy dust");
         return EXIT_PROTOCOL_ERROR;
     }

..wayne..


More information about the distcc mailing list