=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/auth-krb4.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- src/usr.bin/ssh/Attic/auth-krb4.c 2003/02/21 10:34:48 1.29 +++ src/usr.bin/ssh/Attic/auth-krb4.c 2003/04/08 20:21:28 1.30 @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-krb4.c,v 1.29 2003/02/21 10:34:48 mpech Exp $"); +RCSID("$OpenBSD: auth-krb4.c,v 1.30 2003/04/08 20:21:28 itojun Exp $"); #include "ssh.h" #include "ssh1.h" @@ -78,7 +78,7 @@ return (1); } /* Failure - cancel cleanup function, leaving ticket for inspection. */ - log("WARNING: bad ticket file %s", authctxt->krb4_ticket_file); + logit("WARNING: bad ticket file %s", authctxt->krb4_ticket_file); fatal_remove_cleanup(krb4_cleanup_proc, authctxt); cleanup_registered = 0; @@ -114,7 +114,7 @@ if (pw->pw_uid != 0 && krb_get_lrealm(realm, 1) == KSUCCESS) { /* Set up our ticket file. */ if (!krb4_init(authctxt)) { - log("Couldn't initialize Kerberos ticket file for %s!", + logit("Couldn't initialize Kerberos ticket file for %s!", pw->pw_name); goto failure; } @@ -141,7 +141,7 @@ if (r == KSUCCESS) { if ((hp = gethostbyname(localhost)) == NULL) { - log("Couldn't get local host address!"); + logit("Couldn't get local host address!"); goto failure; } memmove((void *)&faddr, (void *)hp->h_addr, @@ -155,12 +155,12 @@ * Probably didn't have a srvtab on * localhost. Disallow login. */ - log("Kerberos v4 TGT for %s unverifiable, " + logit("Kerberos v4 TGT for %s unverifiable, " "no srvtab installed? krb_rd_req: %s", pw->pw_name, krb_err_txt[r]); goto failure; } else if (r != KSUCCESS) { - log("Kerberos v4 %s ticket unverifiable: %s", + logit("Kerberos v4 %s ticket unverifiable: %s", KRB4_SERVICE_NAME, krb_err_txt[r]); goto failure; } @@ -169,7 +169,7 @@ * Disallow login if no rcmd service exists, and * log the error. */ - log("Kerberos v4 TGT for %s unverifiable: %s; %s.%s " + logit("Kerberos v4 TGT for %s unverifiable: %s; %s.%s " "not registered, or srvtab is wrong?", pw->pw_name, krb_err_txt[r], KRB4_SERVICE_NAME, phost); goto failure; @@ -249,7 +249,7 @@ /* Check ~/.klogin authorization now. */ if (kuserok(&adat, authctxt->user) != KSUCCESS) { - log("Kerberos v4 .klogin authorization failed for %s to " + logit("Kerberos v4 .klogin authorization failed for %s to " "account %s", *client, authctxt->user); xfree(*client); *client = NULL; @@ -289,14 +289,14 @@ temporarily_use_uid(pw); if (!radix_to_creds(string, &creds)) { - log("Protocol error decoding Kerberos v4 TGT"); + logit("Protocol error decoding Kerberos v4 TGT"); goto failure; } if (strncmp(creds.service, "", 1) == 0) /* backward compatibility */ strlcpy(creds.service, "krbtgt", sizeof creds.service); if (strcmp(creds.service, "krbtgt")) { - log("Kerberos v4 TGT (%s%s%s@%s) rejected for %s", + logit("Kerberos v4 TGT (%s%s%s@%s) rejected for %s", creds.pname, creds.pinst[0] ? "." : "", creds.pinst, creds.realm, pw->pw_name); goto failure; @@ -343,7 +343,7 @@ return (0); if (!radix_to_creds(token_string, &creds)) { - log("Protocol error decoding AFS token"); + logit("Protocol error decoding AFS token"); return (0); } if (strncmp(creds.service, "", 1) == 0) /* backward compatibility */ @@ -355,7 +355,7 @@ uid = pw->pw_uid; if (kafs_settoken(creds.realm, uid, &creds)) { - log("AFS token (%s@%s) rejected for %s", + logit("AFS token (%s@%s) rejected for %s", creds.pname, creds.realm, pw->pw_name); memset(&creds, 0, sizeof(creds)); return (0);