sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

Use shared header file for character sets, remove old definitions from samba3 smb.h.

Browse Source
This commit is contained in:
Jelmer Vernooij 2009-03-01 22:31:10 +01:00
parent 9551ab8f7b
commit 9940c7690e
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/includes.h
View File

@ -594,7 +594,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
#include "trans2.h"
#include "../libcli/util/error.h"
#include "ntioctl.h"
#include "charset.h"
#include "../lib/util/charset/charset.h"
#include "dynconfig.h"
#include "util_getent.h"
#include "debugparse.h"

16
source3/include/smb.h
View File

@ -165,10 +165,6 @@ 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"
@ -1829,18 +1825,6 @@ 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 */