--- samba-3.0.0/source/param/loadparm.c.nouser	2004-01-09 17:06:57.000000000 -0800
+++ samba-3.0.0/source/param/loadparm.c	2004-01-09 17:04:42.000000000 -0800
@@ -1341,8 +1341,20 @@
 	
 	string_set(&Globals.szPasswdProgram, "");
 	string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
-	string_set(&Globals.szPidDir, dyn_PIDDIR);
-	string_set(&Globals.szLockDir, dyn_LOCKDIR);
+	if(!getuid()) {
+		string_set(&Globals.szPidDir, dyn_PIDDIR);
+		string_set(&Globals.szLockDir, dyn_LOCKDIR);
+	} else {
+		char *user, *td;
+
+		user = getenv("USER");
+		asprintf(&td, "/tmp/samba-piddir-%s", user);
+		string_set(&Globals.szPidDir, td);
+		free(td);
+		asprintf(&td, "/tmp/samba-lockdir-%s", user);
+		string_set(&Globals.szLockDir, td);
+		free(td);
+	}
 	string_set(&Globals.szSocketAddress, "0.0.0.0");
 	pstrcpy(s, "Samba ");
 	pstrcat(s, SAMBA_VERSION_STRING);