Index: src/cmd/9pserve.c
===================================================================
RCS file: /cvs/plan9/src/cmd/9pserve.c,v
retrieving revision 1.40
diff -u -r1.40 9pserve.c
--- src/cmd/9pserve.c	12 Oct 2007 17:01:00 -0000	1.40
+++ src/cmd/9pserve.c	6 Feb 2008 03:47:36 -0000
@@ -427,7 +427,8 @@
 				}
 				m->tx.afid = xafid;
 				m->tx.aname = xaname;
-				m->tx.uname = getuser();	/* what srv.c used */
+				if((m->tx.uname = getenv("USER")) == nil)
+					m->tx.uname = getuser();	/* what srv.c used */
 				repack(&m->tx, &m->tpkt, c->dotu);
 			}
 			break;
Index: src/cmd/srv.c
===================================================================
RCS file: /cvs/plan9/src/cmd/srv.c,v
retrieving revision 1.6
diff -u -r1.6 srv.c
--- src/cmd/srv.c	12 Oct 2007 17:01:09 -0000	1.6
+++ src/cmd/srv.c	6 Feb 2008 03:47:36 -0000
@@ -136,7 +136,8 @@
 	tx.type = Tauth;
 	tx.tag = 1;
 	tx.afid = afid;
-	tx.uname = getuser();
+	if((tx.uname = getenv("USER")) == nil)
+		tx.uname = getuser();
 	tx.aname = aname;
 	do9p(&tx, &rx);
 	if(rx.type == Rerror){
Index: src/lib9pclient/fs.c
===================================================================
RCS file: /cvs/plan9/src/lib9pclient/fs.c,v
retrieving revision 1.10
diff -u -r1.10 fs.c
--- src/lib9pclient/fs.c	23 Jul 2006 02:55:33 -0000	1.10
+++ src/lib9pclient/fs.c	6 Feb 2008 03:47:40 -0000
@@ -69,14 +69,17 @@
 CFsys*
 fsmount(int fd, char *aname)
 {
+	char *uname;
 	CFsys *fs;
 	CFid *fid;
 
+	if((uname = getenv("USER")) == nil)
+		uname = getuser();
 	fs = fsinit(fd);
 	if(fs == nil)
 		return nil;
 
-	if((fid = fsattach(fs, nil, getuser(), aname)) == nil){
+	if((fid = fsattach(fs, nil, uname, aname)) == nil){
 		_fsunmount(fs);
 		return nil;
 	}
Index: src/lib9pclient/ns.c
===================================================================
RCS file: /cvs/plan9/src/lib9pclient/ns.c,v
retrieving revision 1.4
diff -u -r1.4 ns.c
--- src/lib9pclient/ns.c	13 Jul 2005 10:50:44 -0000	1.4
+++ src/lib9pclient/ns.c	6 Feb 2008 03:47:40 -0000
@@ -38,13 +38,16 @@
 CFsys*
 nsmount(char *name, char *aname)
 {
+	char *uname;
 	CFsys *fs;
 	CFid *fid;
 
+	if((uname = getenv("USER")) == nil)
+		uname = getuser();
 	fs = nsinit(name);
 	if(fs == nil)
 		return nil;
-	if((fid = fsattach(fs, nil, getuser(), aname)) == nil){
+	if((fid = fsattach(fs, nil, uname, aname)) == nil){
 		_fsunmount(fs);
 		return nil;
 	}
Index: src/libauth/fsamount.c
===================================================================
RCS file: /cvs/plan9/src/libauth/fsamount.c,v
retrieving revision 1.1
diff -u -r1.1 fsamount.c
--- src/libauth/fsamount.c	11 Feb 2005 17:01:17 -0000	1.1
+++ src/libauth/fsamount.c	6 Feb 2008 03:47:40 -0000
@@ -8,20 +8,23 @@
 CFsys*
 fsamount(int fd, char *aname)
 {
+	char *uname;
 	CFid *afid, *fid;
 	AuthInfo *ai;
 	CFsys *fs;
 	
+	if((uname = getenv("USER")) == nil)
+		uname = getuser();
 	fs = fsinit(fd);
 	if(fs == nil)
 		return nil;
-	if((afid = fsauth(fs, getuser(), aname)) == nil)
+	if((afid = fsauth(fs, uname, aname)) == nil)
 		goto noauth;
 	ai = fsauth_proxy(afid, amount_getkey, "proto=p9any role=client");
 	if(ai != nil)
 		auth_freeAI(ai);
 noauth:
-	fid = fsattach(fs, afid, getuser(), aname);
+	fid = fsattach(fs, afid, uname, aname);
 	fsclose(afid);
 	if(fid == nil){
 		_fsunmount(fs);
Index: src/libauth/nsamount.c
===================================================================
RCS file: /cvs/plan9/src/libauth/nsamount.c,v
retrieving revision 1.1
diff -u -r1.1 nsamount.c
--- src/libauth/nsamount.c	11 Feb 2005 17:01:18 -0000	1.1
+++ src/libauth/nsamount.c	6 Feb 2008 03:47:40 -0000
@@ -8,20 +8,23 @@
 CFsys*
 nsamount(char *name, char *aname)
 {
+	char *uname;
 	CFid *afid, *fid;
 	AuthInfo *ai;
 	CFsys *fs;
 	
+	if((uname = getenv("USER")) == nil)
+		uname = getuser();
 	fs = nsinit(name);
 	if(fs == nil)
 		return nil;
-	if((afid = fsauth(fs, getuser(), aname)) == nil)
+	if((afid = fsauth(fs, uname, aname)) == nil)
 		goto noauth;
 	ai = fsauth_proxy(afid, amount_getkey, "proto=p9any role=client");
 	if(ai != nil)
 		auth_freeAI(ai);
 noauth:
-	fid = fsattach(fs, afid, getuser(), aname);
+	fid = fsattach(fs, afid, uname, aname);
 	fsclose(afid);
 	if(fid == nil){
 		_fsunmount(fs);