1 Subject: [PATCH] Remove sudoedit and sudoreplay references and various
4 The OS X version of sudo omits both sudoedit and sudoreplay.
5 The sudoedit functionality is still available via "sudo -e".
7 Do not attempt to install sudoedit, sudoreplay or the doc files
8 as they are not part of the normal OS X installation.
10 Also make sure sudo gets installed with mode 04511 instead of
11 mode 04111 for "securityserver_workaround_3273205".
13 Do not create the noexec dir during install since it's not used
14 on OS X and using --with-noexec=no will otherwise cause a directory
15 named "no" to be created at install time.
17 Do not create the sudoers.d directory at install time since it
18 will never be used by the standard sudoers file.
20 Makefile.in | 26 +++++---------------------
21 sudo.man.in | 21 +--------------------
22 2 files changed, 6 insertions(+), 41 deletions(-)
24 diff --git a/Makefile.in b/Makefile.in
25 index 7ea18868..ea30212b 100644
28 @@ -690,53 +690,37 @@ install: pre-install install-dirs install-binaries @INSTALL_NOEXEC@ install-sudo
31 $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(sudodir) \
32 - $(DESTDIR)$(visudodir) $(DESTDIR)$(noexecdir) \
33 - $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) \
34 + $(DESTDIR)$(visudodir) \
35 + $(DESTDIR)$(sudoersdir) \
36 $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform) \
37 `echo $(DESTDIR)$(timedir)|sed 's,/[^/]*$$,,'`
38 $(INSTALL) -d -O $(install_uid) -G $(install_gid) -m 0700 $(DESTDIR)$(timedir)
40 install-binaries: install-dirs $(PROGS)
41 if [ X"$$SUDO_PREINSTALL_CMD" != X"" ]; then exec $$SUDO_PREINSTALL_CMD sudo; fi
42 - $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 04755 sudo $(DESTDIR)$(sudodir)/sudo
43 - rm -f $(DESTDIR)$(sudodir)/sudoedit
44 - ln -s sudo $(DESTDIR)$(sudodir)/sudoedit
45 - if [ -f sudoreplay ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -m 0755 sudoreplay $(DESTDIR)$(sudodir)/sudoreplay; fi
46 - $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -m 0755 visudo $(DESTDIR)$(visudodir)/visudo
47 - if [ -f sesh ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -m 0755 sesh $(DESTDIR)$(libexecdir)/sesh; fi
48 + $(INSTALL) -O $(install_uid) -G $(install_gid) -M 4511 -s sudo $(DESTDIR)$(sudodir)/sudo
49 + $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s visudo $(DESTDIR)$(visudodir)/visudo
51 install-noexec: install-dirs libsudo_noexec.la
52 if [ -f .libs/lib$(noexecfile) ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -m $(shlib_mode) .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(noexecfile); fi
54 install-sudoers: install-dirs
55 - $(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -m 0750 \
56 - $(DESTDIR)$(sudoersdir)/sudoers.d
57 test -f $(DESTDIR)$(sudoersdir)/sudoers || \
58 $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -m $(sudoers_mode) \
59 sudoers $(DESTDIR)$(sudoersdir)/sudoers
61 install-doc: install-dirs ChangeLog
62 - (cd $(srcdir) && for f in ChangeLog HISTORY LICENSE NEWS README TROUBLESHOOTING UPGRADE sample.*; do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 $$f $(DESTDIR)$(docdir); done)
63 - @LDAP@(cd $(srcdir) && for f in README.LDAP schema.* sudoers2ldif; do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 $$f $(DESTDIR)$(docdir); done)
64 $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
65 - @REPLAY@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu)
66 $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu)
67 $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform)
68 @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform)
69 @if test -n "$(MANCOMPRESS)"; then \
70 - for f in $(mandirsu)/sudo.$(mansectsu) $(mandirsu)/sudoreplay.$(mansectsu) $(mandirsu)/visudo.$(mansectsu) $(mandirform)/sudoers.$(mansectform) $(mandirform)/sudoers.ldap.$(mansectform); do \
71 + for f in $(mandirsu)/sudo.$(mansectsu) $(mandirsu)/visudo.$(mansectsu) $(mandirform)/sudoers.$(mansectform) $(mandirform)/sudoers.ldap.$(mansectform); do \
72 if test -f $(DESTDIR)$$f; then \
73 echo $(MANCOMPRESS) -f $(DESTDIR)$$f; \
74 $(MANCOMPRESS) -f $(DESTDIR)$$f; \
77 - rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)$(MANCOMPRESSEXT); \
78 - echo ln -s sudo.$(mansectsu)$(MANCOMPRESSEXT) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)$(MANCOMPRESSEXT); \
79 - ln -s sudo.$(mansectsu)$(MANCOMPRESSEXT) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)$(MANCOMPRESSEXT); \
81 - rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \
82 - echo ln -s sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \
83 - ln -s sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \
87 diff --git a/sudo.man.in b/sudo.man.in
88 index ee41822c..bc0460a1 100644
98 \- execute a command as another user
102 [\fBVAR\fR=\fIvalue\fR]
103 \fB\-i\fR\ |\ \fB\-s\fR
109 -[\fB\-a\fR\ \fIauth_type\fR]
110 -[\fB\-C\fR\ \fIfd\fR]
111 -[\fB\-c\fR\ \fIclass\fR\ |\ \fI-\fR]
112 -[\fB\-g\fR\ \fIgroup\ name\fR\ |\ \fI#gid\fR]
113 -[\fB\-p\fR\ \fIprompt\fR]
114 -[\fB\-u\fR\ \fIuser\ name\fR\ |\ \fI#uid\fR]
119 @@ -107,12 +95,6 @@ The default password prompt timeout is
120 \fR@password_timeout@\fR
127 -option (described below), is implied.
129 The options are as follows:
132 @@ -1667,7 +1649,6 @@ stat(2),
134 passwd(@mansectform@),
135 sudoers(@mansectform@),
136 -sudoreplay(@mansectsu@),
139 See the HISTORY file in the