o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mailfs: add -u user argument

Browse source 
R=rsc
CC=plan9port.codebot
http://codereview.appspot.com/5435052
This commit is contained in:
David du Colombier 2011-11-28 09:21:01 -05:00 • committed by Russ Cox
parent 2fc68b6d8e
commit 0c9524b721
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/cmd/upas/nfs/imap.c
View file

@ -18,6 +18,7 @@ struct Imap
int ticks; /* until boom! */ int ticks; /* until boom! */
char* server; char* server;
char* root; char* root;
char* user;
int mode; int mode;
int fd; int fd;
Biobuf b; Biobuf b;
@ -91,7 +92,7 @@ static Sx* zBrdsx(Imap*);
*/ */
Imap* Imap*
imapconnect(char *server, int mode, char *root) imapconnect(char *server, int mode, char *root, char *user)
{ {
Imap *z; Imap *z;
@ -101,6 +102,7 @@ imapconnect(char *server, int mode, char *root)
z = emalloc(sizeof *z); z = emalloc(sizeof *z);
z->server = estrdup(server); z->server = estrdup(server);
z->mode = mode; z->mode = mode;
z->user = user;
if(root) if(root)
if(root[0] != 0 && root[strlen(root)-1] != '/') if(root[0] != 0 && root[strlen(root)-1] != '/')
z->root = smprint("%s/", root); z->root = smprint("%s/", root);
@ -200,7 +202,11 @@ imaplogin(Imap *z)
Sx *sx; Sx *sx;
UserPasswd *up; UserPasswd *up;
if((up = auth_getuserpasswd(auth_getkey, "proto=pass role=client service=imap server=%q", z->server)) == nil){ if(z->user != nil)
up = auth_getuserpasswd(auth_getkey, "proto=pass role=client service=imap server=%q user=%q", z->server, z->user);
else
up = auth_getuserpasswd(auth_getkey, "proto=pass role=client service=imap server=%q", z->server);
if(up == nil){
werrstr("getuserpasswd - %r"); werrstr("getuserpasswd - %r");
return -1; return -1;
} }

2
src/cmd/upas/nfs/imap.h
View file

@ -2,7 +2,7 @@ typedef struct Imap Imap;
#pragma incomplete Imap #pragma incomplete Imap
void imapcheckbox(Imap *z, Box *b); void imapcheckbox(Imap *z, Box *b);
Imap* imapconnect(char *server, int mode, char *root); Imap* imapconnect(char *server, int mode, char *root, char *user);
int imapcopylist(Imap *z, char *nbox, Msg **m, uint nm); int imapcopylist(Imap *z, char *nbox, Msg **m, uint nm);
void imapfetchraw(Imap *z, Part *p); void imapfetchraw(Imap *z, Part *p);
void imapfetchrawbody(Imap *z, Part *p); void imapfetchrawbody(Imap *z, Part *p);

10
src/cmd/upas/nfs/main.c
View file

@ -22,14 +22,14 @@ Imap *imap;
void void
usage(void) usage(void)
{ {
fprint(2, "usage: mailfs [-DVtx] [-m mtpt] [-s srvname] [-r root] server\n"); fprint(2, "usage: mailfs [-DVtx] [-m mtpt] [-s srvname] [-r root] [-u user] server\n");
threadexitsall("usage"); threadexitsall("usage");
} }
void void
threadmain(int argc, char **argv) threadmain(int argc, char **argv)
{ {
char *server, *srvname, *root; char *server, *srvname, *root, *user;
int mode; int mode;
char *mtpt; char *mtpt;
@ -37,6 +37,7 @@ threadmain(int argc, char **argv)
root = ""; root = "";
mode = Unencrypted; mode = Unencrypted;
mtpt = nil; mtpt = nil;
user = nil;
ARGBEGIN{ ARGBEGIN{
default: default:
usage(); usage();
@ -55,6 +56,9 @@ threadmain(int argc, char **argv)
case 't': case 't':
mode = Tls; mode = Tls;
break; break;
case 'u':
user = EARGF(usage());
break;
case 'x': case 'x':
mode = Cmd; mode = Cmd;
break; break;
@ -74,7 +78,7 @@ threadmain(int argc, char **argv)
boxinit(); boxinit();
fsinit0(); fsinit0();
if((imap = imapconnect(server, mode, root)) == nil) if((imap = imapconnect(server, mode, root, user)) == nil)
sysfatal("imapconnect: %r"); sysfatal("imapconnect: %r");
threadpostmountsrv(&fs, srvname, mtpt, 0); threadpostmountsrv(&fs, srvname, mtpt, 0);
} }