Fix mismerge; alias_remove_recursive() now returns int

diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index 1393e131306a33dd33fe883dcb931cb529bc26c3..a3afd251058d18a2449a81ea858131400686086d 100644 (file)
--- 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;