prosody
b3ceb7627e27
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 6038:b3ceb7627e27

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Tue, 25 Mar 2014 19:16:38 +0100
parent 5809:be997c6a69be
parent 6035:1b5ca55bf895
child 6062:6cc6b4d407df
comparison
equal deleted inserted replaced
6037:7bbe22d8dd09 6038:b3ceb7627e27
685 conf.req.string_mask = "utf8only" 685 conf.req.string_mask = "utf8only"
686 end 686 end
687 conf.distinguished_name[k] = nv ~= "." and nv or nil; 687 conf.distinguished_name[k] = nv ~= "." and nv or nil;
688 end 688 end
689 end 689 end
690 local conf_file = io.open(conf_filename, "w"); 690 local conf_file, err = io.open(conf_filename, "w");
691 if not conf_file then
692 show_warning("Could not open OpenSSL config file for writing");
693 show_warning(err);
694 os.exit(1);
695 end
691 conf_file:write(conf:serialize()); 696 conf_file:write(conf:serialize());
692 conf_file:close(); 697 conf_file:close();
693 print(""); 698 print("");
694 show_message("Config written to " .. conf_filename); 699 show_message("Config written to " .. conf_filename);
695 return nil, conf_filename; 700 return nil, conf_filename;