From d814cfac017039ae8fc0d1311b15cc03f4c8b2ba Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 16 Jan 2013 11:31:32 -0800 Subject: [PATCH 1/2] Sort winbind request flags. Ira saw we have a duplicate. Signed-off-by: Jeremy Allison Reviewed by: Ira Cooper Reviewed-by: Andrew Bartlett --- nsswitch/winbind_struct_protocol.h | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nsswitch/winbind_struct_protocol.h b/nsswitch/winbind_struct_protocol.h index c1704c8..41756b6 100644 --- a/nsswitch/winbind_struct_protocol.h +++ b/nsswitch/winbind_struct_protocol.h @@ -205,30 +205,30 @@ typedef struct winbindd_gr { uint32_t gr_mem_ofs; /* offset to group membership */ } WINBINDD_GR; -/* PAM specific request flags */ +/* Request flags */ #define WBFLAG_PAM_INFO3_NDR 0x00000001 #define WBFLAG_PAM_INFO3_TEXT 0x00000002 #define WBFLAG_PAM_USER_SESSION_KEY 0x00000004 #define WBFLAG_PAM_LMKEY 0x00000008 #define WBFLAG_PAM_CONTACT_TRUSTDOM 0x00000010 +#define WBFLAG_QUERY_ONLY 0x00000020 /* not used */ +#define WBFLAG_UNUSED_1 0x00000040 /* not currently used */ #define WBFLAG_PAM_UNIX_NAME 0x00000080 #define WBFLAG_PAM_AFS_TOKEN 0x00000100 #define WBFLAG_PAM_NT_STATUS_SQUASH 0x00000200 -#define WBFLAG_PAM_KRB5 0x00001000 -#define WBFLAG_PAM_FALLBACK_AFTER_KRB5 0x00002000 -#define WBFLAG_PAM_CACHED_LOGIN 0x00004000 -#define WBFLAG_PAM_GET_PWD_POLICY 0x00008000 -#define WBFLAG_PAM_AUTH_PAC 0x00010000 - -/* generic request flags */ -#define WBFLAG_QUERY_ONLY 0x00000020 /* not used */ /* This is a flag that can only be sent from parent to child */ #define WBFLAG_IS_PRIVILEGED 0x00000400 /* not used */ /* Flag to say this is a winbindd internal send - don't recurse. */ #define WBFLAG_RECURSE 0x00000800 +#define WBFLAG_PAM_KRB5 0x00001000 +#define WBFLAG_PAM_FALLBACK_AFTER_KRB5 0x00002000 +#define WBFLAG_PAM_CACHED_LOGIN 0x00004000 +#define WBFLAG_PAM_GET_PWD_POLICY 0x00008000 /* Flag to tell winbind the NTLMv2 blob is too big for the struct and is in the * extra_data field */ #define WBFLAG_BIG_NTLMV2_BLOB 0x00010000 +/* Duplicate. FIXME !!!! */ +#define WBFLAG_PAM_AUTH_PAC 0x00010000 #define WINBINDD_MAX_EXTRA_DATA (128*1024) -- 1.7.7.3 From a5381b0da2aeb995613ad2186a619ec3b584d7a4 Mon Sep 17 00:00:00 2001 From: Ira Cooper Date: Wed, 16 Jan 2013 11:33:31 -0800 Subject: [PATCH 2/2] nsswitch: Fix two bitfield constants being the same. WBFLAG_PAM_AUTH_PAC and WBFLAG_BIG_NTLMV2_BLOB are the same causing errors in NTLMv2 authentication. Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison --- nsswitch/winbind_struct_protocol.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/nsswitch/winbind_struct_protocol.h b/nsswitch/winbind_struct_protocol.h index 41756b6..4a41ba3 100644 --- a/nsswitch/winbind_struct_protocol.h +++ b/nsswitch/winbind_struct_protocol.h @@ -212,7 +212,7 @@ typedef struct winbindd_gr { #define WBFLAG_PAM_LMKEY 0x00000008 #define WBFLAG_PAM_CONTACT_TRUSTDOM 0x00000010 #define WBFLAG_QUERY_ONLY 0x00000020 /* not used */ -#define WBFLAG_UNUSED_1 0x00000040 /* not currently used */ +#define WBFLAG_PAM_AUTH_PAC 0x00000040 #define WBFLAG_PAM_UNIX_NAME 0x00000080 #define WBFLAG_PAM_AFS_TOKEN 0x00000100 #define WBFLAG_PAM_NT_STATUS_SQUASH 0x00000200 @@ -227,8 +227,6 @@ typedef struct winbindd_gr { /* Flag to tell winbind the NTLMv2 blob is too big for the struct and is in the * extra_data field */ #define WBFLAG_BIG_NTLMV2_BLOB 0x00010000 -/* Duplicate. FIXME !!!! */ -#define WBFLAG_PAM_AUTH_PAC 0x00010000 #define WINBINDD_MAX_EXTRA_DATA (128*1024) -- 1.7.7.3