* --pedantic cleanup.

[citadel.git] / webcit / auth.c

diff --git a/webcit/auth.c b/webcit/auth.c
index 618956d615a3e02c61f5446f212b8ead5b8e3688..77c2d457f503996e1c3a79aaa9c839c007a570e1 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -176,7 +176,7 @@ void become_logged_in(char *user, char *pass, char *serv_response)
  */
 void do_login(void)
 {
-       struct wcsession *WCC = WC;
+       wcsession *WCC = WC;
        char buf[SIZ];
 
        if (havebstr("language")) {
@@ -261,12 +261,13 @@ void do_login(void)
  */
 void openid_manual_create(void)
 {
+       char buf[1024];
+
        if (havebstr("exit_action")) {
                do_logout();
                return;
        }
 
-       char buf[1024];
        if (havebstr("newuser_action")) {
                serv_printf("OIDC %s", bstr("name"));
                serv_getln(buf, sizeof buf);
@@ -342,7 +343,7 @@ void do_openid_login(void)
 void finalize_openid_login(void)
 {
        char buf[1024];
-       struct wcsession *WCC = WC;
+       wcsession *WCC = WC;
        int already_logged_in = (WCC->logged_in) ;
        int linecount = 0;
        char result[128] = "";
@@ -364,7 +365,7 @@ void finalize_openid_login(void)
                                const char *HKey;
                                HashPos *Cursor;
                                
-                               Cursor = GetNewHashPos ();
+                               Cursor = GetNewHashPos (WCC->urlstrings, 0);
                                while (GetNextHashPos(WCC->urlstrings, Cursor, &HKLen, &HKey, &U)) {
                                        u = (urlcontent*) U;
                                        if (!strncasecmp(u->url_key, "openid.", 7)) {
@@ -850,7 +851,7 @@ int ConditionalRoomAide(WCTemplateToken *Tokens, void *Context, int ContextType)
 
 int ConditionalRoomAcessDelete(WCTemplateToken *Tokens, void *Context, int ContextType)
 {
-       struct wcsession *WCC = WC;
+       wcsession *WCC = WC;
        return ( (WCC->is_room_aide) || (WCC->is_mailbox) || (WCC->room_flags2 & QR2_COLLABDEL) );
 }