X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-auth.c;h=5c62f9f70f7a4b9d5c28e3289ef9e7f7558ceed7;hb=718de20a3cf830ba2da0a6c37e4588e4df251f1d;hp=900ec4c67b0f172fd2f21965e57496e9969e5ad5;hpb=8a4e3b4a91e6aaabd24127bbbff963e449e8deab;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-auth.c b/src/afb-auth.c
index 900ec4c6..5c62f9f7 100644
--- a/src/afb-auth.c
+++ b/src/afb-auth.c
@@ -29,9 +29,9 @@
 #include "afb-cred.h"
 #include "verbose.h"
 
-static int check_permission(const char *permission, struct afb_xreq *xreq);
+static int check_permission(struct afb_xreq *xreq, const char *permission);
 
-int afb_auth_check(const struct afb_auth *auth, struct afb_xreq *xreq)
+int afb_auth_check(struct afb_xreq *xreq, const struct afb_auth *auth)
 {
 	switch (auth->type) {
 	default:
@@ -46,18 +46,18 @@ int afb_auth_check(const struct afb_auth *auth, struct afb_xreq *xreq)
 
 	case afb_auth_Permission:
 		if (xreq->cred && auth->text)
-			return check_permission(auth->text, xreq);
+			return check_permission(xreq, auth->text);
 		/* TODO: handle case of self permission */
 		return 1;
 
 	case afb_auth_Or:
-		return afb_auth_check(auth->first, xreq) || afb_auth_check(auth->next, xreq);
+		return afb_auth_check(xreq, auth->first) || afb_auth_check(xreq, auth->next);
 
 	case afb_auth_And:
-		return afb_auth_check(auth->first, xreq) && afb_auth_check(auth->next, xreq);
+		return afb_auth_check(xreq, auth->first) && afb_auth_check(xreq, auth->next);
 
 	case afb_auth_Not:
-		return !afb_auth_check(auth->first, xreq);
+		return !afb_auth_check(xreq, auth->first);
 
 	case afb_auth_Yes:
 		return 1;
@@ -73,7 +73,7 @@ int afb_auth_check(const struct afb_auth *auth, struct afb_xreq *xreq)
 static cynara *handle;
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
-static int check_permission(const char *permission, struct afb_xreq *xreq)
+static int check_permission(struct afb_xreq *xreq, const char *permission)
 {
 	int rc;
 
@@ -99,7 +99,7 @@ static int check_permission(const char *permission, struct afb_xreq *xreq)
 
 /*********************************************************************************/
 #else
-static int check_permission(const char *permission, struct afb_xreq *xreq)
+static int check_permission(struct afb_xreq *xreq, const char *permission)
 {
 	WARNING("Granting permission %s by default of backend", permission);
 	return 1;