|
@@ -618,7 +618,7 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry)
|
|
|
struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb);
|
|
|
struct autofs_info *ino = autofs4_dentry_ino(dentry);
|
|
|
struct autofs_info *p_ino;
|
|
|
-
|
|
|
+
|
|
|
/* This allows root to remove symlinks */
|
|
|
if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN))
|
|
|
return -EPERM;
|
|
@@ -698,7 +698,7 @@ static int autofs4_dir_rmdir(struct inode *dir, struct dentry *dentry)
|
|
|
struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb);
|
|
|
struct autofs_info *ino = autofs4_dentry_ino(dentry);
|
|
|
struct autofs_info *p_ino;
|
|
|
-
|
|
|
+
|
|
|
DPRINTK("dentry %p, removing %pd", dentry, dentry);
|
|
|
|
|
|
if (!autofs4_oz_mode(sbi))
|
|
@@ -878,10 +878,10 @@ static int autofs4_root_ioctl_unlocked(struct inode *inode, struct file *filp,
|
|
|
if (_IOC_TYPE(cmd) != _IOC_TYPE(AUTOFS_IOC_FIRST) ||
|
|
|
_IOC_NR(cmd) - _IOC_NR(AUTOFS_IOC_FIRST) >= AUTOFS_IOC_COUNT)
|
|
|
return -ENOTTY;
|
|
|
-
|
|
|
+
|
|
|
if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN))
|
|
|
return -EPERM;
|
|
|
-
|
|
|
+
|
|
|
switch (cmd) {
|
|
|
case AUTOFS_IOC_READY: /* Wait queue: go ahead and retry */
|
|
|
return autofs4_wait_release(sbi, (autofs_wqt_t) arg, 0);
|