BIND 10 #283: Xfrout uses different socket file than b10-auth when ran from source

[BIND 10 Development]

#283: Xfrout uses different socket file than b10-auth when ran from source
-------------------------+--------------------------------------------------
      Reporter:  jreed   |        Owner:     
          Type:  defect  |       Status:  new
      Priority:  major   |    Milestone:     
     Component:  xfrout  |   Resolution:     
      Keywords:          |    Sensitive:  0  
Estimatedhours:  0.0     |        Hours:     
      Billable:  0       |   Totalhours:     
      Internal:  0       |  
-------------------------+--------------------------------------------------

Comment(by jelte):

 The issue here is another one than the one in #299; it's a regression as a
 result from the changes in changelog item 79 (trac #221, r2565);

 (btw, no the socket file should not be changeable by the user, but if we
 want to run from source we can't rely on having access to whatever is the
 target directory)

 this should fix it:

 {{{
 Index: src/bin/auth/main.cc
 ===================================================================
 --- src/bin/auth/main.cc        (revision 2681)
 +++ src/bin/auth/main.cc        (working copy)
 @@ -156,7 +156,13 @@
      Session* xfrin_session = NULL;
      bool xfrin_session_established = false; // XXX (see Trac #287)
      ModuleCCSession* config_session = NULL;
 -    XfroutClient xfrout_client(UNIX_SOCKET_FILE);
 +    std::string xfrout_socket_path;
 +    if (getenv("B10_FROM_BUILD")) {
 +        xfrout_socket_path = string(getenv("B10_FROM_BUILD")) +
 "/auth_xfrout_conn";
 +    } else {
 +        xfrout_socket_path = UNIX_SOCKET_FILE;
 +    }
 +    XfroutClient xfrout_client(xfrout_socket_path);
      try {
          string specfile;
          if (getenv("B10_FROM_BUILD")) {
 }}}

-- 
Ticket URL: <http://bind10.isc.org/ticket/283#comment:4>
BIND 10 Development <http://bind10.isc.org>
BIND 10 Development