diff options
| author | Gerald Carter <jerry@samba.org> | 2006-09-08 14:28:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:51:18 -0500 |
| commit | 2b27c93a9a8471693d7dcb5fdbe8afe65b22ff66 (patch) | |
| tree | 75f48eabc8ea83e437bbeb5df541c8162b75d09f /source3/include/charset.h | |
| parent | c2d59d817021b8faacbb035d8d7dd727bc14344c (diff) | |
| download | samba-2b27c93a9a8471693d7dcb5fdbe8afe65b22ff66.tar.gz samba-2b27c93a9a8471693d7dcb5fdbe8afe65b22ff66.tar.bz2 samba-2b27c93a9a8471693d7dcb5fdbe8afe65b22ff66.zip | |
r18271: Big change:
* autogenerate lsa ndr code
* rename 'enum SID_NAME_USE' to 'enum lsa_SidType'
* merge a log more security descriptor functions from
gen_ndr/ndr_security.c in SAMBA_4_0
The most embarassing thing is the "#define strlen_m strlen"
We need a real implementation in SAMBA_3_0 which I'll work on
after this code is in.
(This used to be commit 3da9f80c28b1e75ef6d46d38fbb81ade6b9fa951)
Diffstat (limited to 'source3/include/charset.h')
| -rw-r--r-- | source3/include/charset.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source3/include/charset.h b/source3/include/charset.h index c5d03a62e8..1edf12309a 100644 --- a/source3/include/charset.h +++ b/source3/include/charset.h @@ -20,7 +20,13 @@ */ /* this defines the charset types used in samba */ -typedef enum {CH_UCS2=0, CH_UNIX=1, CH_DISPLAY=2, CH_DOS=3, CH_UTF8=4} charset_t; +typedef enum {CH_UCS2=0, CH_UTF16=0, CH_UNIX=1, CH_DISPLAY=2, CH_DOS=3, CH_UTF8=4} charset_t; + +/* FIXME!!! Hack job for now to get the lsa ndr code compiling */ +#ifndef strlen_m +#define strlen_m strlen +#endif + #define NUM_CHARSETS 5 |