From: Nathan Bryant <loanshark@uncensored.citadel.org>
Date: Sun, 18 Jul 1999 03:00:40 +0000 (+0000)
Subject:         * Makefile.in: don't install chkpwd setuid if make install isn't
X-Git-Tag: v7.86~7636
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=249d9c3c4e457f10f51a0744997b93026629c0fb;p=citadel.git

    * Makefile.in: don't install chkpwd setuid if make install isn't
          being run as root.
        * citadel.spec: chmod u+s chkpwd during %install stage
---

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 5f1d47a8c..b563ddaf2 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,11 @@
+1999-07-17 Nathan Bryant <bryant@cs.usm.maine.edu>
+	* chkpwd.c: DELETED CVS REVISION 1.3 (backed out Art's last change)
+	  use 'cvs update -r 1.2 chkpwd.c; cvs update -A chkpwd.c' NOW to
+	  avoid problems with working directories.
+	* Makefile.in: don't install chkpwd setuid if make install isn't
+	  being run as root.
+	* citadel.spec: chmod u+s chkpwd during %install stage
+
 Fri Jul 16 18:39:04 EDT 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 	* PEXP and GEXP no longer trip the idle time display
 	* Fixed bug which duplicated incoming private mail to Trashcan
diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index ca9ffc951..986e85cae 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -247,7 +247,7 @@ install-exec: all weekly
 			$(INSTALL) $$i $(root)$(prefix)/$$i; \
 		fi \
 	done
-	@if test -f $(root)$(prefix)/chkpwd; then \
+	@if test x`find $(root)$(prefix)/chkpwd -user root` = x$(root)$(prefix)/chkpwd; then \
 		echo chmod u+s $(root)$(prefix)/chkpwd; \
 		chmod u+s $(root)$(prefix)/chkpwd; \
 	fi
diff --git a/citadel/citadel.spec b/citadel/citadel.spec
index 46b4ac19e..6968c4dcc 100644
--- a/citadel/citadel.spec
+++ b/citadel/citadel.spec
@@ -27,6 +27,7 @@ make root=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT/usr/local/citadel -type d | sed "s|$RPM_BUILD_ROOT|%dir |" > filelist
 find $RPM_BUILD_ROOT -type f | egrep -v '(citadel\.rc|public_clients|/help/|/messages/|/network/)' | sed "s|$RPM_BUILD_ROOT||" >> filelist
 find $RPM_BUILD_ROOT -type f | egrep '(citadel\.rc|public_clients|/help/|/messages/|/network/)' | sed "s|$RPM_BUILD_ROOT|%config |" >> filelist
+chmod u+s $RPM_BUILD_ROOT/usr/local/citadel/chkpwd
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"