--- embedaddon/sudo/src/conversation.c 2012/02/21 16:23:02 1.1 +++ embedaddon/sudo/src/conversation.c 2013/07/22 10:46:13 1.1.1.3 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2005, 2007-2010 Todd C. Miller + * Copyright (c) 1999-2005, 2007-2012 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -21,7 +21,6 @@ #include #include -#include #include #ifdef STDC_HEADERS # include @@ -47,6 +46,7 @@ #include "sudo.h" #include "sudo_plugin.h" +#include "sudo_plugin_int.h" extern int tgetpass_flags; /* XXX */ @@ -91,6 +91,10 @@ sudo_conversation(int num_msgs, const struct sudo_conv if (msg->msg) (void) fputs(msg->msg, stderr); break; + case SUDO_CONV_DEBUG_MSG: + if (msg->msg) + sudo_debug_write(msg->msg, strlen(msg->msg), 0); + break; default: goto err; } @@ -110,30 +114,4 @@ err: } while (n--); return -1; -} - -int -_sudo_printf(int msg_type, const char *fmt, ...) -{ - va_list ap; - FILE *fp; - int len; - - switch (msg_type) { - case SUDO_CONV_INFO_MSG: - fp = stdout; - break; - case SUDO_CONV_ERROR_MSG: - fp = stderr; - break; - default: - errno = EINVAL; - return -1; - } - - va_start(ap, fmt); - len = vfprintf(fp, fmt, ap); - va_end(ap); - - return len; }