RELAYD_OPT_LOGNOTIFY seems to do nothing.
ok?
(benno_remove_lognotify.diff)
diff --git usr.sbin/relayd/hce.c usr.sbin/relayd/hce.c
index e4b50292d69..7f0d70ba0e7 100644
--- usr.sbin/relayd/hce.c
+++ usr.sbin/relayd/hce.c
@@ -197,7 +197,7 @@ hce_notify_done(struct host *host, enum host_error he)
struct ctl_status st;
struct timeval tv_now, tv_dur;
u_long duration;
- u_int logopt;
+ u_int logopt = 0;
struct host *h, *hostnst;
int hostup;
const char *msg;
@@ -248,8 +248,6 @@ hce_notify_done(struct host *host, enum host_error he)
proc_compose(env->sc_ps, PROC_PFE, IMSG_HOST_STATUS, &st, sizeof(st));
if (host->up != host->last_up)
logopt = RELAYD_OPT_LOGUPDATE;
- else
- logopt = RELAYD_OPT_LOGNOTIFY;
getmonotime(&tv_now);
timersub(&tv_now, &host->cte.tv_start, &tv_dur);
diff --git usr.sbin/relayd/relayd.h usr.sbin/relayd/relayd.h
index bcf47a6f709..5d9bfaaa78f 100644
--- usr.sbin/relayd/relayd.h
+++ usr.sbin/relayd/relayd.h
@@ -1107,8 +1107,7 @@ struct relayd {
#define RELAYD_OPT_VERBOSE 0x01
#define RELAYD_OPT_NOACTION 0x04
#define RELAYD_OPT_LOGUPDATE 0x08
-#define RELAYD_OPT_LOGNOTIFY 0x10
-#define RELAYD_OPT_LOGALL 0x18
+#define RELAYD_OPT_LOGALL 0x08
/* control.c */
int control_init(struct privsep *, struct control_sock *);
@@ -1173,7 +1172,7 @@ void relay_notify_done(struct host *, const char *);
int relay_session_cmp(struct rsession *, struct rsession *);
char *relay_load_fd(int, off_t *);
int relay_load_certfiles(struct relay *);
-void relay_close(struct rsession *, const char *);
+void relay_close(struct rsession *, const char *, int);
int relay_reset_event(struct ctl_relay_event *);
void relay_natlook(int, short, void *);
void relay_session(struct rsession *);
