[SCM] Samba Shared Repository - branch master updated

[Christian Ambach]

The branch, master has been updated
       via  847ca0a s3:smbd do not panic when CTDB is unhealthy (Bug #8278)
       via  d2adf96 docs: fix some whitespace
       via  1ae9a71 docs: fix a typo
      from  a611769 rebuildexetendeddn: PEP8: Use spaces rather than tabs.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 847ca0a5d791d881be8d9a0721bf30399c80013b
Author: Christian Ambach <ambi at samba.org>
Date:   Wed Jun 29 15:01:16 2011 +0200

    s3:smbd do not panic when CTDB is unhealthy (Bug #8278)
    
    when CTDB is unhealthy, log a message and exit cleanly
    instead of creating a core file
    
    Autobuild-User: Christian Ambach <ambi at samba.org>
    Autobuild-Date: Thu Jun 30 13:18:12 CEST 2011 on sn-devel-104

commit d2adf96402a0ee3454778c8ffee970720def66a7
Author: Christian Ambach <ambi at samba.org>
Date:   Wed Jun 29 09:24:44 2011 +0200

    docs: fix some whitespace
    
    replace spaces with tabs, removing whitespaces at end of lines

commit 1ae9a7160c49b3afc401f219a25f721daa2835fd
Author: Christian Ambach <ambi at samba.org>
Date:   Tue Jun 28 23:17:35 2011 +0200

    docs: fix a typo

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/protocol/enableasusupport.xml |   12 ++++++------
 source3/smbd/server.c                             |    9 +++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/protocol/enableasusupport.xml b/docs-xml/smbdotconf/protocol/enableasusupport.xml
index bb56b5a..8f25103 100644
--- a/docs-xml/smbdotconf/protocol/enableasusupport.xml
+++ b/docs-xml/smbdotconf/protocol/enableasusupport.xml
@@ -1,15 +1,15 @@
 <samba:parameter name="enable asu support"
-                 context="G"
-                 advanced="1" developer="1"
+		 context="G"
+		 advanced="1" developer="1"
 		 type="boolean"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-    <para>Hosts running the "Advanced Server for Unix (ASU)" product 
-    require some special accomodations such as creating a builtin [ADMIN$] 
+    <para>Hosts running the "Advanced Server for Unix (ASU)" product
+    require some special accomodations such as creating a builtin [ADMIN$]
     share that only supports IPC connections.  The has been the default
     behavior in smbd for many years.  However, certain Microsoft applications
     such as the Print Migrator tool require that the remote server support
-    an [ADMIN$} file share.  Disabling this parameter allows for creating 
+    an [ADMIN$] file share.  Disabling this parameter allows for creating
     an [ADMIN$] file share in smb.conf.</para>
 </description>
 
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 5aa3ddb..03d971b 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -443,6 +443,15 @@ static void smbd_accept_connection(struct tevent_context *ev,
 					 "because too many files are open\n"));
 				goto exit;
 			}
+			if (lp_clustering() &&
+			    NT_STATUS_EQUAL(status,
+			    NT_STATUS_INTERNAL_DB_ERROR)) {
+				DEBUG(1,("child process cannot initialize "
+					 "because connection to CTDB "
+					 "has failed\n"));
+				goto exit;
+			}
+
 			DEBUG(0,("reinit_after_fork() failed\n"));
 			smb_panic("reinit_after_fork() failed");
 		}


-- 
Samba Shared Repository