swat fixes from 2.0 branch

this cnludes updates to the status page for levelII oplocks. Once we
decide if the levelII code goes into 2.0.5 we will work out if this
stays

2 files changed, 9 insertions, 7 deletions

diff --git a/source/web/statuspage.c b/source/web/statuspage.c
index e8068f6b246..724ca8c1adf 100644
--- a/source/web/statuspage.c
+++ b/source/web/statuspage.c
@@ -32,7 +32,7 @@ static char *tstring(time_t t)
 
 static void print_share_mode(share_mode_entry *e, char *fname)
 {
-	printf("<tr><td>%d</td>",e->pid);
+	printf("<tr><td>%d</td>",(int)e->pid);
 	printf("<td>");
 	switch ((e->share_mode>>4)&0xF) {
 	case DENY_NONE: printf("DENY_NONE"); break;
@@ -60,12 +60,14 @@ static void print_share_mode(share_mode_entry *e, char *fname)
 		printf("EXCLUSIVE       ");
 	else if (e->op_type & BATCH_OPLOCK)
 		printf("BATCH           ");
+	else if (e->op_type & LEVEL_II_OPLOCK)
+		printf("LEVEL_II        ");
 	else
 		printf("NONE            ");
 	printf("</td>");
 
 	printf("<td>%s</td><td>%s</td></tr>\n",
-	       fname,tstring(e->time.tv_sec));
+	       dos_to_unix(fname,False),tstring(e->time.tv_sec));
 }
 
 
@@ -131,7 +133,7 @@ void status_page(void)
 			if (crec.magic == 0x280267 && crec.cnum == -1 &&
 			    process_exists(crec.pid)) {
 				char buf[30];
-				slprintf(buf,sizeof(buf)-1,"kill_%d", crec.pid);
+				slprintf(buf,sizeof(buf)-1,"kill_%d", (int)crec.pid);
 				if (cgi_variable(buf)) {
 					kill_pid(crec.pid);
 				}
@@ -211,12 +213,12 @@ void status_page(void)
 		    crec.cnum == -1 &&
 		    process_exists(crec.pid)) {
 			printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td>\n",
-			       crec.pid,
+			       (int)crec.pid,
 			       crec.machine,crec.addr,
 			       tstring(crec.start));
 			if (geteuid() == 0) {
 			    printf("<td><input type=submit value=\"X\" name=\"kill_%d\"></td>\n",
-			       crec.pid);
+			       (int)crec.pid);
 			}
 			printf("</tr>\n");
 		}
@@ -237,7 +239,7 @@ void status_page(void)
 		if (crec.magic == 0x280267 && process_exists(crec.pid)) {
 			printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td></tr>\n",
 			       crec.name,uidtoname(crec.uid),
-			       gidtoname(crec.gid),crec.pid,
+			       gidtoname(crec.gid),(int)crec.pid,
 			       crec.machine,
 			       tstring(crec.start));
 		}
diff --git a/source/web/swat.c b/source/web/swat.c
index 44cbdf66e46..94c05668558 100644
--- a/source/web/swat.c
+++ b/source/web/swat.c
@@ -798,7 +798,7 @@ static void passwd_page(void)
 	printf("<tr><td> Re-type New Password : </td>\n");
 	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
 	printf("<tr><td> Remote Machine : </td>\n");
-	printf("<td><input type=password size=30 name=%s></td></tr>\n",RHOST);
+	printf("<td><input type=text size=30 name=%s></td></tr>\n",RHOST);
 
 	printf("</table>");