diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2011-04-06 11:36:27 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2011-04-06 11:36:27 +0000 |
| commit | e2ddf551fe54f5fd63dbb0131d6835d07f172753 (patch) | |
| tree | ee263115c37260360e628dc4fc5e029d18e30311 /usr.sbin/httpd | |
| parent | ecdee9dbaa69f9aa6f959777e5e515c31bb6a0f8 (diff) | |
Avoid using NULL in non-pointer contexts: use 0 for integer values and '\0'
for chars.
Diffstat (limited to 'usr.sbin/httpd')
| -rw-r--r-- | usr.sbin/httpd/src/modules/keynote/mod_keynote.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/httpd/src/modules/keynote/mod_keynote.c b/usr.sbin/httpd/src/modules/keynote/mod_keynote.c index 7f33f430a9a..cd382992a0d 100644 --- a/usr.sbin/httpd/src/modules/keynote/mod_keynote.c +++ b/usr.sbin/httpd/src/modules/keynote/mod_keynote.c @@ -148,7 +148,7 @@ add_action_attributes(int sessid, request_rec *r) add_action_attribute(sessid, "protocol", r->protocol, r); add_action_attribute(sessid, "filename", r->filename, r); - tt = time((time_t) NULL); + tt = time((time_t *) NULL); strftime (mytimeofday, 14, "%Y%m%d%H%M%S", gmtime (&tt)); add_action_attribute(sessid, "GMTTimeOfDay", mytimeofday, r); @@ -269,7 +269,7 @@ keynote_get_valid_times(request_rec *r, X509 *cert, char *before, size_t beforel if (((tm = X509_get_notBefore(cert)) == NULL) || (tm->type != V_ASN1_UTCTIME && tm->type != V_ASN1_GENERALIZEDTIME)) { - tt = time((time_t) NULL); + tt = time((time_t *) NULL); strftime(before, 14, "%G%m%d%H%M%S", localtime(&tt)); *timecomp = "LocalTimeOfDay"; } else { @@ -638,7 +638,7 @@ check_keynote_assertions(request_rec *r) /* Missing or self-signed, deny them */ issuer = X509_get_issuer_name(cert); subject = X509_get_subject_name(cert); - if (!issuer || !subject || X509_name_cmp(issuer, subject) == NULL) { + if (!issuer || !subject || X509_name_cmp(issuer, subject) == 0) { rval = FORBIDDEN; goto done; } |