* CSR code more or less in its final form for now.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 02fd512602388f15a66766f165ac0b3c0c8543e2..172b1b45e7524972fddc350a7d9dd282ea9648df 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 614.47  2004/02/22 04:55:15  ajc
+ * CSR code more or less in its final form for now.
+
  Revision 614.46  2004/02/22 04:42:05  ajc
  * Initial version of function to automatically generate a Certificate
    Signing Request if one is not present
@@ -5389,4 +5392,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/serv_crypto.c b/citadel/serv_crypto.c
index 8a8d45b788080aa96c840aa3320b11c2400b37ea..d757141568f2d3e2365eeb698b5aaf962481e861 100644 (file)
--- a/citadel/serv_crypto.c
+++ b/citadel/serv_crypto.c
@@ -251,10 +251,25 @@ void init_ssl(void)
 
                                        name = X509_REQ_get_subject_name(x);
 
-                                       /* Tell it who we are (FIXME more here later) */
+                                       /* Tell it who we are */
+
+                                       /*
                                        X509_NAME_add_entry_by_txt(name, "C",
                                                MBSTRING_ASC, "US", -1, -1, 0);
 
+                                       X509_NAME_add_entry_by_txt(name, "ST",
+                                               MBSTRING_ASC, "New York", -1, -1, 0);
+
+                                       X509_NAME_add_entry_by_txt(name, "L",
+                                               MBSTRING_ASC, "Mount Kisco", -1, -1, 0);
+                                       */
+
+                                       X509_NAME_add_entry_by_txt(name, "O",
+                                               MBSTRING_ASC, config.c_humannode, -1, -1, 0);
+
+                                       X509_NAME_add_entry_by_txt(name, "OU",
+                                               MBSTRING_ASC, "Citadel server", -1, -1, 0);
+
                                        X509_NAME_add_entry_by_txt(name, "CN",
                                                MBSTRING_ASC, config.c_fqdn, -1, -1, 0);
                                

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 5dcc778fe1863a81969ac674f63e05368475900b..9d06152f5baf091a707cff4dfdd610c42da0f4b7 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -148,15 +148,15 @@ int main(int argc, char **argv)
        lprintf(1,"General Public License.\n");
        lprintf(1, "\n");
 
-       /* Initialize... */
-       init_sysdep();
-
        /* Load site-specific parameters, and set the ipgm secret */
        lprintf(7, "Loading citadel.config\n");
        get_config();
        config.c_ipgm_secret = rand();
        put_config();
 
+       /* Initialize... */
+       init_sysdep();
+
        /*
         * Do non system dependent startup functions.
         */