fiddle

Russ Cox committed 21 years ago

Commit 64b62a31 parent ad9a4044 files · +13 −23Browse files

Unified · Split

4 files

cpu.c+10−18

@@ -99,7 +99,7 @@ mountfactotum(void) · 98 unmodified lines
99	99	void
100	100	cpumain(int argc, char **argv)
101	101	{
102		− char dat[MaxStr], buf[MaxStr], cmd[MaxStr], p, err, secstoreserver, s;
	102	+ char dat[MaxStr], buf[MaxStr], cmd[MaxStr], err, secstoreserver, *s;
103	103	int fd, ms, data;
104	104
105	105	/* see if we should use a larger message size */
@@ -115,6 +115,12 @@ cpumain(int argc, char **argv) · 9 unmodified lines
115	115	if(user == nil)
116	116	user = readcons("user", nil, 0);
117	117	secstoreserver = nil;
	118	+ authserver = getenv("auth");
	119	+ if(authserver == nil)
	120	+ authserver = "auth";
	121	+ system = getenv("cpu");
	122	+ if(system == nil)
	123	+ system = "cpu";
118	124	ARGBEGIN{
119	125	case 'a':
120	126	authserver = EARGF(usage());
@@ -154,6 +160,9 @@ cpumain(int argc, char **argv) · 33 unmodified lines
154	160	usage();
155	161	}ARGEND;
156	162
	163	+ if(argc != 0)
	164	+ usage();
	165	+
157	166	if(mountfactotum() < 0){
158	167	if(secstoreserver == nil)
159	168	secstoreserver = authserver;
@@ -167,23 +176,6 @@ cpumain(int argc, char **argv) · 7 unmodified lines
167	176	}
168	177	}
169	178
170		− if(argc != 0)
171		− usage();
172		−
173		− if(system == nil) {
174		− p = getenv("cpu");
175		− if(p == 0)
176		− fatal(0, "set $cpu");
177		− system = p;
178		− }
179		−
180		− if(authserver == nil) {
181		− p = getenv("auth");
182		− if(p == 0)
183		− fatal(0, "set $auth");
184		− authserver = p;
185		− }
186		−
187	179	if((err = rexcall(&data, system, srvname)))
188	180	fatal(1, "%s: %s", err, system);
189	181

@@ -2,7 +2,7 @@ extern int havesecstore(char addr, char owner); · 1 unmodified line
2	2	extern char *secstore;
3	3	extern char secstorebuf[65536];
4	4	extern char secstorefetch(char addr, char owner, char passwd);
5		−extern char *authaddr;
	5	+extern char *authserver;
6	6	extern char readcons(char prompt, char *def, int secret);
7	7	extern int exportfs(int, int);
8	8	extern char *user;

@@ -41,9 +41,9 @@ secdial(char *secstore) · 40 unmodified lines
41	41	* like il!host or tcp!host or host.
42	42	*/
43	43	if(strcmp(p, "$auth")==0){
44		− if(authaddr == nil)
	44	+ if(authserver == nil)
45	45	return -1;
46		− strecpy(buf, buf+sizeof buf, authaddr);
	46	+ strecpy(buf, buf+sizeof buf, authserver);
47	47	nf = getfields(buf, f, nelem(f), 0, "!");
48	48	switch(nf){
49	49	default:

Keyboard shortcuts