diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/configure.in | 3 | ||||
| -rw-r--r-- | source/libads/ads_status.c | 2 | ||||
| -rw-r--r-- | source/libads/sasl.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/source/configure.in b/source/configure.in index 7de985247f2..fc158a04c76 100644 --- a/source/configure.in +++ b/source/configure.in @@ -1643,6 +1643,9 @@ done if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then AC_MSG_WARN([Sufficient support for iconv function was not found. Install libiconv from http://freshmeat.net/projects/libiconv/ for better charset compatibility!]) + AC_DEFINE_UNQUOTED(DEFAULT_DOS_CHARSET,"CP850",[Default dos charset name]) + AC_DEFINE_UNQUOTED(DEFAULT_DISPLAY_CHARSET,"ASCII",[Default display charset name]) + AC_DEFINE_UNQUOTED(DEFAULT_UNIX_CHARSET,"UTF8",[Default unix charset name]) fi diff --git a/source/libads/ads_status.c b/source/libads/ads_status.c index b8f7788bd7a..11f9d66b92d 100644 --- a/source/libads/ads_status.c +++ b/source/libads/ads_status.c @@ -87,7 +87,7 @@ NTSTATUS ads_ntstatus(ADS_STATUS status) */ const char *ads_errstr(ADS_STATUS status) { - OM_uint32 msg_ctx; + uint32 msg_ctx; static char *ret; SAFE_FREE(ret); diff --git a/source/libads/sasl.c b/source/libads/sasl.c index 0320bb0cfc5..51228035974 100644 --- a/source/libads/sasl.c +++ b/source/libads/sasl.c @@ -227,13 +227,13 @@ failed: */ static ADS_STATUS ads_sasl_gssapi_bind(ADS_STRUCT *ads) { - OM_uint32 minor_status; + uint32 minor_status; gss_name_t serv_name; gss_buffer_desc input_name; gss_ctx_id_t context_handle; gss_OID mech_type = GSS_C_NULL_OID; gss_buffer_desc output_token, input_token; - OM_uint32 ret_flags, conf_state; + uint32 ret_flags, conf_state; struct berval cred; struct berval *scred; int i=0; |