--- samba-3.0.0/source/param/loadparm.c.userpidlockfiles	2004-01-12 11:25:20.000000000 -0800
+++ samba-3.0.0/source/param/loadparm.c	2004-01-12 11:28:52.000000000 -0800
@@ -3969,6 +3969,19 @@
 		lp_add_ipc("ADMIN$", False);
 	}
 
+	/* Data stores need to be per-user. */
+	if(getuid()) {
+		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);
+	}
+
 	set_server_role();
 	set_default_server_announce_type();
 	set_allowed_client_auth();