Imported Upstream version 1.8.7

[debian/sudo] / include / sudo_debug.h

diff --git a/include/sudo_debug.h b/include/sudo_debug.h
index b7b458d12238de4baaeb5028a84ffc57570b012c..ed1cd7147ef583e5a2ba81f02b24fbed07d51f62 100644 (file)
--- a/include/sudo_debug.h
+++ b/include/sudo_debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 2011-2012 Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -71,6 +71,7 @@
 #define SUDO_DEBUG_PERMS       (23<<6) /* uid/gid swapping functions */
 #define SUDO_DEBUG_PLUGIN      (24<<6) /* main plugin functions */
 #define SUDO_DEBUG_HOOKS       (25<<6) /* hook functions */
+#define SUDO_DEBUG_SSSD                (26<<6) /* sudoers SSSD */
 #define SUDO_DEBUG_ALL         0xfff0  /* all subsystems */
 
 /* Flag to include string version of errno in debug info. */
@@ -172,7 +173,7 @@
 #if defined(__GNUC__) && __GNUC__ == 2
 # define sudo_debug_printf(pri, fmt...) \
     sudo_debug_printf2(__func__, __FILE__, __LINE__, (pri)|sudo_debug_subsys, \
-    (fmt))
+    fmt)
 #else
 # define sudo_debug_printf(pri, ...) \
     sudo_debug_printf2(__func__, __FILE__, __LINE__, (pri)|sudo_debug_subsys, \
@@ -200,7 +201,8 @@ void sudo_debug_exit_str_masked(const char *func, const char *file, int line, in
 void sudo_debug_exit_ptr(const char *func, const char *file, int line, int subsys, const void *rval);
 int sudo_debug_fd_set(int fd);
 int sudo_debug_init(const char *debugfile, const char *settings);
-void sudo_debug_printf2(const char *func, const char *file, int line, int level, const char *format, ...) __printflike(5, 6);
+void sudo_debug_printf2(const char *func, const char *file, int line, int level, const char *fmt, ...) __printflike(5, 6);
+void sudo_debug_vprintf2(const char *func, const char *file, int line, int level, const char *fmt, va_list ap);
 void sudo_debug_write(const char *str, int len, int errno_val);
 void sudo_debug_write2(const char *func, const char *file, int line, const char *str, int len, int errno_val);
 pid_t sudo_debug_fork(void);