* add logging if auth-basic session connecting fails with weird conditions

[citadel.git] / webcit / auth.c

diff --git a/webcit/auth.c b/webcit/auth.c
index 663f3d246af1e75134cdea0933a5b3514ac1be67..d61d7c203002e8805e8b9c38864201b358615f98 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -74,7 +74,7 @@ void display_openid_name_request(const StrBuf *claimed_id, const StrBuf *usernam
 
        if (StrLength(username) > 0) {
                        Buf = NewStrBufPlain(NULL, StrLength(username));
-                       StrEscAppend(Buf, claimed_id, NULL, 0, 0);
+                       StrEscAppend(Buf, username, NULL, 0, 0);
                        svprintf(HKEY("REASON"), WCS_STRING,
                                 _("However, the user name '%s' conflicts with an existing user."), 
                                 ChrPtr(Buf));
@@ -775,10 +775,14 @@ void display_reg(int during_login)
                do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "do_welcome", USERCONFIGROOM);
        }
        else {
-               do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "display_main_menu", USERCONFIGROOM);
+               StrBuf *ReturnTo;
+               ReturnTo = NewStrBufPlain(HKEY("display_main_menu?gotofirst="));
+               StrBufAppendBuf(ReturnTo, WC->wc_roomname, 0);
+               do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, ChrPtr(ReturnTo), USERCONFIGROOM);
+               FreeStrBuf(&ReturnTo);
        }
 
-       /* FIXME don't we have to free VCMsg and VCAtt ?? */
+       /* FIXME - don't we have to free VCMsg and VCAtt ?? */
 }
 
 
@@ -953,7 +957,10 @@ void CheckAuthBasic(ParsedHttpHdrs *hdr)
        StrBufAppendBufPlain(hdr->HR.plainauth, HKEY(":"), 0);
        StrBufAppendBuf(hdr->HR.plainauth, hdr->HR.user_agent, 0);
        hdr->HR.SessionKey = hashlittle(SKEY(hdr->HR.plainauth), 89479832);
-       
+/*
+       lprintf(1, "CheckAuthBasic: calculated sessionkey %ld\n", 
+               hdr->HR.SessionKey);
+*/
 }
 
 void GetAuthBasic(ParsedHttpHdrs *hdr)