diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 22:25:57 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 22:25:57 +0100 |
commit | 9551ab8f7b0e69349dc0c1ffb70a6f67163b242c (patch) | |
tree | 075bfaec7798dc54db47398ab6ebfe68c85b1573 /source3/include/smb.h | |
parent | 7ab8f373c84c328b197f923287163e83371e7ccb (diff) | |
parent | 8568b4fa9ff8f6f1a24547ec2ed5e2942b213d9e (diff) | |
download | samba-9551ab8f7b0e69349dc0c1ffb70a6f67163b242c.tar.gz samba-9551ab8f7b0e69349dc0c1ffb70a6f67163b242c.tar.bz2 samba-9551ab8f7b0e69349dc0c1ffb70a6f67163b242c.zip |
Merge branch 'master' of git://git.samba.org/samba into convenience
Diffstat (limited to 'source3/include/smb.h')
-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 59c3c32346..5c2bd12df0 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -165,6 +165,10 @@ typedef union unid_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" @@ -1825,6 +1829,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 */ |