STABLE14-windows-freelance-admin-20050817

When testing for IsFreelance() use the right path for symlink rm and
fs rmmount.

(cherry picked from commit c9bba4c460b54c48fe8ecb1b35fbe2a4efd4ac19)

diff --git a/src/WINNT/afsd/fs.c b/src/WINNT/afsd/fs.c
index 5c7d0ad4a7e725fb21e32c9d0f05493da7317bfe..e5a0b6d80aef99fc91e1f846526f47a68d68dd3c 100644 (file)
--- a/src/WINNT/afsd/fs.c
+++ b/src/WINNT/afsd/fs.c
@@ -1943,7 +1943,7 @@ RemoveMountCmd(struct cmd_syndesc *as, char *arock) {
            continue;   /* don't bother trying */
        }
 
-        if ( IsFreelanceRoot(Parent(tp)) && !IsAdmin() ) {
+        if ( IsFreelanceRoot(Parent(ti->data)) && !IsAdmin() ) {
             fprintf(stderr,"%s: Only AFS Client Administrators may alter the root.afs volume\n", pn);
             error = 1;
             continue;   /* skip */

diff --git a/src/WINNT/afsd/symlink.c b/src/WINNT/afsd/symlink.c
index 4ab4cda9ce6418cee3689e8eac378fe5d0ac9009..a1dd36f4b8c3e20c94658c7e33c5e5763c1cf6ba 100644 (file)
--- a/src/WINNT/afsd/symlink.c
+++ b/src/WINNT/afsd/symlink.c
@@ -471,7 +471,7 @@ register struct cmd_syndesc *as; {
            continue;   /* don't bother trying */
        }
 
-        if ( IsFreelanceRoot(Parent(tp)) && !IsAdmin() ) {
+        if ( IsFreelanceRoot(Parent(ti->data)) && !IsAdmin() ) {
             fprintf(stderr,"symlink: Only AFS Client Administrators may alter the root.afs volume\n");
             code = 1;
             continue;   /* skip */