--- ./arch/x86_64/kernel/sys_x86_64.c.orig	Fri Jun 13 16:51:32 2003
+++ ./arch/x86_64/kernel/sys_x86_64.c	Wed Oct 29 19:09:46 2003
@@ -108,8 +108,18 @@ unsigned long arch_get_unmapped_area(str
 asmlinkage long sys_uname(struct new_utsname * name)
 {
 	int err;
+	struct new_utsname tmp, *pttmp;
+
 	down_read(&uts_sem);
-	err=copy_to_user(name, &system_utsname, sizeof (*name));
+ 	if (current->s_info) {
+		tmp = system_utsname;
+		strcpy (tmp.nodename, current->s_info->nodename);
+		strcpy (tmp.domainname, current->s_info->domainname);
+		pttmp = &tmp;
+ 	}
+ 	else
+		pttmp = &system_utsname;
+	err=copy_to_user(name, pptmp, sizeof (*name));
 	up_read(&uts_sem);
 	if (personality(current->personality) == PER_LINUX32)
 		err = copy_to_user(name->machine, "i686", 5);