diff options
author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
---|---|---|
committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
commit | 02d7aa8915f9c3a3288dab01f321eb94ba219e3b (patch) | |
tree | f053238978479e408a2b83571443e132f30586ab /src/libauthsrv | |
parent | c0c9d8f883dfd3a7f5a74499d91bb95884b15873 (diff) | |
parent | 3d1382b98a502d0c34d5ba2c462396acc515016e (diff) | |
download | plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.gz plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.bz2 plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/libauthsrv')
-rw-r--r-- | src/libauthsrv/convM2T.c | 1 | ||||
-rw-r--r-- | src/libauthsrv/convPR2M.c | 1 | ||||
-rw-r--r-- | src/libauthsrv/convTR2M.c | 1 | ||||
-rw-r--r-- | src/libauthsrv/readnvram.c | 5 |
4 files changed, 2 insertions, 6 deletions
diff --git a/src/libauthsrv/convM2T.c b/src/libauthsrv/convM2T.c index 372825a8..427520a5 100644 --- a/src/libauthsrv/convM2T.c +++ b/src/libauthsrv/convM2T.c @@ -25,4 +25,3 @@ convM2T(char *ap, Ticket *f, char *key) STRING(key, DESKEYLEN); USED(p); } - diff --git a/src/libauthsrv/convPR2M.c b/src/libauthsrv/convPR2M.c index 8b2422f1..7efc0b2d 100644 --- a/src/libauthsrv/convPR2M.c +++ b/src/libauthsrv/convPR2M.c @@ -25,4 +25,3 @@ convPR2M(Passwordreq *f, char *ap, char *key) encrypt(key, ap, n); return n; } - diff --git a/src/libauthsrv/convTR2M.c b/src/libauthsrv/convTR2M.c index 3a7610a7..04000aad 100644 --- a/src/libauthsrv/convTR2M.c +++ b/src/libauthsrv/convTR2M.c @@ -24,4 +24,3 @@ convTR2M(Ticketreq *f, char *ap) n = p - (uchar*)ap; return n; } - diff --git a/src/libauthsrv/readnvram.c b/src/libauthsrv/readnvram.c index f65db984..337203f7 100644 --- a/src/libauthsrv/readnvram.c +++ b/src/libauthsrv/readnvram.c @@ -45,7 +45,7 @@ static char* xreadcons(char *prompt, char *def, int secret, char *buf, int nbuf) { char *p; - + p = readcons(prompt, def, secret); if(p == nil) return nil; @@ -280,7 +280,7 @@ finddosfile(int fd, char *file) if(rootsects <= 0 || rootsects > 64) return -1; - /* + /* * read root. it is contiguous to make stuff like * this easier */ @@ -305,4 +305,3 @@ finddosfile(int fd, char *file) */ return rootoff + rootsects*sectsize + (n-2)*sectsize*b->clustsize; } - |