diff options
author | Gerald Carter <jerry@samba.org> | 2005-09-30 17:13:37 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2005-09-30 17:13:37 +0000 |
commit | 796cade5585f1237e2c047293ad6a9b8a4e923ba (patch) | |
tree | 5f3a22ba40783ce548328a44b9262a451f33ad27 /source/libsmb/spnego.c | |
parent | 38730479cfd0c1d46fcb8950fc30da3fa3f8b154 (diff) | |
download | samba-796cade5585f1237e2c047293ad6a9b8a4e923ba.tar.gz samba-796cade5585f1237e2c047293ad6a9b8a4e923ba.tar.xz samba-796cade5585f1237e2c047293ad6a9b8a4e923ba.zip |
r10656: BIG merge from trunk. Features not copied over
* \PIPE\unixinfo
* winbindd's {group,alias}membership new functions
* winbindd's lookupsids() functionality
* swat (trunk changes to be reverted as per discussion with Deryck)
Diffstat (limited to 'source/libsmb/spnego.c')
-rw-r--r-- | source/libsmb/spnego.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/libsmb/spnego.c b/source/libsmb/spnego.c index 2eaec61ed79..2cf3480fce3 100644 --- a/source/libsmb/spnego.c +++ b/source/libsmb/spnego.c @@ -42,11 +42,11 @@ static BOOL read_negTokenInit(ASN1_DATA *asn1, negTokenInit_t *token) asn1_start_tag(asn1, ASN1_CONTEXT(0)); asn1_start_tag(asn1, ASN1_SEQUENCE(0)); - token->mechTypes = SMB_MALLOC_P(char *); + token->mechTypes = SMB_MALLOC_P(const char *); for (i = 0; !asn1->has_error && 0 < asn1_tag_remaining(asn1); i++) { token->mechTypes = - SMB_REALLOC_ARRAY(token->mechTypes, char *, i + 2); + SMB_REALLOC_ARRAY(token->mechTypes, const char *, i + 2); asn1_read_OID(asn1, &token->mechTypes[i]); } token->mechTypes[i] = NULL; |