mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from trunk revs 1660 and 1661: Update swig to export all current

Browse source 
interface fns, and update change_hatv and change_hat_vargs prototypes to
use long (this would be an ABI change; however, there are no known users
of those particular functions).

Acked-By: Steve Beattie <sbeattie@ubuntu.com>
This commit is contained in:
Steve Beattie 2011-03-07 07:56:00 -08:00
parent 03b8aee481
commit 04b428bc32
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/libapparmor/src/apparmor.h
View file

@ -31,8 +31,8 @@ extern int aa_change_hat(const char *subprofile, unsigned long magic_token);
extern int aa_change_profile(const char *profile); extern int aa_change_profile(const char *profile);
extern int aa_change_onexec(const char *profile); extern int aa_change_onexec(const char *profile);
extern int aa_change_hatv(const char *subprofiles[], unsigned int token); extern int aa_change_hatv(const char *subprofiles[], unsigned long token);
extern int (aa_change_hat_vargs)(unsigned int token, int count, ...); extern int (aa_change_hat_vargs)(unsigned long token, int count, ...);
#define __macroarg_counter(Y...) __macroarg_count1 ( , ##Y) #define __macroarg_counter(Y...) __macroarg_count1 ( , ##Y)
#define __macroarg_count1(Y...) __macroarg_count2 (Y, 16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0) #define __macroarg_count1(Y...) __macroarg_count2 (Y, 16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0)

15
libraries/libapparmor/swig/SWIG/libapparmor.i
View file

@ -2,13 +2,20 @@
%{ %{
#include "aalogparse.h" #include "aalogparse.h"
extern int aa_change_hat(const char *subprofile, unsigned long magic_token); #include "apparmor.h"
extern int aa_change_profile(const char *profile, unsigned long magic_token);
%} %}
%include "typemaps.i" %include "typemaps.i"
%include "aalogparse.h" %include "aalogparse.h"
extern int aa_change_hat(const char *subprofile, unsigned long magic_token);
extern int aa_change_profile(const char *profile, unsigned long magic_token); /* swig doesn't like the macro magic we do in apparmor.h so the fn prototypes
* are manually inserted here
*/
extern int aa_change_hat(const char *subprofile, unsigned long magic_token);
extern int aa_change_profile(const char *profile);
extern int aa_change_onexec(const char *profile);
extern int aa_change_hatv(const char *subprofiles[], unsigned long token);
extern int aa_change_hat_vargs(unsigned long token, int count, ...);