diff options
author | Eric Paris <eparis@redhat.com> | 2010-04-07 15:15:19 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-04-11 22:19:18 -0400 |
commit | 3011a344cdcda34cdbcb40c3fb3d1a6e89954abb (patch) | |
tree | 43db9abc5f96cd8ec31a4a24f0d52dae76680a1c /include | |
parent | 6307f8fee295b364716d28686df6e69c2fee751a (diff) |
security: remove dead hook key_session_to_parent
Unused hook. Remove.
Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/security.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 73505f0c9b7..ac536eedec9 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -1067,13 +1067,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) | |||
1067 | * Return the length of the string (including terminating NUL) or -ve if | 1067 | * Return the length of the string (including terminating NUL) or -ve if |
1068 | * an error. | 1068 | * an error. |
1069 | * May also return 0 (and a NULL buffer pointer) if there is no label. | 1069 | * May also return 0 (and a NULL buffer pointer) if there is no label. |
1070 | * @key_session_to_parent: | ||
1071 | * Forcibly assign the session keyring from a process to its parent | ||
1072 | * process. | ||
1073 | * @cred: Pointer to process's credentials | ||
1074 | * @parent_cred: Pointer to parent process's credentials | ||
1075 | * @keyring: Proposed new session keyring | ||
1076 | * Return 0 if permission is granted, -ve error otherwise. | ||
1077 | * | 1070 | * |
1078 | * Security hooks affecting all System V IPC operations. | 1071 | * Security hooks affecting all System V IPC operations. |
1079 | * | 1072 | * |
@@ -1642,9 +1635,6 @@ struct security_operations { | |||
1642 | const struct cred *cred, | 1635 | const struct cred *cred, |
1643 | key_perm_t perm); | 1636 | key_perm_t perm); |
1644 | int (*key_getsecurity)(struct key *key, char **_buffer); | 1637 | int (*key_getsecurity)(struct key *key, char **_buffer); |
1645 | int (*key_session_to_parent)(const struct cred *cred, | ||
1646 | const struct cred *parent_cred, | ||
1647 | struct key *key); | ||
1648 | #endif /* CONFIG_KEYS */ | 1638 | #endif /* CONFIG_KEYS */ |
1649 | 1639 | ||
1650 | #ifdef CONFIG_AUDIT | 1640 | #ifdef CONFIG_AUDIT |
@@ -2918,9 +2908,6 @@ void security_key_free(struct key *key); | |||
2918 | int security_key_permission(key_ref_t key_ref, | 2908 | int security_key_permission(key_ref_t key_ref, |
2919 | const struct cred *cred, key_perm_t perm); | 2909 | const struct cred *cred, key_perm_t perm); |
2920 | int security_key_getsecurity(struct key *key, char **_buffer); | 2910 | int security_key_getsecurity(struct key *key, char **_buffer); |
2921 | int security_key_session_to_parent(const struct cred *cred, | ||
2922 | const struct cred *parent_cred, | ||
2923 | struct key *key); | ||
2924 | 2911 | ||
2925 | #else | 2912 | #else |
2926 | 2913 | ||
@@ -2948,13 +2935,6 @@ static inline int security_key_getsecurity(struct key *key, char **_buffer) | |||
2948 | return 0; | 2935 | return 0; |
2949 | } | 2936 | } |
2950 | 2937 | ||
2951 | static inline int security_key_session_to_parent(const struct cred *cred, | ||
2952 | const struct cred *parent_cred, | ||
2953 | struct key *key) | ||
2954 | { | ||
2955 | return 0; | ||
2956 | } | ||
2957 | |||
2958 | #endif | 2938 | #endif |
2959 | #endif /* CONFIG_KEYS */ | 2939 | #endif /* CONFIG_KEYS */ |
2960 | 2940 | ||