[or-cvs] r16385: Unify hostname file format for authorization types 1 and 2. (tor/branches/121-hs-authorization/src/or)

[kloesing at seul.org]

Author: kloesing
Date: 2008-08-04 12:19:22 -0400 (Mon, 04 Aug 2008)
New Revision: 16385

Modified:
   tor/branches/121-hs-authorization/src/or/rendservice.c
Log:
Unify hostname file format for authorization types 1 and 2.

Modified: tor/branches/121-hs-authorization/src/or/rendservice.c
===================================================================
--- tor/branches/121-hs-authorization/src/or/rendservice.c	2008-08-04 15:55:20 UTC (rev 16384)
+++ tor/branches/121-hs-authorization/src/or/rendservice.c	2008-08-04 16:19:22 UTC (rev 16385)
@@ -586,7 +586,7 @@
         log_warn(LD_CONFIG, "Could not clear client_keys file.");
         return -1;
       }
-      if (s->auth_type == 2 && write_str_to_file(fname, "", 0) < 0) {
+      if (write_str_to_file(fname, "", 0) < 0) {
         log_warn(LD_CONFIG, "Could not clear hostname file.");
         return -1;
       }
@@ -686,8 +686,8 @@
         } else {
           desc_cook_out[strlen(desc_cook_out)-3] = '\0'; /* Remove == signs
                                                             and newline. */
-          tor_snprintf(buf, sizeof(buf),"%s # client: %s\n",
-            desc_cook_out, client->client_name);
+          tor_snprintf(buf, sizeof(buf),"%s.onion %s # client: %s\n",
+                       s->service_id, desc_cook_out, client->client_name);
         }
         append_bytes_to_file(fname, buf, strlen(buf), 0);
       });