summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libexec/login_krb4/login_krb4.c22
-rw-r--r--libexec/login_krb5/login_krb5.c40
-rw-r--r--libexec/login_passwd/login_passwd.c12
3 files changed, 37 insertions, 37 deletions
diff --git a/libexec/login_krb4/login_krb4.c b/libexec/login_krb4/login_krb4.c
index 2e222bae2ad..63277a8ba08 100644
--- a/libexec/login_krb4/login_krb4.c
+++ b/libexec/login_krb4/login_krb4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_krb4.c,v 1.2 2001/06/26 05:03:26 hin Exp $ */
+/* $OpenBSD: login_krb4.c,v 1.3 2001/08/12 21:55:46 millert Exp $ */
/*-
* Copyright (c) 2001 Hans Insulander <hin@openbsd.org>.
@@ -42,26 +42,26 @@ krb4_login(char *username, char *password, char *invokinguser, int new_tickets)
int fd;
/* Check if we can open the srvtab file */
- if((fd = open(KEYFILE, O_RDONLY, 0400)) < 0)
- return AUTH_FAILED;
+ if ((fd = open(KEYFILE, O_RDONLY, 0400)) < 0)
+ return (AUTH_FAILED);
close(fd);
pwd = getpwnam(username);
tkfile[0] = '\0';
targetuser = username;
- if(krb_get_lrealm(realm, 1)){
+ if (krb_get_lrealm(realm, 1)){
syslog(LOG_INFO, "krb_get_lrealm failed");
}
- if(new_tickets) {
+ if (new_tickets) {
snprintf(tkfile, sizeof(tkfile), "%s%d", TKT_ROOT,
pwd ? pwd->pw_uid : getuid());
krb_set_tkt_string(tkfile);
unlink(tkfile);
}
- if(strcmp(username, "root") == 0) {
+ if (strcmp(username, "root") == 0) {
instance = "root";
username = invokinguser;
} else
@@ -78,16 +78,16 @@ krb4_login(char *username, char *password, char *invokinguser, int new_tickets)
setuid(geteuid());
ret = krb_verify_user(username, instance , realm, password, 1, "rcmd");
- if(new_tickets && pwd)
+ if (new_tickets && pwd)
chown(tkfile, pwd->pw_uid, pwd->pw_gid);
- if(ret == KSUCCESS &&
+ if (ret == KSUCCESS &&
krb_kuserok(username, instance, realm, targetuser) == 0) {
fprintf(back, BI_AUTH "\n");
- if(strlen(tkfile) > 0)
+ if (strlen(tkfile) > 0)
fprintf(back, BI_SETENV " KRBTKFILE %s\n", tkfile);
- return AUTH_OK;
+ return (AUTH_OK);
}
unlink(tkfile);
- return AUTH_FAILED;
+ return (AUTH_FAILED);
}
diff --git a/libexec/login_krb5/login_krb5.c b/libexec/login_krb5/login_krb5.c
index e4437dcd26c..1ae9199b6ee 100644
--- a/libexec/login_krb5/login_krb5.c
+++ b/libexec/login_krb5/login_krb5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_krb5.c,v 1.11 2001/06/26 05:03:27 hin Exp $ */
+/* $OpenBSD: login_krb5.c,v 1.12 2001/08/12 21:55:46 millert Exp $ */
/*-
* Copyright (c) 2001 Hans Insulander <hin@openbsd.org>.
@@ -57,16 +57,16 @@ store_tickets(struct passwd *pwd, int ticket_newfiles, int ticket_store,
int get_krb4_ticket = 0;
char krb4_ticket_file[MAXPATHLEN];
- if(ticket_newfiles)
+ if (ticket_newfiles)
snprintf(cc_file, sizeof(cc_file), "FILE:/tmp/krb5cc_%d",
pwd->pw_uid);
else
snprintf(cc_file, sizeof(cc_file),"%s",
krb5_cc_default_name(context));
- if(ticket_store) {
+ if (ticket_store) {
ret = krb5_cc_resolve(context, cc_file, &ccache_store);
- if(ret != 0) {
+ if (ret != 0) {
krb5_syslog(context, LOG_ERR, ret,
"krb5_cc_gen_new");
exit(1);
@@ -74,7 +74,7 @@ store_tickets(struct passwd *pwd, int ticket_newfiles, int ticket_store,
ret = krb5_cc_copy_cache(context, ccache,
ccache_store);
- if(ret != 0) {
+ if (ret != 0) {
krb5_syslog(context, LOG_ERR, ret,
"krb5_cc_copy_cache");
}
@@ -93,13 +93,13 @@ store_tickets(struct passwd *pwd, int ticket_newfiles, int ticket_store,
"libdefaults",
"krb4_get_tickets",
NULL);
- if(get_krb4_ticket) {
+ if (get_krb4_ticket) {
CREDENTIALS c;
krb5_creds cred;
krb5_cc_cursor cursor;
ret = krb5_cc_start_seq_get(context, ccache, &cursor);
- if(ret != 0) {
+ if (ret != 0) {
krb5_syslog(context, LOG_ERR, ret,
"start seq");
exit(1);
@@ -107,7 +107,7 @@ store_tickets(struct passwd *pwd, int ticket_newfiles, int ticket_store,
ret = krb5_cc_next_cred(context, ccache,
&cursor, &cred);
- if(ret != 0) {
+ if (ret != 0) {
krb5_syslog(context, LOG_ERR, ret,
"next cred");
exit(1);
@@ -115,7 +115,7 @@ store_tickets(struct passwd *pwd, int ticket_newfiles, int ticket_store,
ret = krb5_cc_end_seq_get(context, ccache,
&cursor);
- if(ret != 0) {
+ if (ret != 0) {
krb5_syslog(context, LOG_ERR, ret,
"end seq");
exit(1);
@@ -123,7 +123,7 @@ store_tickets(struct passwd *pwd, int ticket_newfiles, int ticket_store,
ret = krb524_convert_creds_kdc(context, ccache,
&cred, &c);
- if(ret != 0) {
+ if (ret != 0) {
krb5_syslog(context, LOG_ERR, ret,
"convert");
} else {
@@ -141,7 +141,7 @@ store_tickets(struct passwd *pwd, int ticket_newfiles, int ticket_store,
/* Need to chown the ticket file */
#ifdef KRB524
- if(get_krb4_ticket)
+ if (get_krb4_ticket)
fprintf(back, BI_SETENV " KRBTKFILE %s\n",
krb4_ticket_file);
#endif
@@ -152,22 +152,22 @@ krb5_login(char *username, char *invokinguser, char *password, int login, int ti
{
int return_code = AUTH_FAILED;
- if(username == NULL || password == NULL)
- return AUTH_FAILED;
+ if (username == NULL || password == NULL)
+ return (AUTH_FAILED);
ret = krb5_init_context(&context);
- if(ret != 0) {
+ if (ret != 0) {
krb5_syslog(context, LOG_ERR, ret, "krb5_init_context");
exit(1);
}
ret = krb5_cc_gen_new(context, &krb5_mcc_ops, &ccache);
- if(ret != 0) {
+ if (ret != 0) {
krb5_syslog(context, LOG_ERR, ret, "krb5_cc_gen_new");
exit(1);
}
- if(strcmp(username, "root") == 0) {
+ if (strcmp(username, "root") == 0) {
char *tmp;
tmp = malloc(strlen(invokinguser)+6);
sprintf(tmp, "%s/root", invokinguser);
@@ -175,7 +175,7 @@ krb5_login(char *username, char *invokinguser, char *password, int login, int ti
free(tmp);
} else
ret = krb5_parse_name(context, username, &princ);
- if(ret != 0) {
+ if (ret != 0) {
krb5_syslog(context, LOG_ERR, ret, "krb5_parse_name");
exit(1);
}
@@ -190,10 +190,10 @@ krb5_login(char *username, char *invokinguser, char *password, int login, int ti
struct passwd *pwd;
pwd = getpwnam(username);
- if(pwd == NULL) {
+ if (pwd == NULL) {
krb5_syslog(context, LOG_ERR, ret,
"%s: no such user", username);
- return AUTH_FAILED;
+ return (AUTH_FAILED);
}
fprintf(back, BI_AUTH "\n");
@@ -215,5 +215,5 @@ krb5_login(char *username, char *invokinguser, char *password, int login, int ti
krb5_free_principal(context, princ);
krb5_cc_close(context, ccache);
- return return_code;
+ return (return_code);
}
diff --git a/libexec/login_passwd/login_passwd.c b/libexec/login_passwd/login_passwd.c
index b10d2a3986f..7f393ed597a 100644
--- a/libexec/login_passwd/login_passwd.c
+++ b/libexec/login_passwd/login_passwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_passwd.c,v 1.4 2001/06/29 05:56:36 deraadt Exp $ */
+/* $OpenBSD: login_passwd.c,v 1.5 2001/08/12 21:55:46 millert Exp $ */
/*-
* Copyright (c) 2001 Hans Insulander <hin@openbsd.org>.
@@ -39,7 +39,7 @@ pwd_login(char *username, char *password, char *wheel, int lastchance,
fprintf(back, BI_VALUE " errormsg %s\n",
auth_mkvalue("you are not in group wheel"));
fprintf(back, BI_REJECT "\n");
- return AUTH_FAILED;
+ return (AUTH_FAILED);
}
pwd = getpwnam(username);
@@ -47,7 +47,7 @@ pwd_login(char *username, char *password, char *wheel, int lastchance,
/* Check for empty password */
if (pwd != NULL && *pwd->pw_passwd == '\0') {
fprintf(back, BI_AUTH "\n");
- return AUTH_OK;
+ return (AUTH_OK);
}
if (pwd)
@@ -60,12 +60,12 @@ pwd_login(char *username, char *password, char *wheel, int lastchance,
salt = crypt(password, salt);
memset(password, 0, strlen(password));
if (!pwd || strcmp(salt, pwd->pw_passwd) != 0)
- return AUTH_FAILED;
+ return (AUTH_FAILED);
if (login_check_expire(back, pwd, class, lastchance) == 0)
fprintf(back, BI_AUTH "\n");
else
- return AUTH_FAILED;
+ return (AUTH_FAILED);
- return AUTH_OK;
+ return (AUTH_OK);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 05:54:46 +0000