Make submitd compile with the new libucw.

diff --git a/submit/submitd.c b/submit/submitd.c
index f373618444ea5ff8855d05ed5009d55be58c8564..62deef667a8e8e95a158a6a1bd81eb601d9e9bc5 100644 (file)
--- a/submit/submitd.c
+++ b/submit/submitd.c
@@ -25,16 +25,16 @@
 
 /*** CONFIGURATION ***/
 
-static byte *log_name;
+static char *log_name;
 static uns port = 8888;
 static uns dh_bits = 1024;
 static uns max_conn = 10;
 static uns session_timeout;
 uns max_versions;
-static byte *ca_cert_name = "?";
-static byte *server_cert_name = "?";
-static byte *server_key_name = "?";
-byte *history_format;
+static char *ca_cert_name = "?";
+static char *server_cert_name = "?";
+static char *server_key_name = "?";
+char *history_format;
 static clist access_rules;
 static uns trace_tls;
 uns max_request_size;

diff --git a/submit/submitd.h b/submit/submitd.h
index 6078eb995d7d95bb145d30a28275ad313515a188..5df95f35db156a7490a1ff7ab1f8d5686bd744b4 100644 (file)
--- a/submit/submitd.h
+++ b/submit/submitd.h
@@ -31,12 +31,12 @@ struct conn {
   // Set up by the master process
   cnode n;
   u32 ip;
-  byte *ip_string;                     // (xmalloced)
+  char *ip_string;                     // (xmalloced)
   pid_t pid;
   uns id;
   struct access_rule *rule;            // Rule matched by this connection
   int sk;                              // Client socket
-  byte *cert_name;                     // Client name from the certificate (NULL if no TLS) (xmalloced)
+  char *cert_name;                     // Client name from the certificate (NULL if no TLS) (xmalloced)
 
   // Used by the child process
   gnutls_session_t tls;                        // TLS session
@@ -46,12 +46,12 @@ struct conn {
   struct odes *reply;
   struct odes *task_status;
   int task_lock_fd;
-  byte *user;
+  char *user;
 };
 
 extern uns max_request_size, max_attachment_size, trace_commands;
 extern uns max_versions;
-extern byte *history_format;
+extern char *history_format;
 
 /* submitd.c */
 
@@ -66,7 +66,7 @@ int process_command(struct conn *c);
 
 struct task {
   cnode n;
-  byte *name;
+  char *name;
   uns open_data;       // Number of parts for open-data tasks
   uns max_size;                // Maximum size (0=use global default)
   clist parts;         // List of parts of this task (simp_nodes)