Ticket #928: 0001-Bug-928-Disallow-BridgeRelay-1-and-ORPort-0-configur.patch

File 0001-Bug-928-Disallow-BridgeRelay-1-and-ORPort-0-configur.patch, 1.0 KB (added by cjb, 9 years ago)
  • new file changes/bug928

    From 718779d7910246ab1fdddd9c3a28a655ff954c48 Mon Sep 17 00:00:00 2001
    From: Chris Ball <chris@printf.net>
    Date: Sat, 31 Jul 2010 19:42:29 -0400
    Subject: [PATCH] Bug #928: Disallow BridgeRelay 1 and ORPort 0 configuration
    
    ---
     changes/bug928  |    4 ++++
     src/or/config.c |    3 +++
     2 files changed, 7 insertions(+), 0 deletions(-)
     create mode 100644 changes/bug928
    
    diff --git a/changes/bug928 b/changes/bug928
    new file mode 100644
    index 0000000..4f9fc5f
    - +  
     1  o Minor bugfixes:
     2    - Disallow BridgeRelay 1 and ORPort 0 configuration.
     3      Bugfix in 0.2.0.13-alpha, closes bug 928.
     4
  • src/or/config.c

    diff --git a/src/or/config.c b/src/or/config.c
    index fc84556..20ae9f0 100644
    a b options_validate(or_options_t *old_options, or_options_t *options, 
    35903590        }
    35913591    });
    35923592
     3593  if (options->BridgeRelay == 1 && options->ORPort == 0)
     3594      REJECT("BridgeRelay is 1, ORPort is 0. This is an invalid combination.");
     3595
    35933596  return 0;
    35943597#undef REJECT
    35953598#undef COMPLAIN