afs-dont-allow-shutdown-before-umount-20020523

fix afs to enforce that /afs must be unmounted, and afsd to report it

diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index 664b848b158cd3e84311910182a3ede0d4fb6c51..ce8790936ece8add2c07cbba23c75379dbc7edf7 100644 (file)
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -548,8 +548,8 @@ long parm, parm2, parm3, parm4, parm5, parm6;
        if (afs_globalVFS != 0) {
            afs_warn("AFS isn't unmounted yet! Call aborted\n");
            code = EACCES;
-       }
-       afs_shutdown();
+       } else
+           afs_shutdown();
     }
 
 #if    ! defined(AFS_HPUX90_ENV) || defined(AFS_HPUX100_ENV)

diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c
index 7e95b7394cbae42e0bebae568cae837a92f63583..816296b4ed810ca55abc12c80f2da263770dee51 100644 (file)
--- a/src/afsd/afsd.c
+++ b/src/afsd/afsd.c
@@ -1291,7 +1291,11 @@ mainproc(as, arock)
         * Cold shutdown is the default
         */
        printf("afsd: Shutting down all afs processes and afs state\n");
-       call_syscall(AFSOP_SHUTDOWN, 1);
+       code = call_syscall(AFSOP_SHUTDOWN, 1);
+       if (code) {
+           printf("afsd: AFS still mounted; Not shutting down\n");
+           exit(1);
+       }
        exit(0);
     }
     if (as->parms[21].items) {