Fixing user determination

diff --git a/openssl/openssl_sml.c b/openssl/openssl_sml.c
index ee57282..fc82769 100644 (file)
--- a/openssl/openssl_sml.c
+++ b/openssl/openssl_sml.c
@@ -196,21 +196,16 @@ int OpenSSL_SML_use_certificate_chain_file(SSL_CTX *ctx, char *keyfile) {
                                            keyfile);
 }
 
                                            keyfile);
 }
 

-static unsigned char subject[] = "Subject";
-

 const char *OpenSSL_SML_get_peer_name(SSL *ssl) {
   X509 *x = SSL_get_peer_certificate(ssl);
 const char *OpenSSL_SML_get_peer_name(SSL *ssl) {
   X509 *x = SSL_get_peer_certificate(ssl);

-  unsigned char *name = subject;
-  X509_NAME *nm;

 
   if (x) {
     X509_NAME *name = X509_get_subject_name(x);
 
     if (name) {
 
   if (x) {
     X509_NAME *name = X509_get_subject_name(x);
 
     if (name) {

-      unsigned char *out;

       X509_NAME_ENTRY *ne;
 
       X509_NAME_ENTRY *ne;
 

-      ne = X509_NAME_get_entry(name, 3);
+      ne = X509_NAME_get_entry(name, 0);

 
       if (ne) {
        ASN1_STRING *s = X509_NAME_ENTRY_get_data(ne);
 
       if (ne) {
        ASN1_STRING *s = X509_NAME_ENTRY_get_data(ne);

diff --git a/scripts/domtool-publish b/scripts/domtool-publish
index 5a23f7e..740ae2c 100755 (executable)
--- a/scripts/domtool-publish
+++ b/scripts/domtool-publish
@@ -27,3 +27,4 @@ case $1 in
        *)
                echo "Usage: domtool-publish [apache|bind|exim|mailman]"
        ;;
        *)
                echo "Usage: domtool-publish [apache|bind|exim|mailman]"
        ;;

+esac

diff --git a/src/main.sml b/src/main.sml
index a3b78e8..afd0ce9 100644 (file)
--- a/src/main.sml
+++ b/src/main.sml
@@ -63,11 +63,11 @@ fun basis () =
 
 fun check fname =
     let
 
 fun check fname =
     let

-       val uid = Posix.ProcEnv.getuid ()
+       (*val uid = Posix.ProcEnv.getuid ()

        val user = Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
 
        val () = Acl.read Config.aclFile
        val user = Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
 
        val () = Acl.read Config.aclFile

-       val () = Domain.setUser user
+       val () = Domain.setUser user*)

 
        val _ = ErrorMsg.reset ()
        val _ = Env.preTycheck ()
 
        val _ = ErrorMsg.reset ()
        val _ = Env.preTycheck ()