* Eliminate generic_free_handler() since it is not needed

[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 2e65c1acc2bdb76136603fe1cfed967e24529c7b..79c10dd5d8987a8a35283525b71f88b9ed629974 100644 (file)
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -129,7 +129,7 @@ int attach_openid(struct ctdluser *who, char *claimed_id)
 
        snprintf(buf, sizeof buf, "User <%s> (#%ld) has claimed the OpenID URL %s\n",
                who->fullname, who->usernum, claimed_id);
-       aide_message(buf, "OpenID claim");
+       CtdlAideMessage(buf, "OpenID claim");
        CtdlLogPrintf(CTDL_INFO, "%s", buf);
        return(0);
 }
@@ -159,7 +159,7 @@ void openid_purge(struct ctdluser *usbuf) {
                        memcpy(&usernum, cdboi->ptr, sizeof(long));
                        if (usernum == usbuf->usernum) {
                                deleteme = strdup(cdboi->ptr + sizeof(long)),
-                               Put(keys, deleteme, strlen(deleteme), deleteme, generic_free_handler);
+                               Put(keys, deleteme, strlen(deleteme), deleteme, NULL);
                        }
                }
                cdb_free(cdboi);
@@ -219,7 +219,7 @@ void cmd_oida(char *argbuf) {
        while (cdboi = cdb_next_item(CDB_OPENID), cdboi != NULL) {
                if (cdboi->len > sizeof(long)) {
                        memcpy(&usernum, cdboi->ptr, sizeof(long));
-                       if (getuserbynumber(&usbuf, usernum) != 0) {
+                       if (CtdlGetUserByNumber(&usbuf, usernum) != 0) {
                                usbuf.fullname[0] = 0;
                        } 
                        cprintf("%s|%ld|%s\n",
@@ -404,7 +404,7 @@ int openid_create_user_via_sreg(char *claimed_id, HashList *sreg_keys)
 
        CtdlLogPrintf(CTDL_DEBUG, "The desired account name is <%s>\n", desired_name);
 
-       if (!getuser(&CC->user, desired_name)) {
+       if (!CtdlGetUser(&CC->user, desired_name)) {
                CtdlLogPrintf(CTDL_DEBUG, "<%s> is already taken by another user.\n", desired_name);
                memset(&CC->user, 0, sizeof(struct ctdluser));
                return(5);
@@ -438,7 +438,7 @@ int login_via_openid(char *claimed_id)
        memcpy(&usernum, cdboi->ptr, sizeof(long));
        cdb_free(cdboi);
 
-       if (!getuserbynumber(&CC->user, usernum)) {
+       if (!CtdlGetUserByNumber(&CC->user, usernum)) {
                /* Now become the user we just created */
                safestrncpy(CC->curr_user, CC->user.fullname, sizeof CC->curr_user);
                do_login();
@@ -465,7 +465,7 @@ int login_via_openid(char *claimed_id)
  */
 void extract_link(char *target_buf, int target_size, char *rel, char *source_buf)
 {
-       char *ptr = source_buf;
+       const char *ptr = source_buf;
 
        if (!target_buf) return;
        if (!rel) return;
@@ -493,7 +493,7 @@ void extract_link(char *target_buf, int target_size, char *rel, char *source_buf
                        if (len > sizeof work_buffer) len = sizeof work_buffer;
                        memcpy(work_buffer, link_tag_start, len);
                
-                       char *rel_start = NULL;
+                       const char *rel_start = NULL;
                        char *rel_end = NULL;
                        rel_start = bmstrcasestr(work_buffer, "rel=");
                        if (rel_start) {
@@ -723,6 +723,10 @@ void cmd_oidf(char *argbuf) {
                cprintf("%d NewHash() failed\n", ERROR + INTERNAL_ERROR);
                return;
        }
+       if (IsEmptyStr(oiddata->server)){
+               cprintf("%d need a remote server to authenticate against\n", ERROR + ILLEGAL_VALUE);
+               return;
+       }
        
        cprintf("%d Transmit OpenID data now\n", START_CHAT_MODE);
 
@@ -730,7 +734,7 @@ void cmd_oidf(char *argbuf) {
                extract_token(thiskey, buf, 0, '|', sizeof thiskey);
                extract_token(thisdata, buf, 1, '|', sizeof thisdata);
                CtdlLogPrintf(CTDL_DEBUG, "%s: [%d] %s\n", thiskey, strlen(thisdata), thisdata);
-               Put(keys, thiskey, strlen(thiskey), strdup(thisdata), generic_free_handler);
+               Put(keys, thiskey, strlen(thiskey), strdup(thisdata), NULL);
        }