summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libexec/login_chpass/login_chpass.c20
-rw-r--r--libexec/login_lchpass/login_lchpass.c8
-rw-r--r--libexec/login_radius/raddauth.c12
-rw-r--r--libexec/login_reject/login_reject.c6
-rw-r--r--libexec/login_skey/login_skey.c8
-rw-r--r--libexec/login_token/token.c11
6 files changed, 32 insertions, 33 deletions
diff --git a/libexec/login_chpass/login_chpass.c b/libexec/login_chpass/login_chpass.c
index 91bcd3d3e77..51328758bb4 100644
--- a/libexec/login_chpass/login_chpass.c
+++ b/libexec/login_chpass/login_chpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_chpass.c,v 1.8 2002/06/02 01:27:15 deraadt Exp $ */
+/* $OpenBSD: login_chpass.c,v 1.9 2002/06/28 01:14:37 deraadt Exp $ */
/*-
* Copyright (c) 1995,1996 Berkeley Software Design, Inc. All rights reserved.
@@ -96,10 +96,10 @@ main(argc, argv)
int argc;
char *argv[];
{
- struct rlimit rl;
- char *username;
- char *instance;
- int c;
+ struct rlimit rl;
+ char *username;
+ char *instance;
+ int c;
rl.rlim_cur = 0;
rl.rlim_max = 0;
@@ -109,7 +109,7 @@ main(argc, argv)
openlog("login", LOG_ODELAY, LOG_AUTH);
- while ((c = getopt(argc, argv, "s:v:")) != -1)
+ while ((c = getopt(argc, argv, "s:v:")) != -1)
switch (c) {
case 'v':
break;
@@ -141,7 +141,7 @@ main(argc, argv)
*instance++ = '\0';
else
instance = "";
-
+
#ifdef KERBEROS
if (krb_get_lrealm(realm, 0) == KSUCCESS)
krb_chpass(username, instance, argv);
@@ -236,7 +236,7 @@ yp_chpass(username)
/* tell rpc.yppasswdd */
yppasswd.newpw.pw_name = pw->pw_name;
- yppasswd.newpw.pw_uid = pw->pw_uid;
+ yppasswd.newpw.pw_uid = pw->pw_uid;
yppasswd.newpw.pw_gid = pw->pw_gid;
yppasswd.newpw.pw_gecos = pw->pw_gecos;
yppasswd.newpw.pw_dir = pw->pw_dir;
@@ -321,7 +321,7 @@ krb_chpass(username, instance, argv)
}
rval = kadm_init_link (PWSERV_NAME, KRB_MASTER, principal.realm);
- if (rval != KADM_SUCCESS)
+ if (rval != KADM_SUCCESS)
com_err(argv[0], rval, "while initializing");
else {
des_cblock newkey;
@@ -347,6 +347,6 @@ krb_chpass(username, instance, argv)
if (rval == 0)
(void)writev(BACK_CHANNEL, iov, 2);
- exit(rval);
+ exit(rval);
}
#endif
diff --git a/libexec/login_lchpass/login_lchpass.c b/libexec/login_lchpass/login_lchpass.c
index a823a703bd1..6c1c6882ea2 100644
--- a/libexec/login_lchpass/login_lchpass.c
+++ b/libexec/login_lchpass/login_lchpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_lchpass.c,v 1.8 2002/06/02 01:27:15 deraadt Exp $ */
+/* $OpenBSD: login_lchpass.c,v 1.9 2002/06/28 01:14:37 deraadt Exp $ */
/*-
* Copyright (c) 1995,1996 Berkeley Software Design, Inc. All rights reserved.
@@ -65,10 +65,10 @@ main(argc, argv)
struct iovec iov[2];
struct passwd *pwd;
char localhost[MAXHOSTNAMELEN];
- char *username = NULL;
+ char *username = NULL;
char *salt;
char *p;
- int c;
+ int c;
struct rlimit rl;
iov[0].iov_base = BI_SILENT;
@@ -87,7 +87,7 @@ main(argc, argv)
if (gethostname(localhost, sizeof(localhost)) < 0)
syslog(LOG_ERR, "couldn't get local hostname: %m");
- while ((c = getopt(argc, argv, "v:s:")) != -1)
+ while ((c = getopt(argc, argv, "v:s:")) != -1)
switch (c) {
case 'v':
break;
diff --git a/libexec/login_radius/raddauth.c b/libexec/login_radius/raddauth.c
index f629c5d71cd..85683b333f4 100644
--- a/libexec/login_radius/raddauth.c
+++ b/libexec/login_radius/raddauth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: raddauth.c,v 1.8 2002/05/22 06:35:44 deraadt Exp $ */
+/* $OpenBSD: raddauth.c,v 1.9 2002/06/28 01:14:37 deraadt Exp $ */
/*-
* Copyright (c) 1996, 1997 Berkeley Software Design, Inc. All rights reserved.
@@ -42,9 +42,9 @@
* Eugene OR 97440-1244 USA
*
* This contains unpublished proprietary source code of tfm associates.
- * The copyright notice above does not evidence any
+ * The copyright notice above does not evidence any
* actual or intended publication of such source code.
- *
+ *
* A license is granted to Berkeley Software Design, Inc. by
* tfm associates to modify and/or redistribute this software under the
* terms and conditions of the software License Agreement provided with this
@@ -352,7 +352,7 @@ rad_request(pid_t id, char *name, char *password, int port, char *vector,
*ptr++ = p * AUTH_VECTOR_LEN + 2;
memset(pass_buf, 0, sizeof(pass_buf)); /* must zero fill */
- strlcpy(pass_buf, password, sizeof(pass_buf));
+ strlcpy(pass_buf, password, sizeof(pass_buf));
/* Calculate the md5 digest */
secretlen = strlen(auth_secret);
@@ -469,7 +469,7 @@ get_ipaddr(char *host)
struct hostent *hp;
if ((hp = gethostbyname(host)) == NULL)
- return (0);
+ return (0);
return (((struct in_addr *)hp->h_addr)->s_addr);
}
@@ -480,7 +480,7 @@ get_ipaddr(char *host)
void
getsecret(void)
{
- FILE *servfd;
+ FILE *servfd;
char *host, *secret, buffer[MAXPATHLEN];
size_t len;
diff --git a/libexec/login_reject/login_reject.c b/libexec/login_reject/login_reject.c
index 5d321f0116f..26d32053eea 100644
--- a/libexec/login_reject/login_reject.c
+++ b/libexec/login_reject/login_reject.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_reject.c,v 1.4 2002/06/02 01:27:15 deraadt Exp $ */
+/* $OpenBSD: login_reject.c,v 1.5 2002/06/28 01:14:37 deraadt Exp $ */
/*-
* Copyright (c) 1995 Berkeley Software Design, Inc. All rights reserved.
@@ -59,7 +59,7 @@ main(argc, argv)
{
FILE *back;
char passbuf[1];
- int c;
+ int c;
struct rlimit rl;
int mode = 0;
@@ -71,7 +71,7 @@ main(argc, argv)
openlog("login", LOG_ODELAY, LOG_AUTH);
- while ((c = getopt(argc, argv, "v:s:")) != -1)
+ while ((c = getopt(argc, argv, "v:s:")) != -1)
switch (c) {
case 'v':
break;
diff --git a/libexec/login_skey/login_skey.c b/libexec/login_skey/login_skey.c
index 49505c5caf8..c76690fd9cb 100644
--- a/libexec/login_skey/login_skey.c
+++ b/libexec/login_skey/login_skey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_skey.c,v 1.9 2002/06/02 01:27:15 deraadt Exp $ */
+/* $OpenBSD: login_skey.c,v 1.10 2002/06/28 01:14:37 deraadt Exp $ */
/*-
* Copyright (c) 1995 Berkeley Software Design, Inc. All rights reserved.
@@ -69,8 +69,8 @@ main(argc, argv)
char **argv;
{
FILE *back = NULL;
- char *class = 0;
- char *username = 0;
+ char *class = 0;
+ char *username = 0;
char skeyprompt[SKEY_MAX_CHALLENGE+17];
char passbuf[SKEY_MAX_PW_LEN+1];
int c, haskey;
@@ -86,7 +86,7 @@ main(argc, argv)
openlog(NULL, LOG_ODELAY, LOG_AUTH);
- while ((c = getopt(argc, argv, "ds:v:")) != -1)
+ while ((c = getopt(argc, argv, "ds:v:")) != -1)
switch (c) {
case 'd': /* to remain undocumented */
back = stdout;
diff --git a/libexec/login_token/token.c b/libexec/login_token/token.c
index 41c002d60d1..c01af1ce4e0 100644
--- a/libexec/login_token/token.c
+++ b/libexec/login_token/token.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: token.c,v 1.6 2001/08/18 18:31:21 deraadt Exp $ */
+/* $OpenBSD: token.c,v 1.7 2002/06/28 01:14:37 deraadt Exp $ */
/*-
* Copyright (c) 1995 Migration Associates Corp. All Rights Reserved
@@ -115,16 +115,16 @@ tokenchallenge(char *user, char *challenge, int size, char *card_type)
tokendb_getrec(user, &tr) == 0 &&
(tr.mode & TOKEN_RIM)) {
c = 0;
- while ((r = tokendb_lockrec(user, &tr, TOKEN_LOCKED)) == 1) {
+ while ((r = tokendb_lockrec(user, &tr, TOKEN_LOCKED)) == 1) {
if (c++ >= 60)
break;
- sleep(1);
+ sleep(1);
}
tr.flags &= ~TOKEN_LOCKED;
if (r == 0 && tr.rim[0]) {
h2cb(tr.secret, &cb);
des_fixup_key_parity(&cb.cb);
- des_key_sched(&cb.cb, ks);
+ des_key_sched(&cb.cb, ks);
des_ecb_encrypt(&tr.rim, &cb.cb, ks, DES_ENCRYPT);
memcpy(tr.rim, cb.cb, 8);
for (r = 0; r < 8; ++r) {
@@ -311,8 +311,7 @@ tokenuserinit(int flags, char *username, unsigned char *usecret, unsigned mode)
printf("Shared secret for %s\'s token: "
"%03o %03o %03o %03o %03o %03o %03o %03o\n",
username, secret.cb[0], secret.cb[1], secret.cb[2], secret.cb[3],
- secret.cb[4], secret.cb[5], secret.cb[6], secret.cb[7]);
-
+ secret.cb[4], secret.cb[5], secret.cb[6], secret.cb[7]);
des_key_sched(&secret.cb, key_schedule);
memset(&secret.ct, 0, sizeof(secret));
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-06 18:55:09 +0000