From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Fri, 30 Apr 2010 14:50:56 +0000 (-0400)
Subject: Fix mismerge; alias_remove_recursive() now returns int
X-Git-Tag: SUDO_1_8_0~683
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b832576e4178b010ed52cd66299399061587982;p=sudo

Fix mismerge; alias_remove_recursive() now returns int
---

diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index 1393e1313..a3afd2510 100644
--- a/plugins/sudoers/visudo.c
+++ b/plugins/sudoers/visudo.c
@@ -931,7 +931,7 @@ get_hostname(void)
     }
 }
 
-static void
+static int
 alias_remove_recursive(char *name, int type, int strict, int quiet)
 {
     struct member *m;