summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--server/bdump.c27
-rw-r--r--server/kstuff.c21
-rw-r--r--server/realm.c16
3 files changed, 40 insertions, 24 deletions
diff --git a/server/bdump.c b/server/bdump.c
index 779074d..b195053 100644
--- a/server/bdump.c
+++ b/server/bdump.c
@@ -356,9 +356,10 @@ bdump_send(void)
strlen(ZGetRealm()),
ZGetRealm(),
SERVER_KRB5_SERVICE, SERVER_INSTANCE,
- 0);
+ NULL);
if (retval) {
- syslog(LOG_ERR, "bdump_send: krb5_build_principal: %s", error_message(retval));
+ syslog(LOG_ERR, "bdump_send: krb5_build_principal: %s",
+ error_message(retval));
cleanup(server);
return;
}
@@ -366,14 +367,17 @@ bdump_send(void)
retval = krb5_auth_con_init(Z_krb5_ctx, &bdump_ac);
if (retval) {
- syslog(LOG_ERR, "bdump_send: krb5_auth_con_init: %s", error_message(retval));
+ syslog(LOG_ERR, "bdump_send: krb5_auth_con_init: %s",
+ error_message(retval));
cleanup(server);
return;
}
- retval = krb5_auth_con_setflags(Z_krb5_ctx, bdump_ac, KRB5_AUTH_CONTEXT_DO_SEQUENCE);
+ retval = krb5_auth_con_setflags(Z_krb5_ctx, bdump_ac,
+ KRB5_AUTH_CONTEXT_DO_SEQUENCE);
if (retval) {
- syslog(LOG_ERR, "bdump_send: krb5_auth_con_setflags: %s", error_message(retval));
+ syslog(LOG_ERR, "bdump_send: krb5_auth_con_setflags: %s",
+ error_message(retval));
cleanup(server);
return;
}
@@ -637,16 +641,18 @@ bdump_get_v12 (ZNotice_t *notice,
strlen(ZGetRealm()),
ZGetRealm(),
SERVER_KRB5_SERVICE, SERVER_INSTANCE,
- 0);
+ NULL);
if (retval) {
- syslog(LOG_ERR, "bdump_get: krb5_build_principal: %s", error_message(retval));
+ syslog(LOG_ERR, "bdump_get: krb5_build_principal: %s",
+ error_message(retval));
cleanup(server);
return;
}
retval = krb5_copy_principal(Z_krb5_ctx, principal, &creds.server);
if (retval) {
- syslog(LOG_ERR, "bdump_get: krb5_copy_principal (server): %s", error_message(retval));
+ syslog(LOG_ERR, "bdump_get: krb5_copy_principal (server): %s",
+ error_message(retval));
krb5_free_principal(Z_krb5_ctx, principal);
cleanup(server);
return;
@@ -655,7 +661,8 @@ bdump_get_v12 (ZNotice_t *notice,
retval = krb5_copy_principal(Z_krb5_ctx, principal, &creds.client);
krb5_free_principal(Z_krb5_ctx, principal);
if (retval) {
- syslog(LOG_ERR, "bdump_get: krb5_copy_principal (client): %s", error_message(retval));
+ syslog(LOG_ERR, "bdump_get: krb5_copy_principal (client): %s",
+ error_message(retval));
krb5_free_cred_contents(Z_krb5_ctx, &creds);
cleanup(server);
return;
@@ -1060,7 +1067,7 @@ get_tgt(void)
strlen(ZGetRealm()),
ZGetRealm(),
SERVER_KRB5_SERVICE, SERVER_INSTANCE,
- 0);
+ NULL);
if (retval) {
krb5_free_principal(Z_krb5_ctx, principal);
return(1);
diff --git a/server/kstuff.c b/server/kstuff.c
index 4ad951d..8f283b5 100644
--- a/server/kstuff.c
+++ b/server/kstuff.c
@@ -320,16 +320,19 @@ ZCheckRealmAuthentication(ZNotice_t *notice,
SERVER_INSTANCE, NULL);
if (!result) {
result = krb5_rd_req(Z_krb5_ctx, &authctx, &packet, server,
- keytabid, 0, &tkt);
+ keytabid, NULL, &tkt);
krb5_free_principal(Z_krb5_ctx, server);
}
krb5_kt_close(Z_krb5_ctx, keytabid);
if (result) {
- if (result == KRB5KRB_AP_ERR_REPEAT)
- syslog(LOG_DEBUG, "ZCheckRealmAuthentication: k5 auth failed: %s", error_message(result));
- else
- syslog(LOG_WARNING,"ZCheckRealmAuthentication: k5 auth failed: %s", error_message(result));
+ if (result == KRB5KRB_AP_ERR_REPEAT) {
+ syslog(LOG_DEBUG, "ZCheckRealmAuthentication: k5 auth failed: %s",
+ error_message(result));
+ } else {
+ syslog(LOG_WARNING,"ZCheckRealmAuthentication: k5 auth failed: %s",
+ error_message(result));
+ }
free(authbuf);
krb5_auth_con_free(Z_krb5_ctx, authctx);
return ZAUTH_FAILED;
@@ -612,16 +615,18 @@ ZCheckAuthentication(ZNotice_t *notice,
SERVER_INSTANCE, NULL);
if (!result) {
result = krb5_rd_req(Z_krb5_ctx, &authctx, &packet, server,
- keytabid, 0, &tkt);
+ keytabid, NULL, &tkt);
krb5_free_principal(Z_krb5_ctx, server);
}
krb5_kt_close(Z_krb5_ctx, keytabid);
if (result) {
if (result == KRB5KRB_AP_ERR_REPEAT)
- syslog(LOG_DEBUG, "ZCheckAuthentication: k5 auth failed: %s", error_message(result));
+ syslog(LOG_DEBUG, "ZCheckAuthentication: k5 auth failed: %s",
+ error_message(result));
else
- syslog(LOG_WARNING,"ZCheckAuthentication: k5 auth failed: %s", error_message(result));
+ syslog(LOG_WARNING,"ZCheckAuthentication: k5 auth failed: %s",
+ error_message(result));
free(authbuf);
krb5_auth_con_free(Z_krb5_ctx, authctx);
return ZAUTH_FAILED;
diff --git a/server/realm.c b/server/realm.c
index 6118265..6f35daf 100644
--- a/server/realm.c
+++ b/server/realm.c
@@ -1289,7 +1289,8 @@ ticket_lookup(char *realm)
result = krb5_build_principal(Z_krb5_ctx, &creds_in.server,
strlen(realm),
realm,
- SERVER_KRB5_SERVICE, SERVER_INSTANCE, 0);
+ SERVER_KRB5_SERVICE, SERVER_INSTANCE,
+ NULL);
if (result) {
krb5_cc_close(Z_krb5_ctx, ccache);
return 0;
@@ -1340,7 +1341,7 @@ ticket_retrieve(ZRealm *realm)
result = krb5_build_principal(Z_krb5_ctx, &creds_in.server,
strlen(realm->name), realm->name,
SERVER_KRB5_SERVICE, SERVER_INSTANCE,
- 0);
+ NULL);
/* HOLDING: creds_in.server */
@@ -1396,7 +1397,8 @@ ticket_retrieve(ZRealm *realm)
syslog(LOG_INFO, "tkt_rtrv running for %s", realm->name);
while (1) {
- /* Get a pointer to the default ccache. We don't need to free this. */
+ /* Get a pointer to the default ccache.
+ We don't need to free this. */
result = krb5_cc_default(Z_krb5_ctx, &ccache);
/* GRRR. There's no allocator or constructor for krb5_creds */
@@ -1404,13 +1406,15 @@ ticket_retrieve(ZRealm *realm)
memset(&creds_in, 0, sizeof(creds_in));
if (!result)
- result = krb5_cc_get_principal(Z_krb5_ctx, ccache, &creds_in.client);
+ result = krb5_cc_get_principal(Z_krb5_ctx, ccache,
+ &creds_in.client);
/* construct the service principal */
if (!result)
result = krb5_build_principal(Z_krb5_ctx, &creds_in.server,
strlen(realm->name), realm->name,
- SERVER_KRB5_SERVICE, SERVER_INSTANCE,
- 0);
+ SERVER_KRB5_SERVICE,
+ SERVER_INSTANCE,
+ NULL);
/* HOLDING: creds_in.server */
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-30 18:02:56 +0000