[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-303-gafc6f60

Volker Lendecke vlendec at samba.org
Fri Jul 10 20:02:30 GMT 2009


The branch, master has been updated
       via  afc6f607d5c8ba995b55464525edc8bf8f7a040c (commit)
       via  d8556bbf1394439d0880983c7dff67dd8dda66b0 (commit)
      from  4e516fb19146399546bd9cd249ee3adb60c07e16 (commit)

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


- Log -----------------------------------------------------------------
commit afc6f607d5c8ba995b55464525edc8bf8f7a040c
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jul 9 15:58:10 2009 +0200

    Return 0 domains from enum_trusteddoms

commit d8556bbf1394439d0880983c7dff67dd8dda66b0
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Jul 5 14:39:16 2009 +0200

    Quieten events and tldap debug messages

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

Summary of changes:
 source3/lib/events.c     |    2 +-
 source3/passdb/pdb_ads.c |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/events.c b/source3/lib/events.c
index 08debb4..7a06ad0 100644
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -286,7 +286,7 @@ static void s3_event_debug(void *context, enum tevent_debug_level level,
 		samba_level = 2;
 		break;
 	case TEVENT_DEBUG_TRACE:
-		samba_level = 10;
+		samba_level = 11;
 		break;
 
 	};
diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index eec6372..ddfeb8e 100644
--- a/source3/passdb/pdb_ads.c
+++ b/source3/passdb/pdb_ads.c
@@ -2022,7 +2022,9 @@ static NTSTATUS pdb_ads_enum_trusteddoms(struct pdb_methods *m,
 					 uint32 *num_domains,
 					 struct trustdom_info ***domains)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	*num_domains = 0;
+	*domains = NULL;
+	return NT_STATUS_OK;
 }
 
 static void pdb_ads_init_methods(struct pdb_methods *m)
@@ -2111,7 +2113,7 @@ static void s3_tldap_debug(void *context, enum tldap_debug_level level,
 		samba_level = 2;
 		break;
 	case TLDAP_DEBUG_TRACE:
-		samba_level = 10;
+		samba_level = 11;
 		break;
 
 	};


-- 
Samba Shared Repository


More information about the samba-cvs mailing list