summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2006-04-08 07:05:20 +0000
committerKen Raeburn <raeburn@mit.edu>2006-04-08 07:05:20 +0000
commitaebb0a39d8b112be4b001d2dfbd40d76edc68e71 (patch)
tree73ca80be2bfe5f715a9342b45f93347d5e46470c
parentbefa9f2d7069f826d2f49c458bf73d82132c36ba (diff)
downloadkrb5-aebb0a39d8b112be4b001d2dfbd40d76edc68e71.tar.gz
krb5-aebb0a39d8b112be4b001d2dfbd40d76edc68e71.tar.xz
krb5-aebb0a39d8b112be4b001d2dfbd40d76edc68e71.zip
* kadm_net.c (kadm_cli_send): Use 0, not NULL, when checking numeric
error codes. (Removes the two occurrences of "comparison between pointer and integer" in the build.) git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17872 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/krb4/ChangeLog3
-rw-r--r--src/lib/krb4/kadm_net.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 9c64fa0cb..a4338f4bd 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,5 +1,8 @@
2006-04-08 Ken Raeburn <raeburn@mit.edu>
+ * kadm_net.c (kadm_cli_send): Use 0, not NULL, when checking
+ numeric error codes.
+
* fakeenv.c: Unused file deleted.
2006-04-03 Ken Raeburn <raeburn@mit.edu>
diff --git a/src/lib/krb4/kadm_net.c b/src/lib/krb4/kadm_net.c
index 1838834c0..a94aab846 100644
--- a/src/lib/krb4/kadm_net.c
+++ b/src/lib/krb4/kadm_net.c
@@ -191,7 +191,7 @@ kadm_cli_send(Kadm_Client *client_parm,
cksum = quad_cksum(priv_pak, NULL, priv_len, 0, &sess_key);
#endif
/* XXX cast unsigned->signed */
- if ((retdat = krb_mk_req_creds(&authent, &client_parm->creds, (long)cksum)) != NULL) {
+ if ((retdat = krb_mk_req_creds(&authent, &client_parm->creds, (long)cksum)) != 0) {
/* authenticator? */
RET_N_FREE(retdat);
}
@@ -228,7 +228,7 @@ kadm_cli_send(Kadm_Client *client_parm,
/* need to decode the ret_dat */
if ((retdat = krb_rd_priv(*ret_dat, (u_long)*ret_siz, sess_sched,
(C_Block *)sess_key, &client_parm->admin_addr,
- &client_parm->my_addr, &mdat)) != NULL)
+ &client_parm->my_addr, &mdat)) != 0)
RET_N_FREE2(retdat);
if (mdat.app_length < KADM_VERSIZE + 4)
/* too short! */