From 175772212814e61c29e8905675d03800c22ddccb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Sun, 7 Dec 2008 11:30:15 +0000 Subject: [PATCH] * follo hashiterator api-change --- citadel/modules/expire/serv_expire.c | 4 ++-- citadel/modules/openid/serv_openid_rp.c | 2 +- citadel/modules/vcard/serv_vcard.c | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c index 7caf493d9..2a585e551 100644 --- a/citadel/modules/expire/serv_expire.c +++ b/citadel/modules/expire/serv_expire.c @@ -802,7 +802,7 @@ int PurgeStaleOpenIDassociations(void) { char *deleteme = NULL; long len; void *Value; - char *Key; + const char *Key; int num_deleted = 0; keys = NewHash(1, NULL); @@ -824,7 +824,7 @@ int PurgeStaleOpenIDassociations(void) { /* Go through the hash list, deleting keys we stored in it */ - HashPos = GetNewHashPos(); + HashPos = GetNewHashPos(keys, 0); while (GetNextHashPos(keys, HashPos, &len, &Key, &Value)!=0) { CtdlLogPrintf(CTDL_DEBUG, "Deleting associated OpenID <%s>\n", Value); diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c index 2fb909784..c911bda9b 100644 --- a/citadel/modules/openid/serv_openid_rp.c +++ b/citadel/modules/openid/serv_openid_rp.c @@ -150,7 +150,7 @@ void openid_purge(struct ctdluser *usbuf) { /* Go through the hash list, deleting keys we stored in it */ - HashPos = GetNewHashPos(); + HashPos = GetNewHashPos(keys, 0); while (GetNextHashPos(keys, HashPos, &len, &Key, &Value)!=0) { CtdlLogPrintf(CTDL_DEBUG, "Deleting associated OpenID <%s>\n", Value); diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c index 8561d43ce..02681b021 100644 --- a/citadel/modules/vcard/serv_vcard.c +++ b/citadel/modules/vcard/serv_vcard.c @@ -718,8 +718,12 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { * But if the user was an Aide or was edited by an Aide then we can * Assume they don't need validating. */ - if (CC->user.axlevel >= 6) + if (CC->user.axlevel >= 6) { + lgetuser(&CC->user, CC->curr_user); + CC->user.flags |= US_REGIS; + lputuser(&CC->user); return (0); + } set_mm_valid(); -- 2.30.2