tuse fixed name - plan9port - [fork] Plan 9 from user space
(HTM) git clone git://src.adamsgaard.dk/plan9port
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit e3331bf21b87f735e265390322eac148a44d9036
(DIR) parent 8c0613150ef8372743ee86f6a552e374c103f704
(HTM) Author: rsc <devnull@localhost>
Date: Fri, 18 Mar 2005 19:34:22 +0000
use fixed name
Diffstat:
M src/cmd/auth/ssh-agent.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
---
(DIR) diff --git a/src/cmd/auth/ssh-agent.c b/src/cmd/auth/ssh-agent.c
t@@ -93,7 +93,7 @@ void
threadmain(int argc, char **argv)
{
int fd, pid, export, dotextlist;
- char dir[100];
+ char dir[100], *ns;
char sock[200], addr[200];
uvlong x;
t@@ -129,13 +129,17 @@ threadmain(int argc, char **argv)
if(dotextlist)
listkeystext();
- x = ((uvlong)fastrand()<<32) | fastrand();
- x ^= ((uvlong)fastrand()<<32) | fastrand();
- snprint(dir, sizeof dir, "/tmp/ssh-%llux", x);
- if((fd = create(dir, OREAD, DMDIR|0700)) < 0)
- sysfatal("mkdir %s: %r", dir);
- close(fd);
- snprint(sock, sizeof sock, "%s/agent.%d", dir, pid);
+ ns = getns();
+ snprint(sock, sizeof sock, "%s/ssh-agent.socket", ns);
+ if(0){
+ x = ((uvlong)fastrand()<<32) | fastrand();
+ x ^= ((uvlong)fastrand()<<32) | fastrand();
+ snprint(dir, sizeof dir, "/tmp/ssh-%llux", x);
+ if((fd = create(dir, OREAD, DMDIR|0700)) < 0)
+ sysfatal("mkdir %s: %r", dir);
+ close(fd);
+ snprint(sock, sizeof sock, "%s/agent.%d", dir, pid);
+ }
snprint(addr, sizeof addr, "unix!%s", sock);
if((afd = announce(addr, adir)) < 0)