svn commit: samba r9501 - in branches/SAMBA_4_0/swat: .

[tridge at samba.org]

Author: tridge
Date: 2005-08-23 02:12:21 +0000 (Tue, 23 Aug 2005)
New Revision: 9501

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9501

Log:
fixed the SWAT login page for the changes to the userAuth() function that Mimir made
earlier today


Modified:
   branches/SAMBA_4_0/swat/login.esp


Changeset:
Modified: branches/SAMBA_4_0/swat/login.esp
===================================================================
--- branches/SAMBA_4_0/swat/login.esp	2005-08-23 02:11:49 UTC (rev 9500)
+++ branches/SAMBA_4_0/swat/login.esp	2005-08-23 02:12:21 UTC (rev 9501)
@@ -22,13 +22,13 @@
 
 <%
 	if (request.REQUEST_METHOD == "POST") {
-		var authinfo = new Object();
-		authinfo.username = form.Username;
-		authinfo.password = form.Password;
-		authinfo.domain = form.Domain;
-		authinfo.rhost = request['REMOTE_HOST'];
+		var creds = credentials_init();
+		creds.set_username(form.Username);
+		creds.set_password(form.Password);
+		creds.set_domain(form.Domain);
+		creds.set_workstation(request['REMOTE_HOST']);
 
-		auth = userAuth(authinfo);
+		auth = userAuth(creds);
 		if (auth == undefined) {
 			write("<b>Invalid login - please try again<br /></b>\n");
 		} else if (auth.result) {
@@ -37,10 +37,7 @@
 
 			session.authinfo.username = auth.username;
 			session.authinfo.domain = auth.domain;
-			session.authinfo.credentials = credentials_init();
-			session.authinfo.credentials.set_username(authinfo.username);
-			session.authinfo.credentials.set_domain(authinfo.domain);
-			session.authinfo.credentials.set_password(authinfo.password);
+			session.authinfo.credentials = creds;
 			
 			/* if the user was asking for the login page, then now
 			   redirect them to the main page. Otherwise just