[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-903-g91a55fc

[Günther Deschner]

The branch, v3-2-test has been updated
       via  91a55fc27dc100cf193cfa2613771312f018449e (commit)
       via  0a6a5d082426ca82accf18fffa7740683a42cac1 (commit)
      from  260efafb8fb6527eb0a182f9a6bfed8239dd8315 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 91a55fc27dc100cf193cfa2613771312f018449e
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 14 15:48:23 2008 +0200

    doserr: Add WERR_INVALID_DOMAIN_STATE and WERR_INVALID_DOMAIN_ROLE.
    
    Guenther

commit 0a6a5d082426ca82accf18fffa7740683a42cac1
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 14 15:47:30 2008 +0200

    net: the success of secrets_init is checked by libnetjoin now.
    
    Guenther

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

Summary of changes:
 source/include/doserr.h |    2 ++
 source/libsmb/doserr.c  |    2 ++
 source/utils/net_ads.c  |    6 ------
 3 files changed, 4 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/doserr.h b/source/include/doserr.h
index 1d1cc49..684f172 100644
--- a/source/include/doserr.h
+++ b/source/include/doserr.h
@@ -211,6 +211,8 @@
 #define WERR_LOGON_FAILURE W_ERROR(1326)
 #define WERR_NO_SUCH_DOMAIN W_ERROR(1355)
 #define WERR_INVALID_SECURITY_DESCRIPTOR W_ERROR(1338)
+#define WERR_INVALID_DOMAIN_STATE W_ERROR(1353)
+#define WERR_INVALID_DOMAIN_ROLE W_ERROR(1354)
 #define WERR_TIME_SKEW W_ERROR(1398)
 #define WERR_EVENTLOG_FILE_CORRUPT W_ERROR(1500)
 #define WERR_SERVER_UNAVAILABLE W_ERROR(1722)
diff --git a/source/libsmb/doserr.c b/source/libsmb/doserr.c
index cd3c2fe..fb5f2e1 100644
--- a/source/libsmb/doserr.c
+++ b/source/libsmb/doserr.c
@@ -86,6 +86,8 @@ werror_code_struct dos_errs[] =
 	{ "WERR_PASSWORD_RESTRICTION", WERR_PASSWORD_RESTRICTION },
 	{ "WERR_NO_SUCH_DOMAIN", WERR_NO_SUCH_DOMAIN },
 	{ "WERR_INVALID_SECURITY_DESCRIPTOR", WERR_INVALID_SECURITY_DESCRIPTOR },
+	{ "WERR_INVALID_DOMAIN_STATE", WERR_INVALID_DOMAIN_STATE },
+	{ "WERR_INVALID_DOMAIN_ROLE", WERR_INVALID_DOMAIN_ROLE },
 	{ "WERR_TIME_SKEW", WERR_TIME_SKEW },
 	{ "WERR_INVALID_OWNER", WERR_INVALID_OWNER },
 	{ "WERR_SERVER_UNAVAILABLE", WERR_SERVER_UNAVAILABLE },
diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index 28ae7d7..9c8d1fb 100644
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -938,12 +938,6 @@ static NTSTATUS check_ads_config( void )
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
-	if (!secrets_init()) {
-		DEBUG(1,("Failed to initialise secrets database\n"));
-		/* This is a good bet for failure of secrets_init ... */
-		return NT_STATUS_ACCESS_DENIED;
-	}
-
 	return NT_STATUS_OK;
 }
 


-- 
Samba Shared Repository