stable now but there are GIANT PIECES MISSING

[citadel.git] / citadel / modules / openid / serv_openid_rp.c

diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c
index b592d8156c090f548eff4f9469a050042b0cf530..bea03b42cd361c3f8ece0b459dcedaf195dabd76 100644 (file)
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -1,7 +1,7 @@
 /*
  * This is an implementation of OpenID 2.0 relying party support in stateless mode.
  *
- * Copyright (c) 2007-2017 by the citadel.org team
+ * Copyright (c) 2007-2020 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,18 +26,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
@@ -394,7 +383,6 @@ int openid_create_user_via_ax(StrBuf *claimed_id, HashList *sreg_keys)
        }
        syslog(LOG_DEBUG, "openid: the desired account name is <%s>", nickname);
 
-       len = cutuserkey(nickname);
        if (!CtdlGetUser(&CC->user, nickname)) {
                syslog(LOG_DEBUG, "openid: <%s> is already taken by another user.", nickname);
                memset(&CC->user, 0, sizeof(struct ctdluser));
@@ -839,7 +827,7 @@ void cmd_oids(char *argbuf) {
 
        CCC->openid_data = oiddata = malloc(sizeof(ctdl_openid));
        if (oiddata == NULL) {
-               syslog(LOG_ERR, "openid: malloc() failed: %s", strerror(errno));
+               syslog(LOG_ERR, "openid: malloc() failed: %m");
                cprintf("%d malloc failed\n", ERROR + INTERNAL_ERROR);
                return;
        }