updates.

[silc.git] / apps / silcd / silcd.c

diff --git a/apps/silcd/silcd.c b/apps/silcd/silcd.c
index 186deb82aa05c197db58ddbe447b2ea8cbf3b4e4..a6f76db1cfad3a09b7d1e7e8c7bfc721f76802e4 100644 (file)
--- a/apps/silcd/silcd.c
+++ b/apps/silcd/silcd.c
@@ -2,7 +2,7 @@
 
   silcd.c
   
-  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+  Author: Pekka Riikonen <priikone@silcnet.org>
 
   Copyright (C) 1997 - 2001 Pekka Riikonen
 
@@ -41,7 +41,7 @@ silc_server_create_key_pair(char *pkcs_name, int bits, char *path,
 static struct option long_opts[] = 
 {
   { "config-file", 1, NULL, 'f' },
-  { "debug", 0, NULL, 'd' },
+  { "debug", 1, NULL, 'd' },
   { "help", 0, NULL, 'h' },
   { "version", 0, NULL,'V' },
 
@@ -49,6 +49,7 @@ static struct option long_opts[] =
   { "create-key-pair", 1, NULL, 'C' },
   { "pkcs", 1, NULL, 10 },
   { "bits", 1, NULL, 11 },
+  { "identifier", 1, NULL, 12 },
 
   { NULL, 0, NULL, 0 }
 };
@@ -57,6 +58,7 @@ static struct option long_opts[] =
 static bool opt_create_keypair = FALSE;
 static char *opt_keypath = NULL;
 static char *opt_pkcs = "rsa";
+static char *opt_identifier = NULL;
 static int opt_bits = 1024;
 
 /* Prints out the usage of silc client */
@@ -68,7 +70,7 @@ Usage: silcd [options]\n\
 \n\
   Generic Options:\n\
   -f  --config-file=FILE        Alternate configuration file\n\
-  -d  --debug                   Enable debugging (no daemon)\n\
+  -d  --debug=string            Enable debugging (no daemon)\n\
   -h  --help                    Display this message\n\
   -V  --version                 Display version\n\
 \n\
@@ -76,6 +78,19 @@ Usage: silcd [options]\n\
   -C, --create-key-pair=PATH    Create new public key pair\n\
       --pkcs=PKCS               Set the PKCS of the public key pair\n\
       --bits=VALUE              Set length of the public key pair\n\
+      --identifier=IDENTIFIER   Public key identifier\n\
+\n\
+      The public key identifier may be of the following format:\n\
+\n\
+      UN=<username>, HN=<hostname or IP>, RN=<real name>, E=<email>,\n\
+      O=<organization>, C=<country>\n\
+\n\
+      The UN and HN must be provided, the others are optional.  If the\n\
+      --identifier option is not used an identifier will be created for\n\
+      the public key automatically.\n\
+\n\
+      Example identifier: \"UN=foobar, HN=foo.bar.com, RN=Foo T. Bar, \n\
+                           E=foo@bar.com, C=FI\"\n\
 \n");
   exit(0);
 }
@@ -86,12 +101,14 @@ int main(int argc, char **argv)
   int opt, option_index;
   char *config_file = NULL;
   SilcServer silcd;
+  struct sigaction sa;
+  char pid[10];
 
   silc_debug = FALSE;
 
   /* Parse command line arguments */
   if (argc > 1) {
-    while ((opt = getopt_long(argc, argv, "cf:dhVC:",
+    while ((opt = getopt_long(argc, argv, "cf:d:hVC:",
                              long_opts, &option_index)) != EOF) {
       switch(opt) 
        {
@@ -100,13 +117,16 @@ int main(int argc, char **argv)
          break;
        case 'V':
          printf("SILCd Secure Internet Live Conferencing daemon, "
-                "version %s\n", silc_version);
+                "version %s (base: SILC Toolkit %s)\n",
+                 silc_dist_version, silc_version);
          printf("(c) 1997 - 2001 Pekka Riikonen "
-                "<priikone@poseidon.pspt.fi>\n");
+                "<priikone@silcnet.org>\n");
          exit(0);
          break;
        case 'd':
          silc_debug = TRUE;
+         silc_debug_hexdump = TRUE;
+         silc_log_set_debug_string(optarg);
          break;
        case 'f':
          config_file = strdup(optarg);
@@ -128,6 +148,10 @@ int main(int argc, char **argv)
          if (optarg)
            opt_bits = atoi(optarg);
          break;
+       case 12:
+         if (optarg)
+           opt_identifier = strdup(optarg);
+         break;
 
        default:
          silc_usage();
@@ -138,8 +162,12 @@ int main(int argc, char **argv)
 
   if (opt_create_keypair == TRUE) {
     /* Create new key pair and exit */
+    silc_cipher_register_default();
+    silc_pkcs_register_default();
+    silc_hash_register_default();
+    silc_hmac_register_default();
     silc_server_create_key_pair(opt_pkcs, opt_bits, opt_keypath,
-                               NULL, NULL, NULL);
+                               opt_identifier, NULL, NULL);
     exit(0);
   }
 
@@ -162,10 +190,22 @@ int main(int argc, char **argv)
   if (ret == FALSE)
     goto fail;
 
+  /* Ignore SIGPIPE */
+  sa.sa_handler = SIG_IGN;
+  sa.sa_flags = 0;
+  sigemptyset(&sa.sa_mask);
+  sigaction(SIGPIPE, &sa, NULL);
+
   if (silc_debug == FALSE)
     /* Before running the server, fork to background and set
        both user and group no non-root */    
     silc_server_daemonise(silcd);
+
+  /* Set /var/run/silcd.pid */
+  unlink(SILC_SERVER_PID_FILE);
+  memset(pid, 0, sizeof(pid));
+  snprintf(pid, sizeof(pid) - 1, "%d\n", getpid());
+  silc_file_writefile(SILC_SERVER_PID_FILE, pid, strlen(pid));
   
   /* Run the server. When this returns the server has been stopped
      and we will exit. */