From ce94dbe662155bd60d6839b5e8c82ad708667bcd Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Sun, 13 Feb 2005 18:04:00 +0000
Subject: add ssh-agent via factotum

---
 src/cmd/auth/secstore/secstore.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/cmd/auth/secstore')

diff --git a/src/cmd/auth/secstore/secstore.c b/src/cmd/auth/secstore/secstore.c
index 864aa88d..cb6e585e 100644
--- a/src/cmd/auth/secstore/secstore.c
+++ b/src/cmd/auth/secstore/secstore.c
@@ -494,7 +494,9 @@ main(int argc, char **argv)
 	char *serve, *tcpserve, *user;
 	AuthConn *c;
 
-	serve = "$auth";
+	serve = getenv("secstore");
+	if(serve == nil)
+		serve = "secstore";
 	user = getuser();
 	memset(Gflag, 0, sizeof Gflag);
 	fmtinstall('B', mpfmt);
@@ -559,14 +561,8 @@ main(int argc, char **argv)
 		exits("usage");
 	}
 
-	rc = strlen(serve)+sizeof("tcp!!99990");
-	tcpserve = emalloc(rc);
-	if(strchr(serve,'!'))
-		strcpy(tcpserve, serve);
-	else
-		snprint(tcpserve, rc, "tcp!%s!5356", serve);
+	tcpserve = netmkaddr(serve, "tcp", "secstore");
 	c = login(user, tcpserve, pass_stdin, pass_nvram);
-	free(tcpserve);
 	if(c == nil){
 		fprint(2, "secstore authentication failed\n");
 		exits("secstore authentication failed");
-- 
cgit v1.2.3