* more details.
*
* You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program. If not, see <https://www.gnu.org/licenses/>.
*/
+#include <inttypes.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <curl/curl.h>
+#include "build-config.h"
+
#include "armor.h"
#include "charfuncs.h"
#include "keydb.h"
#include "mem.h"
#include "onak-conf.h"
#include "parsekey.h"
-#include "version.h"
struct onak_hkp_dbctx {
struct onak_db_config *config; /* Our DB config info */
CURL *curl;
- char hkpbase[1024];
+ char hkpbase[512];
};
static int hkp_parse_url(struct onak_hkp_dbctx *privctx, const char *url)
proto[0] = host[0] = 0;
port = 0;
- matched = sscanf(url, "%5[a-z]://%256[a-zA-Z0-9.]:%u", proto, host,
+ matched = sscanf(url, "%5[a-z]://%256[a-zA-Z0-9.-]:%u", proto, host,
&port);
if (matched < 2) {
proto[0] = 0;
- sscanf(url, "%256[a-zA-Z0-9.]:%u", host, &port);
+ sscanf(url, "%256[a-zA-Z0-9.-]:%u", host, &port);
}
if (host[0] == 0) {
if (!hkp_parse_url(privctx, dbcfg->location)) {
exit(EXIT_FAILURE);
}
+ logthing(LOGTHING_INFO, "Using %s as HKP forwarding URL.",
+ privctx->hkpbase);
curl_global_init(CURL_GLOBAL_DEFAULT);
privctx->curl = curl_easy_init();
if (privctx->curl == NULL) {