Mercurial > illumos > git > illumos-omnios
changeset 21415:4526915ff3e9
10999 Misc. SMB changes missed in prior upstreams
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
| author | Gordon Ross <gwr@nexenta.com> |
|---|---|
| date | Tue, 19 Mar 2019 14:28:28 -0400 |
| parents | 1ff4dd5d126b |
| children | fe2f621c52e3 |
| files | usr/src/cmd/smbsrv/smbd/smbd_authsvc.c usr/src/lib/smbsrv/libsmb/common/libsmb.h usr/src/uts/common/smbsrv/smb_token.h |
| diffstat | 3 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/smbsrv/smbd/smbd_authsvc.c Tue Nov 06 01:27:53 2018 -0500 +++ b/usr/src/cmd/smbsrv/smbd/smbd_authsvc.c Tue Mar 19 14:28:28 2019 -0400 @@ -103,7 +103,7 @@ * But note: it's really the _client's_ preference that matters. * See &pref in the spnegoIsMechTypeAvailable() calls below. * Careful with this table; the code below knows its format and - * may skip the fist two entries to ommit Kerberos. + * may skip the fist two entries to omit Kerberos. */ static const spnego_mech_handler_t mech_table[] = { @@ -785,7 +785,7 @@ /* tell the client the selected mech. */ oid = ctx->ctx_mech_oid; } else { - /* Ommit the "supported mech." field. */ + /* Omit the "supported mech." field. */ oid = spnego_mech_oid_NotUsed; } @@ -919,7 +919,7 @@ /* * Initialization time code to figure out what mechanisms we support. * Careful with this table; the code below knows its format and may - * skip the fist two entries to ommit Kerberos. + * skip the fist two entries to omit Kerberos. */ static SPNEGO_MECH_OID MechTypeList[] = { spnego_mech_oid_Kerberos_V5,
--- a/usr/src/lib/smbsrv/libsmb/common/libsmb.h Tue Nov 06 01:27:53 2018 -0500 +++ b/usr/src/lib/smbsrv/libsmb/common/libsmb.h Tue Mar 19 14:28:28 2019 -0400 @@ -32,6 +32,7 @@ #endif #include <sys/types.h> +#include <sys/inttypes.h> #include <sys/list.h> #include <sys/avl.h> #include <arpa/inet.h>
--- a/usr/src/uts/common/smbsrv/smb_token.h Tue Nov 06 01:27:53 2018 -0500 +++ b/usr/src/uts/common/smbsrv/smb_token.h Tue Mar 19 14:28:28 2019 -0400 @@ -71,8 +71,8 @@ * SMB_ATF_BACKUPOP Token belongs to a Power User member * SMB_ATF_ADMIN Token belongs to a Domain Admins member */ -#define SMB_ATF_GUEST 0x00000001 -#define SMB_ATF_ANON 0x00000002 +#define SMB_ATF_ANON 0x00000001 +#define SMB_ATF_GUEST 0x00000002 #define SMB_ATF_POWERUSER 0x00000004 #define SMB_ATF_BACKUPOP 0x00000008 #define SMB_ATF_ADMIN 0x00000010