diff options
| author |  Karl Ramm <kcr@1ts.org> | 2009-04-03 04:45:20 +0000 |
|---|---|---|
| committer | Karl Ramm <kcr@1ts.org> | 2009-04-03 04:45:20 +0000 |
| commit | bdd2368e5cf971d03d7b57db6f09788084c19679 (patch) | |
| tree | cb15ed2158a46678a9be5bca4980e95abe4002e0 /server/realm.c | |
| parent | 5fd7d4c62f9028489eede7b41e27fee96f0a3432 (diff) | |
amd64 anecdotally cares about the difference between NULL and 0 in some contexts
Diffstat (limited to 'server/realm.c')
| -rw-r--r-- | server/realm.c | 16 |
1 files changed, 10 insertions, 6 deletions
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 */ |