diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 18:05:22 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 18:05:22 +0100 |
| commit | d3c2de093a35d0168fead27787a3da44a39fbea9 (patch) | |
| tree | 255873d0bac66bd7356eaaa45267cdddfee4d406 | |
| parent | 9bd0cf8d60b9bbaafa20f33bb1baf222620fb0b0 (diff) | |
| download | samba-d3c2de093a35d0168fead27787a3da44a39fbea9.tar.gz samba-d3c2de093a35d0168fead27787a3da44a39fbea9.tar.bz2 samba-d3c2de093a35d0168fead27787a3da44a39fbea9.zip | |
Also re-add removed codepoint_t; I'm clearly not having my day today.
| -rw-r--r-- | source3/include/smb.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index 189e370496..f02088731d 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -167,6 +167,10 @@ typedef uint16 smb_ucs2_t; #define COPY_UCS2_CHAR(dest,src) (((unsigned char *)(dest))[0] = ((unsigned char *)(src))[0],\ ((unsigned char *)(dest))[1] = ((unsigned char *)(src))[1], (dest)) +/* Large data type for manipulating uint32 unicode codepoints */ +typedef uint32 codepoint_t; +#define INVALID_CODEPOINT ((codepoint_t)-1) + /* pipe string names */ #define PIPE_LANMAN "\\PIPE\\LANMAN" @@ -1827,6 +1831,18 @@ struct unix_error_map { #define SAFE_NETBIOS_CHARS ". -_" +/* generic iconv conversion structure */ +typedef struct _smb_iconv_t { + size_t (*direct)(void *cd, const char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft); + size_t (*pull)(void *cd, const char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft); + size_t (*push)(void *cd, const char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft); + void *cd_direct, *cd_pull, *cd_push; + char *from_name, *to_name; +} *smb_iconv_t; + /* The maximum length of a trust account password. Used when we randomly create it, 15 char passwords exceed NT4's max password length */ |