commit 1f8a80722f44d9c24c4a48d21a944947c9a34b96 from: rsc date: Tue Mar 15 16:11:47 2005 UTC appease sun commit - b3e7c02689557df3c65103a87ac3458ee003422f commit + 1f8a80722f44d9c24c4a48d21a944947c9a34b96 blob - 862993f9a5d0ba879789de766123e5c1bda715e9 blob + a39abff5facc674ff75e346bc1155a8f52036eb5 --- src/cmd/auth/factotum/conv.c +++ src/cmd/auth/factotum/conv.c @@ -192,12 +192,9 @@ convwrite(Conv *c, void *data, int count) { Rpc *r; - for(;;){ - r = convgetrpc(c, RpcRead); - if(r == nil) - return -1; - break; - } + r = convgetrpc(c, RpcRead); + if(r == nil) + return -1; rpcrespondn(c, "ok", data, count); return 0; } blob - 70815a562ab159fae2f93c576744539f343803a7 blob + 4f05b6d65b55b3f694feaf29793f04b31f80cdd0 --- src/cmd/auth/factotum/httpdigest.c +++ src/cmd/auth/factotum/httpdigest.c @@ -114,6 +114,6 @@ Proto httpdigest = "httpdigest", hdroles, "user? realm? !password?", - nil, - nil + 0, + 0 }; blob - 9c6c73413acffa45783703f3e6fc132e40f3abbe blob + 453045ce820b9b98e3daf8539f62619d65dec2c6 --- src/cmd/auth/factotum/pass.c +++ src/cmd/auth/factotum/pass.c @@ -37,5 +37,5 @@ Proto pass = passroles, "user? !password?", nil, - nil, + nil }; blob - 943ea67bf9ec8de416a8e20ed38c5394a002678c blob + a865810dade08114e72307ddf12368791323f5ce --- src/cmd/auth/factotum/rsa.c +++ src/cmd/auth/factotum/rsa.c @@ -62,7 +62,7 @@ xrsadecrypt(Conv *c) } /* encrypt/decrypt */ - m = betomp(txt, n, nil); + m = betomp((uchar*)txt, n, nil); if(m == nil) goto out; if(strcmp(role, "decrypt") == 0) @@ -71,7 +71,7 @@ xrsadecrypt(Conv *c) mm = rsaencrypt(&key->pub, m, nil); if(mm == nil) goto out; - n = mptobe(mm, buf, sizeof buf, nil); + n = mptobe(mm, (uchar*)buf, sizeof buf, nil); /* send response */ c->state = "write";