code: drawterm

Info  •  Files  •  Log

merge

--- a/cpu.c

+++ b/cpu.c

@@ -152,11 +152,7 @@

 	user = getenv("USER");

 	secstoreserver = nil;

 	authserver = getenv("auth");

-	if(authserver == nil)

-		authserver = "auth";

 	system = getenv("cpu");

-	if(system == nil)

-		system = "cpu";

 	ARGBEGIN{

 	case 'a':

 		authserver = EARGF(usage());

@@ -200,8 +196,14 @@

 	if(argc != 0)

 		usage();

+	if(system == nil)

+		system = readcons("cpuserver", "cpu", 0);

+

 	if(user == nil)

-		user = readcons("user", nil, 0);

+		user = readcons("user", "glenda", 0);

+

+	if(authserver == nil)

+		authserver = readcons("authserver", system, 0);

 	if(mountfactotum() < 0){

 		if(secstoreserver == nil)