diff options
Diffstat (limited to 'usr/src/lib/smbsrv/libsmbns/common')
5 files changed, 21 insertions, 22 deletions
diff --git a/usr/src/lib/smbsrv/libsmbns/common/smbns_ads.c b/usr/src/lib/smbsrv/libsmbns/common/smbns_ads.c index 13005345fb..5ec6bb0915 100644 --- a/usr/src/lib/smbsrv/libsmbns/common/smbns_ads.c +++ b/usr/src/lib/smbsrv/libsmbns/common/smbns_ads.c @@ -241,7 +241,7 @@ smb_ads_refresh(void) (void) smb_config_getstr(SMB_CI_ADS_SITE, new_site, SMB_ADS_SITE_MAX); (void) smb_config_getip(SMB_CI_DOMAIN_SRV, &new_pdc); (void) mutex_lock(&smb_ads_cfg.c_mtx); - if (utf8_strcasecmp(smb_ads_cfg.c_site, new_site)) { + if (smb_strcasecmp(smb_ads_cfg.c_site, new_site, 0)) { (void) strlcpy(smb_ads_cfg.c_site, new_site, SMB_ADS_SITE_MAX); purge = B_TRUE; } @@ -380,7 +380,7 @@ smb_ads_is_sought_host(smb_ads_host_info_t *host, char *sought_host_name) if ((host == NULL) || (sought_host_name == NULL)) return (B_FALSE); - if (utf8_strcasecmp(host->name, sought_host_name)) + if (smb_strcasecmp(host->name, sought_host_name, 0)) return (B_FALSE); return (B_TRUE); @@ -405,7 +405,7 @@ smb_ads_is_same_domain(char *cached_host_name, char *current_domain) return (B_FALSE); ++cached_host_domain; - if (utf8_strcasecmp(cached_host_domain, current_domain)) + if (smb_strcasecmp(cached_host_domain, current_domain, 0)) return (B_FALSE); return (B_TRUE); @@ -559,7 +559,7 @@ smb_ads_decode_host_ip(int addit_cnt, int ans_cnt, uchar_t **ptr, for (j = 0; j < ans_cnt; j++) { if ((name = ads_host_list[j].name) == NULL) continue; - if (utf8_strcasecmp(name, hostname) == 0) { + if (smb_strcasecmp(name, hostname, 0) == 0) { ads_host_list[j].ipaddr = ipaddr; } } diff --git a/usr/src/lib/smbsrv/libsmbns/common/smbns_browser.c b/usr/src/lib/smbsrv/libsmbns/common/smbns_browser.c index c98aa6d661..ba79bdc787 100644 --- a/usr/src/lib/smbsrv/libsmbns/common/smbns_browser.c +++ b/usr/src/lib/smbsrv/libsmbns/common/smbns_browser.c @@ -39,7 +39,7 @@ #include <smbsrv/libsmb.h> #include <smbsrv/libsmbns.h> -#include <smbsrv/cifs.h> +#include <smbsrv/smb.h> #include <smbsrv/mailslot.h> #include <smbns_browser.h> #include <smbns_netbios.h> @@ -780,7 +780,7 @@ smb_browser_send_HostAnnouncement(smb_hostinfo_t *hinfo, if (smb_getdomainname(resource_domain, SMB_PI_MAX_DOMAIN) != 0) return; - (void) utf8_strupr(resource_domain); + (void) smb_strupr(resource_domain); if (addr == NULL) { /* Local master Browser */ @@ -1058,7 +1058,7 @@ smb_browser_config(void) if (smb_getdomainname(resource_domain, SMB_PI_MAX_DOMAIN) != 0) return; - (void) utf8_strupr(resource_domain); + (void) smb_strupr(resource_domain); /* domain<00> */ smb_init_name_struct((unsigned char *)resource_domain, NBT_WKSTA, @@ -1156,7 +1156,7 @@ smb_browser_init(void) /* This is the name used for HostAnnouncement */ (void) strlcpy(hinfo->hi_nbname, hinfo->hi_nic.nic_host, NETBIOS_NAME_SZ); - (void) utf8_strupr(hinfo->hi_nbname); + (void) smb_strupr(hinfo->hi_nbname); /* 0x20: file server service */ smb_init_name_struct((unsigned char *)hinfo->hi_nbname, NBT_SERVER, 0, hinfo->hi_nic.nic_ip.a_ipv4, @@ -1193,7 +1193,7 @@ smb_browser_non_master_duties(smb_hostinfo_t *hinfo, boolean_t remove) if (smb_getdomainname(resource_domain, SMB_PI_MAX_DOMAIN) != 0) return; - (void) utf8_strupr(resource_domain); + (void) smb_strupr(resource_domain); smb_init_name_struct((unsigned char *)resource_domain, NBT_MB, 0, 0, 0, 0, 0, &name); diff --git a/usr/src/lib/smbsrv/libsmbns/common/smbns_ksetpwd.c b/usr/src/lib/smbsrv/libsmbns/common/smbns_ksetpwd.c index 6321254c29..304b1292ee 100644 --- a/usr/src/lib/smbsrv/libsmbns/common/smbns_ksetpwd.c +++ b/usr/src/lib/smbsrv/libsmbns/common/smbns_ksetpwd.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -98,7 +98,7 @@ smb_krb5_get_upn(char *spn, char *domain) if (!realm) return (NULL); - (void) utf8_strupr(realm); + (void) smb_strupr(realm); len = strlen(spn) + 1 + strlen(realm) + 1; upn = (char *)malloc(len); @@ -133,7 +133,7 @@ smb_krb5_get_host_upn(const char *fqhn) if ((realm = strdup(++dom)) == NULL) return (NULL); - (void) utf8_strupr(realm); + (void) smb_strupr(realm); len = strlen(spn_prefix[SMBKRB5_SPN_IDX_HOST]) + strlen(fqhn) + + 1 + strlen(realm) + 1; diff --git a/usr/src/lib/smbsrv/libsmbns/common/smbns_netbios.c b/usr/src/lib/smbsrv/libsmbns/common/smbns_netbios.c index 2b6117edc5..d5f029c455 100644 --- a/usr/src/lib/smbsrv/libsmbns/common/smbns_netbios.c +++ b/usr/src/lib/smbsrv/libsmbns/common/smbns_netbios.c @@ -214,7 +214,7 @@ smb_encode_netbios_name(unsigned char *name, char suffix, unsigned char *scope, sizeof (dest->scope)); } - (void) utf8_strupr((char *)dest->scope); + (void) smb_strupr((char *)dest->scope); } void diff --git a/usr/src/lib/smbsrv/libsmbns/common/smbns_netlogon.c b/usr/src/lib/smbsrv/libsmbns/common/smbns_netlogon.c index e34270ce87..d0ebbfbe38 100644 --- a/usr/src/lib/smbsrv/libsmbns/common/smbns_netlogon.c +++ b/usr/src/lib/smbsrv/libsmbns/common/smbns_netlogon.c @@ -92,7 +92,7 @@ smb_netlogon_request(struct name_entry *server, char *domain) (void) mutex_unlock(&ntdomain_mtx); smb_config_getdomaininfo(di.di_nbname, NULL, di.di_sid, NULL, NULL); - if (utf8_strcasecmp(di.di_nbname, domain) == 0) { + if (smb_strcasecmp(di.di_nbname, domain, 0) == 0) { if ((sid = smb_sid_fromstr(di.di_sid)) != NULL) protocol = NETLOGON_PROTO_SAMLOGON; } @@ -132,8 +132,7 @@ smb_netlogon_receive(struct datagram *datagram, smb_msgbuf_t mb; unsigned short opcode; char src_name[SMB_PI_MAX_HOST]; - mts_wchar_t unicode_src_name[SMB_PI_MAX_HOST]; - unsigned int cpid = oem_get_smb_cpid(); + smb_wchar_t unicode_src_name[SMB_PI_MAX_HOST]; uint32_t src_ipaddr; char *junk; char *primary; @@ -149,9 +148,9 @@ smb_netlogon_receive(struct datagram *datagram, * Therefore, we need to convert it to unicode and * store it in multi-bytes format. */ - (void) oemstounicodes(unicode_src_name, (char *)datagram->src.name, - SMB_PI_MAX_HOST, cpid); - (void) mts_wcstombs(src_name, unicode_src_name, SMB_PI_MAX_HOST); + (void) oemtoucs(unicode_src_name, (char *)datagram->src.name, + SMB_PI_MAX_HOST, OEM_CPG_850); + (void) smb_wcstombs(src_name, unicode_src_name, SMB_PI_MAX_HOST); (void) trim_whitespace(src_name); @@ -288,7 +287,7 @@ smb_netlogon_query(struct name_entry *server, * zero bytes that terminate the wchar string. */ data_length = sizeof (short) + name_lengths + (name_lengths & 1) + - mts_wcequiv_strlen(hostname) + 2 + sizeof (long) + sizeof (short) + + smb_wcequiv_strlen(hostname) + 2 + sizeof (long) + sizeof (short) + sizeof (short); offset = smb_browser_load_transact_header(buffer, @@ -381,8 +380,8 @@ smb_netlogon_samlogon(struct name_entry *server, data_length = sizeof (short) + sizeof (short) - + mts_wcequiv_strlen(hostname) + 2 - + mts_wcequiv_strlen(username) + 2 + + smb_wcequiv_strlen(hostname) + 2 + + smb_wcequiv_strlen(username) + 2 + name_length + sizeof (long) + sizeof (long) |