adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

netlabel: Fix compilation warnings in net/netlabel/netlabel_addrlist.c

Browse source 
Enable netlabel auditing functions only when CONFIG_AUDIT is set

Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
Signed-off-by: Paul Moore <paul.moore@hp.com>
This commit is contained in:
Manish Katiyar 2008-10-30 10:44:48 -04:00 committed by Paul Moore
parent f8a024796b
commit 47b676c0e0
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/netlabel/netlabel_addrlist.c
View file

@ -315,6 +315,7 @@ struct netlbl_af6list *netlbl_af6list_remove(const struct in6_addr *addr,
* Audit Helper Functions * Audit Helper Functions
*/ */
#ifdef CONFIG_AUDIT
/** /**
* netlbl_af4list_audit_addr - Audit an IPv4 address * netlbl_af4list_audit_addr - Audit an IPv4 address
* @audit_buf: audit buffer * @audit_buf: audit buffer
@ -386,3 +387,4 @@ void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,
} }
} }
#endif /* IPv6 */ #endif /* IPv6 */
#endif /* CONFIG_AUDIT */

22
net/netlabel/netlabel_addrlist.h
View file

@ -120,9 +120,19 @@ struct netlbl_af4list *netlbl_af4list_search(__be32 addr,
struct netlbl_af4list *netlbl_af4list_search_exact(__be32 addr, struct netlbl_af4list *netlbl_af4list_search_exact(__be32 addr,
__be32 mask, __be32 mask,
struct list_head *head); struct list_head *head);
#ifdef CONFIG_AUDIT
void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf, void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf,
int src, const char *dev, int src, const char *dev,
__be32 addr, __be32 mask); __be32 addr, __be32 mask);
#else
static inline void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf,
int src, const char *dev,
__be32 addr, __be32 mask)
{
return;
}
#endif
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
@ -179,11 +189,23 @@ struct netlbl_af6list *netlbl_af6list_search(const struct in6_addr *addr,
struct netlbl_af6list *netlbl_af6list_search_exact(const struct in6_addr *addr, struct netlbl_af6list *netlbl_af6list_search_exact(const struct in6_addr *addr,
const struct in6_addr *mask, const struct in6_addr *mask,
struct list_head *head); struct list_head *head);
#ifdef CONFIG_AUDIT
void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf, void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,
int src, int src,
const char *dev, const char *dev,
const struct in6_addr *addr, const struct in6_addr *addr,
const struct in6_addr *mask); const struct in6_addr *mask);
#else
static inline void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,
int src,
const char *dev,
const struct in6_addr *addr,
const struct in6_addr *mask)
{
return;
}
#endif
#endif /* IPV6 */ #endif /* IPV6 */
#endif #endif