This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / security / dummy.c

diff --git a/security/dummy.c b/security/dummy.c
index 628de35..25b70b0 100644 (file)
--- a/security/dummy.c
+++ b/security/dummy.c
@@ -104,13 +104,6 @@ static int dummy_syslog (int type)
        return 0;
 }
 
-static int dummy_settime(struct timespec *ts, struct timezone *tz)
-{
-       if (!capable(CAP_SYS_TIME))
-               return -EPERM;
-       return 0;
-}
-
 /*
  * Check that a process has enough memory to allocate a new virtual
  * mapping. 0 means there is enough memory for the allocation to
@@ -903,7 +896,6 @@ void security_fixup_ops (struct security_operations *ops)
        set_to_dummy_if_null(ops, quota_on);
        set_to_dummy_if_null(ops, sysctl);
        set_to_dummy_if_null(ops, syslog);
-       set_to_dummy_if_null(ops, settime);
        set_to_dummy_if_null(ops, vm_enough_memory);
        set_to_dummy_if_null(ops, bprm_alloc_security);
        set_to_dummy_if_null(ops, bprm_free_security);