diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2006-02-14 14:42:37 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2006-02-14 14:42:37 +0000 |
| commit | e35eef9c0ac5445a6e80682f53e8a05c2e49953a (patch) | |
| tree | 48888cbb8859e76446c7439c490238688bd209f2 | |
| parent | 94c71f063dcfe2634cf4fd5025a1dba42d066ff6 (diff) | |
Change suid to take dumpcap into account
svn path=/trunk/; revision=17299
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 45544e7c6e..d984a1058d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -690,7 +690,7 @@ EXTRA_DIST = \ if SETUID_INSTALL install-exec-hook: - -chmod +s $(DESTDIR)$(bindir)/ethereal + -chmod +s $(DESTDIR)$(bindir)/dumpcap -chmod +s $(DESTDIR)$(bindir)/tethereal else install-exec-hook: diff --git a/configure.in b/configure.in index 180155ffae..4ad5e2ad8c 100644 --- a/configure.in +++ b/configure.in @@ -823,7 +823,11 @@ AC_MSG_CHECKING(whether to install ethereal setuid) if test "x$enable_setuid_install" = "xno" ; then AC_MSG_RESULT(no) else - AC_MSG_RESULT(yes) + if test "x$enable_dumpcap" = "xno" ; then + AC_MSG_ERROR(Setuid install works only with --enable-dumpcap, but dumpcap disabled) + else + AC_MSG_RESULT(yes) + fi fi AM_CONDITIONAL(SETUID_INSTALL, test x$enable_setuid_install = xyes) |