diff options
| author |   daniel <daniel@openbsd.org> | 2014-09-21 05:33:49 +0000 |
|---|---|---|
| committer | daniel <daniel@openbsd.org> | 2014-09-21 05:33:49 +0000 |
| commit | 3b4314ef34d455ef661551ff5b4c3337243beab4 (patch) | |
| tree | 976196c6f2989219c0ef3e20ac4224c69c40bc86 /usr.sbin/ldapd/auth.c | |
| parent | Fix an invalid escape sequence. (diff) | |
| download | wireguard-openbsd-3b4314ef34d455ef661551ff5b4c3337243beab4.tar.xz wireguard-openbsd-3b4314ef34d455ef661551ff5b4c3337243beab4.zip | |
eliminate the use of a gcc C extension (conditionals with omitted
operands).
ok deraadt@
Diffstat (limited to 'usr.sbin/ldapd/auth.c')
| -rw-r--r-- | usr.sbin/ldapd/auth.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/ldapd/auth.c b/usr.sbin/ldapd/auth.c index dc796fd977f..023650a1d1d 100644 --- a/usr.sbin/ldapd/auth.c +++ b/usr.sbin/ldapd/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.9 2010/12/17 07:17:38 martinh Exp $ */ +/* $OpenBSD: auth.c,v 1.10 2014/09/21 05:33:49 daniel Exp $ */ /* * Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se> @@ -125,8 +125,8 @@ authorized(struct conn *conn, struct namespace *ns, int rights, char *dn, log_debug("requesting %02X access to %s by %s, in namespace %s", rights, - dn ?: "any", - conn->binddn ?: "any", + dn ? dn : "any", + conn->binddn ? conn->binddn : "any", ns ? ns->suffix : "global"); SIMPLEQ_FOREACH(aci, &conf->acl, entry) { @@ -136,8 +136,8 @@ authorized(struct conn *conn, struct namespace *ns, int rights, char *dn, type == ACI_ALLOW ? "allowed" : "denied", aci->type == ACI_ALLOW ? "allow" : "deny", aci->rights, - aci->target ?: "any", - aci->subject ?: "any"); + aci->target ? aci->target : "any", + aci->subject ? aci->subject : "any"); } } @@ -149,8 +149,8 @@ authorized(struct conn *conn, struct namespace *ns, int rights, char *dn, type == ACI_ALLOW ? "allowed" : "denied", aci->type == ACI_ALLOW ? "allow" : "deny", aci->rights, - aci->target ?: "any", - aci->subject ?: "any"); + aci->target ? aci->target : "any", + aci->subject ? aci->subject : "any"); } } } |