Merge branch 'bug2408-v2-021-common' into bug2408-v2-022

This commit is contained in:
Robert Ransom
2011-02-09 03:05:21 -08:00
2 changed files with 9 additions and 1 deletions
+3 -1
View File
@@ -2841,7 +2841,9 @@ compute_publishserverdescriptor(or_options_t *options)
else if (!strcasecmp(string, "bridge"))
*auth |= BRIDGE_AUTHORITY;
else if (!strcasecmp(string, "hidserv"))
*auth |= HIDSERV_AUTHORITY;
log_warn(LD_CONFIG,
"PublishServerDescriptor hidserv is invalid. See "
"PublishHidServDescriptors.");
else if (!strcasecmp(string, "") || !strcmp(string, "0"))
/* no authority */;
else