[SSSD] [PATCH] sss_client: Fix mixed enums

Lukas Slebodnik lslebodn at redhat.com
Mon May 18 13:23:41 UTC 2015


ehlo,

simple patch is attached.

LS
-------------- next part --------------
>From d15ed45b90311514be37724eb8caf512555e06f9 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Wed, 29 Apr 2015 15:23:14 +0200
Subject: [PATCH] sss_client: Fix mixed enums

Error: PW.MIXED_ENUM_TYPE: [#def4]
sssd-1.12.90/src/sss_client/pam_message.c:159: mixed_enum_type: enumerated type mixed with another type
 #  157|                               &buf[rp]);
 #  158|
 #  159|->     rp += add_authtok_item(SSS_PAM_ITEM_AUTHTOK, pi->pam_authtok_type,
 #  160|                              pi->pam_authtok, pi->pam_authtok_size, &buf[rp]);
 #  161|

Error: PW.MIXED_ENUM_TYPE: [#def5]
sssd-1.12.90/src/sss_client/pam_message.c:162: mixed_enum_type: enumerated type mixed with another type
 #  160|                              pi->pam_authtok, pi->pam_authtok_size, &buf[rp]);
 #  161|
 #  162|->     rp += add_authtok_item(SSS_PAM_ITEM_NEWAUTHTOK, pi->pam_newauthtok_type,
 #  163|                              pi->pam_newauthtok, pi->pam_newauthtok_size,
 #  164|
---
 src/sss_client/pam_message.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/sss_client/pam_message.h b/src/sss_client/pam_message.h
index 8ade6d871b840d4d0153bbf56e0d458861ab3816..1c8dd381adb3dd1127a5107c863ed07b996828d5 100644
--- a/src/sss_client/pam_message.h
+++ b/src/sss_client/pam_message.h
@@ -26,6 +26,8 @@
 #include <unistd.h>
 #include <stdint.h>
 
+#include "util/authtok.h"
+
 struct pam_items {
     const char *pam_service;
     const char *pam_user;
@@ -41,9 +43,9 @@ struct pam_items {
     size_t pam_tty_size;
     size_t pam_ruser_size;
     size_t pam_rhost_size;
-    int pam_authtok_type;
+    enum sss_authtok_type pam_authtok_type;
     size_t pam_authtok_size;
-    int pam_newauthtok_type;
+    enum sss_authtok_type pam_newauthtok_type;
     size_t pam_newauthtok_size;
     pid_t cli_pid;
     const char *login_name;
-- 
2.4.0



More information about the sssd-devel mailing list