diff options
| author | Ira Cooper <ira@samba.org> | 2013-01-16 11:33:31 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-01-18 22:13:09 +0100 |
| commit | 63a7d3817fae3ec190a7919521cc0f5dbdea3b64 (patch) | |
| tree | c16e7062e85d16df2fdb1916c9356a6672e105a3 | |
| parent | d814cfac017039ae8fc0d1311b15cc03f4c8b2ba (diff) | |
| download | samba-63a7d3817fae3ec190a7919521cc0f5dbdea3b64.tar.gz samba-63a7d3817fae3ec190a7919521cc0f5dbdea3b64.tar.bz2 samba-63a7d3817fae3ec190a7919521cc0f5dbdea3b64.zip | |
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 <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Jan 18 22:13:09 CET 2013 on sn-devel-104
| -rw-r--r-- | 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 41756b6552..4a41ba3843 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) |