diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-10-23 12:56:30 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-10-23 12:56:30 +1100 |
commit | 596089ec06b0a2b2ec3e0e5bd6d46c2e767bd954 (patch) | |
tree | 06371bc9dcf7a876ed88575b6621889b4a6e6120 /source3/libsmb | |
parent | e79835b096c716124ac5d6e78610e5a76172e649 (diff) | |
parent | 2f1dbddc3f5433b5b5c542cd3c8fa3050499d8e9 (diff) | |
download | samba-596089ec06b0a2b2ec3e0e5bd6d46c2e767bd954.tar.gz samba-596089ec06b0a2b2ec3e0e5bd6d46c2e767bd954.tar.bz2 samba-596089ec06b0a2b2ec3e0e5bd6d46c2e767bd954.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
Diffstat (limited to 'source3/libsmb')
-rw-r--r-- | source3/libsmb/clispnego.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c index fd312a4c0a..fb95d71925 100644 --- a/source3/libsmb/clispnego.c +++ b/source3/libsmb/clispnego.c @@ -152,7 +152,7 @@ bool spnego_parse_negTokenInit(DATA_BLOB blob, for (i=0; asn1_tag_remaining(data) > 0 && i < ASN1_MAX_OIDS-1; i++) { const char *oid_str = NULL; asn1_read_OID(data,NULL,&oid_str); - OIDs[i] = oid_str; + OIDs[i] = CONST_DISCARD(char *, oid_str); } OIDs[i] = NULL; asn1_end_tag(data); @@ -257,7 +257,7 @@ bool parse_negTokenTarg(DATA_BLOB blob, char *OIDs[ASN1_MAX_OIDS], DATA_BLOB *se for (i=0; asn1_tag_remaining(data) > 0 && i < ASN1_MAX_OIDS-1; i++) { const char *oid_str = NULL; asn1_read_OID(data,NULL,&oid_str); - OIDs[i] = oid_str; + OIDs[i] = CONST_DISCARD(char *, oid_str); } OIDs[i] = NULL; asn1_end_tag(data); |