diff options
| author | Alan Wright <amw@Sun.COM> | 2009-10-05 11:03:34 -0700 |
|---|---|---|
| committer | Alan Wright <amw@Sun.COM> | 2009-10-05 11:03:34 -0700 |
| commit | a0aa776e20803c84edd153d9cb584fd67163aef3 (patch) | |
| tree | f72052300c24a23ddce016aed02794a33cf3f7a7 /usr/src/lib/smbsrv/libsmb/common/smb_sam.c | |
| parent | 5dfbf9be7aa351a2746b8259a906f60caf81fdcf (diff) | |
| download | illumos-gate-a0aa776e20803c84edd153d9cb584fd67163aef3.tar.gz | |
6612607 CIFS ADS client should use ldap_sasl_interactive_bind_s API
6877755 smbd should not route stderr, stdout to /dev/null
6882701 Wrong error message for attempt to map local user to Windows group, or vice versa
6885105 Potential for deadlock in smb_node_set_delete_on_close()
6881928 smbd core generated when running a script to join domain, set abe properties
6885538 Reduce dependencies on libsmbrdr
6820325 cifs service can't start on multi vlan+ipmp configuration
Diffstat (limited to 'usr/src/lib/smbsrv/libsmb/common/smb_sam.c')
| -rw-r--r-- | usr/src/lib/smbsrv/libsmb/common/smb_sam.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr/src/lib/smbsrv/libsmb/common/smb_sam.c b/usr/src/lib/smbsrv/libsmb/common/smb_sam.c index 4c4721239a..9c92ad6a60 100644 --- a/usr/src/lib/smbsrv/libsmb/common/smb_sam.c +++ b/usr/src/lib/smbsrv/libsmb/common/smb_sam.c @@ -96,7 +96,7 @@ uint32_t smb_sam_lookup_name(char *domain, char *name, uint16_t type, smb_account_t *account) { - nt_domain_t di; + smb_domain_t di; smb_sid_t *sid; uint32_t status; smb_lwka_t *lwka; @@ -104,15 +104,15 @@ smb_sam_lookup_name(char *domain, char *name, uint16_t type, bzero(account, sizeof (smb_account_t)); if (domain != NULL) { - if (!nt_domain_lookup_name(domain, &di) || - (di.di_type != NT_DOMAIN_LOCAL)) + if (!smb_domain_lookup_name(domain, &di) || + (di.di_type != SMB_DOMAIN_LOCAL)) return (NT_STATUS_NOT_FOUND); /* Only Netbios hostname is accepted */ if (utf8_strcasecmp(domain, di.di_nbname) != 0) return (NT_STATUS_NONE_MAPPED); } else { - if (!nt_domain_lookup_type(NT_DOMAIN_LOCAL, &di)) + if (!smb_domain_lookup_type(SMB_DOMAIN_LOCAL, &di)) return (NT_STATUS_CANT_ACCESS_DOMAIN_INFO); } @@ -209,7 +209,7 @@ smb_sam_lookup_sid(smb_sid_t *sid, smb_account_t *account) smb_passwd_t smbpw; smb_group_t grp; smb_lwka_t *lwka; - nt_domain_t di; + smb_domain_t di; uint32_t rid; uid_t id; int id_type; @@ -217,7 +217,7 @@ smb_sam_lookup_sid(smb_sid_t *sid, smb_account_t *account) bzero(account, sizeof (smb_account_t)); - if (!nt_domain_lookup_type(NT_DOMAIN_LOCAL, &di)) + if (!smb_domain_lookup_type(SMB_DOMAIN_LOCAL, &di)) return (NT_STATUS_CANT_ACCESS_DOMAIN_INFO); if (smb_sid_cmp(sid, di.di_binsid)) { @@ -362,17 +362,17 @@ smb_sam_usr_groups(smb_sid_t *user_sid, smb_ids_t *gids) * in /var/smb/smbgroup.db */ int -smb_sam_grp_cnt(nt_domain_type_t dtype) +smb_sam_grp_cnt(smb_domain_type_t dtype) { int grpcnt; int rc; switch (dtype) { - case NT_DOMAIN_BUILTIN: + case SMB_DOMAIN_BUILTIN: rc = smb_lgrp_numbydomain(SMB_LGRP_BUILTIN, &grpcnt); break; - case NT_DOMAIN_LOCAL: + case SMB_DOMAIN_LOCAL: rc = smb_lgrp_numbydomain(SMB_LGRP_LOCAL, &grpcnt); break; |