The branch, v3-6-test has been updated
via 59cddbd Detect Mac OS X as a separate client type. (cherry picked
from commit 8dcdebe6ea5a1f2074a60ead803379fcd22df549)
from 8bfbdf5 Ensure we don't return an incorrect access mask.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 59cddbd468fec3da20b73cc229ccbf1f681ff7d4
Author: Justin Maggard <[email protected]>
Date: Thu Feb 24 16:25:30 2011 -0800
Detect Mac OS X as a separate client type.
(cherry picked from commit 8dcdebe6ea5a1f2074a60ead803379fcd22df549)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/smb.conf.5.xml | 1 +
source3/include/smb.h | 2 +-
source3/lib/util.c | 3 +++
source3/smbd/sesssetup.c | 4 ++++
4 files changed, 9 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/smb.conf.5.xml
b/docs-xml/manpages-3/smb.conf.5.xml
index 7423fc4..a9aa32f 100644
--- a/docs-xml/manpages-3/smb.conf.5.xml
+++ b/docs-xml/manpages-3/smb.conf.5.xml
@@ -488,6 +488,7 @@ chmod 1770 /usr/local/samba/lib/usershares
The architecture of the remote
machine. It currently recognizes Samba
(<constant>Samba</constant>),
the Linux CIFS file system (<constant>CIFSFS</constant>),
OS/2, (<constant>OS2</constant>),
+ Mac OS X (<constant>OSX</constant>),
Windows for Workgroups (<constant>WfWg</constant>), Windows
9x/ME
(<constant>Win95</constant>), Windows NT
(<constant>WinNT</constant>),
Windows 2000 (<constant>Win2K</constant>),
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 6d0af8e..e982661 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1500,7 +1500,7 @@ enum ldap_passwd_sync_types {LDAP_PASSWD_SYNC_ON,
LDAP_PASSWD_SYNC_OFF, LDAP_PAS
/* Remote architectures we know about. */
enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT,
RA_WIN2K, RA_WINXP, RA_WIN2K3, RA_VISTA,
- RA_SAMBA, RA_CIFSFS, RA_WINXP64};
+ RA_SAMBA, RA_CIFSFS, RA_WINXP64, RA_OSX};
/* case handling */
enum case_handling {CASE_LOWER,CASE_UPPER};
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 08a24ec..3eb9d17 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1858,6 +1858,9 @@ void set_remote_arch(enum remote_arch_types type)
case RA_CIFSFS:
remote_arch_str = "CIFSFS";
break;
+ case RA_OSX:
+ remote_arch_str = "OSX";
+ break;
default:
ra_type = RA_UNKNOWN;
remote_arch_str = "UNKNOWN";
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 12d0460..903666c 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -1095,6 +1095,10 @@ static void reply_sesssetup_and_X_spnego(struct
smb_request *req)
} else {
ra_lanman_string( native_lanman );
}
+ } else if ( ra_type == RA_VISTA ) {
+ if ( strncmp(native_os, "Mac OS X", 8) == 0 ) {
+ set_remote_arch(RA_OSX);
+ }
}
/* Did we get a valid vuid ? */
--
Samba Shared Repository
