From owner-svn-src-stable@FreeBSD.ORG  Mon Jan  5 00:12:48 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D702EF08;
 Mon,  5 Jan 2015 00:12:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C2F7B2CCB;
 Mon,  5 Jan 2015 00:12:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t050Cm5v045489;
 Mon, 5 Jan 2015 00:12:48 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t050Cm2l045488;
 Mon, 5 Jan 2015 00:12:48 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201501050012.t050Cm2l045488@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 5 Jan 2015 00:12:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r276677 - stable/10/contrib/bsnmp/lib
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2015 00:12:49 -0000

Author: ngie
Date: Mon Jan  5 00:12:47 2015
New Revision: 276677
URL: https://svnweb.freebsd.org/changeset/base/276677

Log:
  MFC r276319:
  
    Fix the function signatures when MK_CRYPT == no for snmp_get_local_keys and
    snmp_passwd_to_keys
  
    Reported by: Beeblebrox <zaphod@berentweb.com>

Modified:
  stable/10/contrib/bsnmp/lib/snmpcrypto.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/bsnmp/lib/snmpcrypto.c
==============================================================================
--- stable/10/contrib/bsnmp/lib/snmpcrypto.c	Mon Jan  5 00:11:20 2015	(r276676)
+++ stable/10/contrib/bsnmp/lib/snmpcrypto.c	Mon Jan  5 00:12:47 2015	(r276677)
@@ -366,7 +366,7 @@ snmp_pdu_decrypt(const struct snmp_pdu *
 	return (SNMP_CODE_OK);
 }
 
-int
+enum snmp_code
 snmp_passwd_to_keys(struct snmp_user *user, char *passwd __unused)
 {
 	if (user->auth_proto == SNMP_AUTH_NOAUTH &&
@@ -378,7 +378,7 @@ snmp_passwd_to_keys(struct snmp_user *us
 	return (SNMP_CODE_FAILED);
 }
 
-int
+enum snmp_code
 snmp_get_local_keys(struct snmp_user *user, uint8_t *eid __unused,
     uint32_t elen __unused)
 {