Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e474e30 authored by John Johansen's avatar John Johansen
Browse files

apparmor: rename hname_tail to basename 



Rename to the shorter and more familiar shell cmd name

Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent efeee83a

security/apparmor/include/lib.h

+2 −2
Original line number Diff line number Diff line
@@ -130,12 +130,12 @@ struct aa_policy { 
};



/**

 * hname_tail - find the last component of an hname

 * basename - find the last component of an hname

 * @name: hname to find the base profile name component of  (NOT NULL)

 *

 * Returns: the tail (base profile name) name component of an hname

 */

static inline const char *hname_tail(const char *hname)

static inline const char *basename(const char *hname)

{

	char *split;

security/apparmor/lib.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ bool aa_policy_init(struct aa_policy *policy, const char *prefix, 
	if (!policy->hname)

		return 0;

	/* base.name is a substring of fqname */

	policy->name = (char *)hname_tail(policy->hname);

	policy->name = (char *)basename(policy->hname);

	INIT_LIST_HEAD(&policy->list);

	INIT_LIST_HEAD(&policy->profiles);

security/apparmor/policy.c

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ bool aa_may_manage_policy(int op) 
static struct aa_profile *__list_lookup_parent(struct list_head *lh,

					       struct aa_profile *profile)

{

	const char *base = hname_tail(profile->base.hname);

	const char *base = basename(profile->base.hname);

	long len = base - profile->base.hname;

	struct aa_load_ent *ent;