Commit 2db858ef authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge remote-tracking branch 'jryans/dependant-corrected'

parents 6c2b48da 58172be6

changes/18146

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfix (control protocol):

    - The reply to a "GETINFO config/names" request via the control protocol

      now spells the type "Dependent" correctly.  This is a breaking change in

      the control protocol.  (It seems to be ignored by the most common known

      clients.)  Fixes bug 18146; bugfix on 0.1.1.4-alpha.

src/or/config.c

+1 −1
Original line number Diff line number Diff line
@@ -7858,7 +7858,7 @@ getinfo_helper_config(control_connection_t *conn, 
        case CONFIG_TYPE_CSV: type = "CommaList"; break;

        case CONFIG_TYPE_CSV_INTERVAL: type = "TimeIntervalCommaList"; break;

        case CONFIG_TYPE_LINELIST: type = "LineList"; break;

        case CONFIG_TYPE_LINELIST_S: type = "Dependant"; break;

        case CONFIG_TYPE_LINELIST_S: type = "Dependent"; break;

        case CONFIG_TYPE_LINELIST_V: type = "Virtual"; break;

        default:

        case CONFIG_TYPE_OBSOLETE: