[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Wed Mar 7 14:42:01 MST 2012
The branch, master has been updated
via 9788d6a Change default protocol to SMB2_02.
via 0c3474b s3: piddir creation fix part 2.
via e19cf64 addns: Fix the Solaris/Illumos build.
via 25fbf90 s3: piddir creation fix.
from 7b1fb08 s4:librpc/rpc: make dcerpc_bh_raw_call_* more robust against disconnects and timeouts
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9788d6a3489ff5df0de43ce9fabc35b20df52bb1
Author: Jeremy Allison <jra at samba.org>
Date: Wed Mar 7 11:58:51 2012 -0800
Change default protocol to SMB2_02.
Autobuild-User: Jeremy Allison <jra at samba.org>
Autobuild-Date: Wed Mar 7 22:41:21 CET 2012 on sn-devel-104
commit 0c3474b45e9ed8ad85bc524fa131033123da2d51
Author: Ira Cooper <ira at samba.org>
Date: Tue Mar 6 20:58:37 2012 -0500
s3: piddir creation fix part 2.
Since the piddir got moved from the lockdir by default, the default piddir
wasn't getting created, stopping some configurations from running.
Signed-off-by: Jeremy Allison <jra at samba.org>
commit e19cf64356580b965c257f0b3b6ef9ca5b03ed62
Author: Ira Cooper <ira at samba.org>
Date: Tue Mar 6 19:22:46 2012 -0500
addns: Fix the Solaris/Illumos build.
uuid_t is not defined without including sys/uuid.h, configure+waf checks added.
Signed-off-by: Jeremy Allison <jra at samba.org>
commit 25fbf907e90a70e167c56dd63b44b0f5ff1d27a7
Author: Ira Cooper <ira at samba.org>
Date: Tue Mar 6 19:25:16 2012 -0500
s3: piddir creation fix.
Since the piddir got moved from the lockdir by default, the default piddir
wasn't getting created stopping some configurations from running.
Signed-off-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/protocol/maxprotocol.xml | 20 +++++++++++++++++---
lib/addns/dnsutils.c | 4 ++++
lib/addns/wscript | 6 ++++++
source3/configure.in | 1 +
source3/nmbd/nmbd.c | 4 ++++
source3/param/loadparm.c | 2 +-
source3/smbd/server.c | 3 +++
source3/winbindd/winbindd.c | 4 ++++
wscript | 1 +
9 files changed, 41 insertions(+), 4 deletions(-)
create mode 100644 lib/addns/wscript
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/protocol/maxprotocol.xml b/docs-xml/smbdotconf/protocol/maxprotocol.xml
index 3648a5e..2ecf846 100644
--- a/docs-xml/smbdotconf/protocol/maxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/maxprotocol.xml
@@ -35,8 +35,22 @@
</listitem>
<listitem>
<para><constant>SMB2</constant>: Re-implementation of the SMB protocol.
- Used by Windows Vista and newer. The Samba implementation of SMB2 is
- currently marked experimental!</para>
+ Used by Windows Vista and later versions of Windows. SMB2 has sub protocols available.</para>
+ <itemizedlist>
+ <listitem>
+ <para><constant>SMB2_02</constant>: The earliest SMB2 version.</para>
+ </listitem>
+ <listitem>
+ <para><constant>SMB2_10</constant>: Windows 7 SMB2 version.</para>
+ </listitem>
+ <listitem>
+ <para><constant>SMB2_22</constant>: Early Windows 8 SMB2 version.</para>
+ </listitem>
+ <listitem>
+ <para><constant>SMB2_24</constant>: Windows 8 SMB2 version.</para>
+ </listitem>
+ </itemizedlist>
+ <para>By default SMB2 selects the SMB2_02 varient.</para>
</listitem>
</itemizedlist>
@@ -48,6 +62,6 @@
<related>min protocol</related>
<synonym>protocol</synonym>
-<value type="default">NT1</value>
+<value type="default">SMB2</value>
<value type="example">LANMAN1</value>
</samba:parameter>
diff --git a/lib/addns/dnsutils.c b/lib/addns/dnsutils.c
index 43305a9..5a63c61 100644
--- a/lib/addns/dnsutils.c
+++ b/lib/addns/dnsutils.c
@@ -25,6 +25,10 @@
#include "dns.h"
#include <ctype.h>
+#ifdef HAVE_SYS_UUID_H
+#include <sys/uuid.h>
+#endif
+
static DNS_ERROR LabelList( TALLOC_CTX *mem_ctx,
const char *name,
struct dns_domain_label **presult )
diff --git a/lib/addns/wscript b/lib/addns/wscript
new file mode 100644
index 0000000..99e9358
--- /dev/null
+++ b/lib/addns/wscript
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+import Options
+
+def configure(conf):
+ conf.CHECK_HEADERS('sys/uuid.h')
diff --git a/source3/configure.in b/source3/configure.in
index 8c069a0..3736dcb 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -749,6 +749,7 @@ AC_CHECK_HEADERS(langinfo.h locale.h)
AC_CHECK_HEADERS(xfs/libxfs.h)
AC_CHECK_HEADERS(netgroup.h)
AC_CHECK_HEADERS(linux/falloc.h)
+AC_CHECK_HEADERS(sys/uuid.h)
AC_CHECK_HEADERS(rpcsvc/yp_prot.h,,,[[
#if HAVE_RPC_RPC_H
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 7bd4fac..52d7ed9 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -937,6 +937,10 @@ static bool open_sockets(bool isdaemon, int port)
mkdir(lp_lockdir(), 0755);
}
+ if (!directory_exist(lp_piddir())) {
+ mkdir(lp_piddir(), 0755);
+ }
+
pidfile_create("nmbd");
status = reinit_after_fork(msg, nmbd_event_context(),
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 453c8fd..f4e0133 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4766,7 +4766,7 @@ static void init_globals(bool reinit_globals)
Globals.max_log_size = 5000;
Globals.max_open_files = max_open_files();
Globals.open_files_db_hash_size = SMB_OPEN_DATABASE_TDB_HASH_SIZE;
- Globals.srv_maxprotocol = PROTOCOL_NT1;
+ Globals.srv_maxprotocol = PROTOCOL_SMB2_02;
Globals.srv_minprotocol = PROTOCOL_CORE;
Globals.security = SEC_USER;
Globals.paranoid_server_security = true;
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index e348e0b..22b6a7a 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1216,6 +1216,9 @@ extern void build_options(bool screen);
if (!directory_exist(lp_lockdir()))
mkdir(lp_lockdir(), 0755);
+ if (!directory_exist(lp_piddir()))
+ mkdir(lp_piddir(), 0755);
+
if (is_daemon)
pidfile_create("smbd");
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 3806eb8..d1d36fd 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1404,6 +1404,10 @@ int main(int argc, char **argv, char **envp)
mkdir(lp_lockdir(), 0755);
}
+ if (!directory_exist(lp_piddir())) {
+ mkdir(lp_piddir(), 0755);
+ }
+
/* Setup names. */
if (!init_names())
diff --git a/wscript b/wscript
index 5901f5a..96df563 100755
--- a/wscript
+++ b/wscript
@@ -102,6 +102,7 @@ def configure(conf):
conf.RECURSE('pidl')
conf.RECURSE('selftest')
conf.RECURSE('source3')
+ conf.RECURSE('lib/addns')
conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
--
Samba Shared Repository
More information about the samba-cvs
mailing list