upstream commit

adapt mac.c to ssherr.h return codes (de-fatal) and
 simplify dependencies ok djm@

1 files changed, 2 insertions, 2 deletions

diff --git a/monitor_wrap.c b/monitor_wrap.c
index 45dc16951..f4e11c966 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.80 2014/04/29 18:01:49 markus Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.81 2015/01/13 19:31:40 markus Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -506,7 +506,7 @@ mm_newkeys_from_blob(u_char *blob, int blen)
         /* Mac structure */
         if (cipher_authlen(enc->cipher) == 0) {
                 mac->name = buffer_get_string(&b, NULL);
-                if (mac->name == NULL || mac_setup(mac, mac->name) == -1)
+                if (mac->name == NULL || mac_setup(mac, mac->name) != 0)
                         fatal("%s: can not setup mac %s", __func__, mac->name);
                 mac->enabled = buffer_get_int(&b);
                 mac->key = buffer_get_string(&b, &len);