--- embedaddon/sudo/plugins/sudoers/auth/bsdauth.c	2013/07/22 10:46:12	1.1.1.3
+++ embedaddon/sudo/plugins/sudoers/auth/bsdauth.c	2014/06/15 16:12:54	1.1.1.5
@@ -54,8 +54,6 @@
 #  define LOGIN_DEFROOTCLASS	"daemon"
 # endif
 
-extern char *login_style;		/* from sudoers.c */
-
 struct bsdauth_state {
     auth_session_t *as;
     login_cap_t *lc;
@@ -97,7 +95,7 @@ bsdauth_init(struct passwd *pw, sudo_auth *auth)
      if (auth_setitem(state.as, AUTHV_STYLE, login_style) < 0 ||
 	auth_setitem(state.as, AUTHV_NAME, pw->pw_name) < 0 ||
 	auth_setitem(state.as, AUTHV_CLASS, login_class) < 0) {
-	log_warning(NO_MAIL, N_("unable to setup authentication"));
+	log_warning(NO_MAIL, N_("unable to initialize BSD authentication"));
 	auth_close(state.as);
 	login_close(state.lc);
 	debug_return_int(AUTH_FATAL);
@@ -156,7 +154,7 @@ bsdauth_verify(struct passwd *pw, char *prompt, sudo_a
 
     if (pass) {
 	authok = auth_userresponse(as, pass, 1);
-	zero_bytes(pass, strlen(pass));
+	memset_s(pass, SUDO_CONV_REPL_MAX, 0, strlen(pass));
     }
 
     /* restore old signal handler */