* 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 955d823c555132a98480b04858de60ea572a28a0..79c10dd5d8987a8a35283525b71f88b9ed629974 100644 (file)
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -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);
@@ -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);
        }