Merge sync of head

3 files changed, 4 insertions, 13 deletions

diff --git a/sbin/hastd/Makefile b/sbin/hastd/Makefile
index 3604b5b..e3fed8d 100644
--- a/sbin/hastd/Makefile
+++ b/sbin/hastd/Makefile
@@ -30,11 +30,9 @@ CFLAGS+=-DINET
 CFLAGS+=-DINET6
 .endif
 
-DPADD=	${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBPTHREAD} ${LIBUTIL}
-LDADD=	-lgeom -lbsdxml -lsbuf -lpthread -lutil
+LIBADD=	geom pthread util
 .if ${MK_OPENSSL} != "no"
-DPADD+=	${LIBCRYPTO}
-LDADD+=	-lcrypto
+LIBADD+=	crypto
 CFLAGS+=-DHAVE_CRYPTO
 .endif
 
diff --git a/sbin/hastd/Makefile.depend b/sbin/hastd/Makefile.depend
index 8fc25fa..6e89123 100644
--- a/sbin/hastd/Makefile.depend
+++ b/sbin/hastd/Makefile.depend
@@ -17,6 +17,7 @@ DIRDEPS = \
 	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
+	usr.bin/yacc.host \
 
 
 .include <dirdeps.mk>
diff --git a/sbin/hastd/hast.conf.5 b/sbin/hastd/hast.conf.5
index c7e2e33..9267e36 100644
--- a/sbin/hastd/hast.conf.5
+++ b/sbin/hastd/hast.conf.5
@@ -270,39 +270,33 @@ program is executed with:
 .It Ic "<path> role <resource> <oldrole> <newrole>"
 .Pp
 Executed on both primary and secondary nodes when resource role is changed.
-.Pp
 .It Ic "<path> connect <resource>"
 .Pp
 Executed on both primary and secondary nodes when connection for the given
 resource between the nodes is established.
-.Pp
 .It Ic "<path> disconnect <resource>"
 .Pp
 Executed on both primary and secondary nodes when connection for the given
 resource between the nodes is lost.
-.Pp
 .It Ic "<path> syncstart <resource>"
 .Pp
 Executed on primary node when synchronization process of secondary node is
 started.
-.Pp
 .It Ic "<path> syncdone <resource>"
 .Pp
 Executed on primary node when synchronization process of secondary node is
 completed successfully.
-.Pp
 .It Ic "<path> syncintr <resource>"
 .Pp
 Executed on primary node when synchronization process of secondary node is
 interrupted, most likely due to secondary node outage or connection failure
 between the nodes.
-.Pp
 .It Ic "<path> split-brain <resource>"
 .Pp
 Executed on both primary and secondary nodes when split-brain condition is
 detected.
-.Pp
 .El
+.Pp
 The
 .Aq path
 argument should contain full path to executable program.
@@ -330,7 +324,6 @@ It can be one of:
 .Ar init ,
 .Ar secondary ,
 .Ar primary .
-.Pp
 .It Ic metaflush on | off
 .Pp
 When set to
@@ -349,7 +342,6 @@ will disable
 automatically.
 The default value is
 .Va on .
-.Pp
 .It Ic name Aq name
 .Pp
 GEOM provider name that will appear as