* 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 5f1d47a8c7e9b7dff94e95acdf61d250346304e9..b563ddaf277934e87451be7dc8ed78a9d5834753 100644 (file)
--- 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 ca9ffc95117f7887551af51e5721cb39d03a7faf..986e85caef0078a41b2d5728ed6767874e77e9bf 100644 (file)
--- 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 46b4ac19e1d8612a9fbdc97d46cfe11632196e9d..6968c4dcc60b9c96e4491364cb398e1d7617dec4 100644 (file)
--- 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"