oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

replace all erroneous calls to pop_log with POP_FAILURE with POP_PRIORITY. reported by Janne Johansson <jj@it.kth.se>

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8182 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-04-12 15:37:46 +00:00
parent e3d16f284d
commit 5ec33df5ff
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appl/popper/pop_auth.c
View File

@@ -159,7 +159,7 @@ auth_krb4(POP *p)
} }
if (kuserok(&p->kdata, p->user)) { if (kuserok(&p->kdata, p->user)) {
pop_log(p, POP_FAILURE, pop_log(p, POP_PRIORITY,
"%s: (%s.%s@%s) tried to retrieve mail for %s.", "%s: (%s.%s@%s) tried to retrieve mail for %s.",
p->client, p->kdata.pname, p->kdata.pinst, p->client, p->kdata.pname, p->kdata.pinst,
p->kdata.prealm, p->user); p->kdata.prealm, p->user);

10
appl/popper/pop_init.c
View File

@@ -36,13 +36,13 @@ pop_write_addr(POP *p, struct sockaddr *addr)
strftime(ts, sizeof(ts), "%Y%m%d%H%M%S", localtime(&t)); strftime(ts, sizeof(ts), "%Y%m%d%H%M%S", localtime(&t));
if(inet_ntop (addr->sa_family, socket_get_address(addr), if(inet_ntop (addr->sa_family, socket_get_address(addr),
as, sizeof(as)) == NULL) { as, sizeof(as)) == NULL) {
pop_log(p, POP_FAILURE, "failed to print address"); pop_log(p, POP_PRIORITY, "failed to print address");
return; return;
} }
f = fopen(addr_log, "a"); f = fopen(addr_log, "a");
if(f == NULL) { if(f == NULL) {
pop_log(p, POP_FAILURE, "failed to open address log (%s)", addr_log); pop_log(p, POP_PRIORITY, "failed to open address log (%s)", addr_log);
return; return;
} }
fprintf(f, "%s %s\n", as, ts); fprintf(f, "%s %s\n", as, ts);
@@ -83,7 +83,7 @@ krb4_authenticate (POP *p, int s, u_char *buf, struct sockaddr *addr)
if (auth != KSUCCESS) { if (auth != KSUCCESS) {
pop_msg(p, POP_FAILURE, "Kerberos authentication failure: %s", pop_msg(p, POP_FAILURE, "Kerberos authentication failure: %s",
krb_get_err_text(auth)); krb_get_err_text(auth));
pop_log(p, POP_FAILURE, "%s: (%s.%s@%s) %s", p->client, pop_log(p, POP_PRIORITY, "%s: (%s.%s@%s) %s", p->client,
p->kdata.pname, p->kdata.pinst, p->kdata.prealm, p->kdata.pname, p->kdata.pinst, p->kdata.prealm,
krb_get_err_text(auth)); krb_get_err_text(auth));
exit (1); exit (1);
@@ -129,13 +129,13 @@ krb5_authenticate (POP *p, int s, u_char *buf, struct sockaddr *addr)
ret = krb5_unparse_name(p->context, ticket->server, &server); ret = krb5_unparse_name(p->context, ticket->server, &server);
if(ret) { if(ret) {
pop_log(p, POP_FAILURE, "krb5_unparse_name: %s", pop_log(p, POP_PRIORITY, "krb5_unparse_name: %s",
krb5_get_err_text(p->context, ret)); krb5_get_err_text(p->context, ret));
exit(1); exit(1);
} }
/* does this make sense? */ /* does this make sense? */
if(strncmp(server, "pop/", 4) != 0) { if(strncmp(server, "pop/", 4) != 0) {
pop_log(p, POP_FAILURE, pop_log(p, POP_PRIORITY,
"Got ticket for service `%s'", server); "Got ticket for service `%s'", server);
exit(1); exit(1);
} else if(p->debug) } else if(p->debug)

14
appl/popper/pop_pass.c
View File

@@ -17,7 +17,7 @@ krb4_verify_password (POP *p)
status = krb_get_lrealm(lrealm,1); status = krb_get_lrealm(lrealm,1);
if (status == KFAILURE) { if (status == KFAILURE) {
pop_log(p, POP_FAILURE, "%s: (%s.%s@%s) %s", p->client, pop_log(p, POP_PRIORITY, "%s: (%s.%s@%s) %s", p->client,
p->kdata.pname, p->kdata.pinst, p->kdata.prealm, p->kdata.pname, p->kdata.pinst, p->kdata.prealm,
krb_get_err_text(status)); krb_get_err_text(status));
return 1; return 1;
@@ -53,7 +53,7 @@ krb5_verify_password (POP *p)
ret = krb5_parse_name (p->context, p->user, &client); ret = krb5_parse_name (p->context, p->user, &client);
if (ret) { if (ret) {
pop_log(p, POP_FAILURE, "krb5_parse_name: %s", pop_log(p, POP_PRIORITY, "krb5_parse_name: %s",
krb5_get_err_text (p->context, ret)); krb5_get_err_text (p->context, ret));
return 1; return 1;
} }
@@ -68,7 +68,7 @@ krb5_verify_password (POP *p)
NULL, NULL,
&get_options); &get_options);
if (ret) { if (ret) {
pop_log(p, POP_FAILURE, pop_log(p, POP_PRIORITY,
"krb5_get_init_creds_password: %s", "krb5_get_init_creds_password: %s",
krb5_get_err_text (p->context, ret)); krb5_get_err_text (p->context, ret));
return 1; return 1;
@@ -80,7 +80,7 @@ krb5_verify_password (POP *p)
KRB5_NT_SRV_HST, KRB5_NT_SRV_HST,
&server); &server);
if (ret) { if (ret) {
pop_log(p, POP_FAILURE, pop_log(p, POP_PRIORITY,
"krb5_get_init_creds_password: %s", "krb5_get_init_creds_password: %s",
krb5_get_err_text (p->context, ret)); krb5_get_err_text (p->context, ret));
return 1; return 1;
@@ -124,7 +124,7 @@ pop_pass (POP *p)
#ifdef KRB4 #ifdef KRB4
if (p->version == 4) { if (p->version == 4) {
if(kuserok (&p->kdata, p->user)) { if(kuserok (&p->kdata, p->user)) {
pop_log(p, POP_FAILURE, pop_log(p, POP_PRIORITY,
"%s: (%s.%s@%s) tried to retrieve mail for %s.", "%s: (%s.%s@%s) tried to retrieve mail for %s.",
p->client, p->kdata.pname, p->kdata.pinst, p->client, p->kdata.pname, p->kdata.pinst,
p->kdata.prealm, p->user); p->kdata.prealm, p->user);
@@ -142,7 +142,7 @@ pop_pass (POP *p)
char *name; char *name;
if (!krb5_kuserok (p->context, p->principal, p->user)) { if (!krb5_kuserok (p->context, p->principal, p->user)) {
pop_log (p, POP_FAILURE, pop_log (p, POP_PRIORITY,
"krb5 permission denied"); "krb5 permission denied");
return pop_msg(p, POP_FAILURE, return pop_msg(p, POP_FAILURE,
"Popping not authorized"); "Popping not authorized");
@@ -153,7 +153,7 @@ pop_pass (POP *p)
free (name); free (name);
} }
} else { } else {
pop_log (p, POP_FAILURE, "kerberos authentication failed"); pop_log (p, POP_PRIORITY, "kerberos authentication failed");
return pop_msg (p, POP_FAILURE, return pop_msg (p, POP_FAILURE,
"kerberos authentication failed"); "kerberos authentication failed");
} }