[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Mon Oct 10 12:15:03 MDT 2011
The branch, master has been updated
via 795aefe s3-passdb: split out passdb/pdb_smbpasswd.h.
via 8c2f72d s3-passdb: split out passdb/pdb_wbc_sam.h.
via efab008 s3-passdb: split out passdb/pdb_tdb.h.
from 7119c8b s3-net: when all DNS servers fail to operate, the overal DNS registration result must be a failure.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 795aefec0c77da0ab49d89ef9c31862e822b68e5
Author: Günther Deschner <gd at samba.org>
Date: Tue Oct 4 17:35:31 2011 +0200
s3-passdb: split out passdb/pdb_smbpasswd.h.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Mon Oct 10 20:14:46 CEST 2011 on sn-devel-104
commit 8c2f72d6b86a7607e2563bb8149bb338575be2ee
Author: Günther Deschner <gd at samba.org>
Date: Tue Oct 4 17:32:41 2011 +0200
s3-passdb: split out passdb/pdb_wbc_sam.h.
Guenther
commit efab0086ba154ef50256a66325661d7b3d636df5
Author: Günther Deschner <gd at samba.org>
Date: Tue Oct 4 17:31:59 2011 +0200
s3-passdb: split out passdb/pdb_tdb.h.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/passdb/pdb_smbpasswd.c | 1 +
.../reg_init_basic.h => passdb/pdb_smbpasswd.h} | 22 ++++++++++-------
source3/passdb/pdb_tdb.c | 1 +
.../reg_init_basic.h => passdb/pdb_tdb.h} | 24 ++++++++++++-------
source3/passdb/pdb_wbc_sam.c | 1 +
.../sddl.h => source3/passdb/pdb_wbc_sam.h | 23 ++++++++++---------
source3/passdb/proto.h | 12 ----------
7 files changed, 43 insertions(+), 41 deletions(-)
copy source3/{registry/reg_init_basic.h => passdb/pdb_smbpasswd.h} (53%)
copy source3/{registry/reg_init_basic.h => passdb/pdb_tdb.h} (51%)
copy libcli/security/sddl.h => source3/passdb/pdb_wbc_sam.h (61%)
Changeset truncated at 500 lines:
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 2cfacd3..6dbb72a 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -26,6 +26,7 @@
#include "system/filesys.h"
#include "../librpc/gen_ndr/samr.h"
#include "../libcli/security/security.h"
+#include "passdb/pdb_smbpasswd.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_PASSDB
diff --git a/source3/registry/reg_init_basic.h b/source3/passdb/pdb_smbpasswd.h
similarity index 53%
copy from source3/registry/reg_init_basic.h
copy to source3/passdb/pdb_smbpasswd.h
index 4149b5d..ccabd38 100644
--- a/source3/registry/reg_init_basic.h
+++ b/source3/passdb/pdb_smbpasswd.h
@@ -1,10 +1,13 @@
/*
* Unix SMB/CIFS implementation.
- * Registry helper routines
- * Copyright (C) Michael Adam 2008
+ * SMB parameters and setup
+ * Copyright (C) Andrew Tridgell 1992-1998
+ * Modified by Jeremy Allison 1995.
+ * Modified by Gerald (Jerry) Carter 2000-2001,2003
+ * Modified by Andrew Bartlett 2002.
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option)
* any later version.
*
@@ -17,10 +20,11 @@
* this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _REG_INIT_BASIC_H
-#define _REG_INIT_BASIC_H
+#ifndef _PASSDB_PDB_SMBPASSWD_H_
+#define _PASSDB_PDB_SMBPASSWD_H_
-WERROR registry_init_common(void);
-WERROR registry_init_basic(void);
+/* The following definitions come from passdb/pdb_smbpasswd.c */
-#endif /* _REG_INIT_BASIC_H */
+NTSTATUS pdb_smbpasswd_init(void) ;
+
+#endif /* _PASSDB_PDB_SMBPASSWD_H_ */
diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 93ee12d..32051b1 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -29,6 +29,7 @@
#include "dbwrap/dbwrap_open.h"
#include "../libcli/security/security.h"
#include "util_tdb.h"
+#include "passdb/pdb_tdb.h"
#if 0 /* when made a module use this */
diff --git a/source3/registry/reg_init_basic.h b/source3/passdb/pdb_tdb.h
similarity index 51%
copy from source3/registry/reg_init_basic.h
copy to source3/passdb/pdb_tdb.h
index 4149b5d..e2ecfb2 100644
--- a/source3/registry/reg_init_basic.h
+++ b/source3/passdb/pdb_tdb.h
@@ -1,10 +1,15 @@
/*
* Unix SMB/CIFS implementation.
- * Registry helper routines
- * Copyright (C) Michael Adam 2008
+ * SMB parameters and setup
+ * Copyright (C) Andrew Tridgell 1992-1998
+ * Copyright (C) Simo Sorce 2000-2003
+ * Copyright (C) Gerald Carter 2000-2006
+ * Copyright (C) Jeremy Allison 2001-2009
+ * Copyright (C) Andrew Bartlett 2002
+ * Copyright (C) Jim McDonough <jmcd at us.ibm.com> 2005
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option)
* any later version.
*
@@ -17,10 +22,11 @@
* this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _REG_INIT_BASIC_H
-#define _REG_INIT_BASIC_H
+/* The following definitions come from passdb/pdb_tdb.c */
-WERROR registry_init_common(void);
-WERROR registry_init_basic(void);
+#ifndef _PASSDB_PDB_TDB_H_
+#define _PASSDB_PDB_TDB_H_
-#endif /* _REG_INIT_BASIC_H */
+NTSTATUS pdb_tdbsam_init(void);
+
+#endif /* _PASSDB_PDB_TDB_H_ */
diff --git a/source3/passdb/pdb_wbc_sam.c b/source3/passdb/pdb_wbc_sam.c
index 91adc81..399d758 100644
--- a/source3/passdb/pdb_wbc_sam.c
+++ b/source3/passdb/pdb_wbc_sam.c
@@ -39,6 +39,7 @@
#include "includes.h"
#include "passdb.h"
#include "lib/winbind_util.h"
+#include "passdb/pdb_wbc_sam.h"
/***************************************************************************
Default implementations of some functions.
diff --git a/libcli/security/sddl.h b/source3/passdb/pdb_wbc_sam.h
similarity index 61%
copy from libcli/security/sddl.h
copy to source3/passdb/pdb_wbc_sam.h
index e8bc25a..02473c9 100644
--- a/libcli/security/sddl.h
+++ b/source3/passdb/pdb_wbc_sam.h
@@ -1,8 +1,13 @@
/*
Unix SMB/CIFS implementation.
- Samba utility functions
- Copyright (C) 2009 Jelmer Vernooij <jelmer at samba.org>
+ Password and authentication handling by wbclient
+
+ Copyright (C) Andrew Bartlett 2002
+ Copyright (C) Jelmer Vernooij 2002
+ Copyright (C) Simo Sorce 2003
+ Copyright (C) Volker Lendecke 2006
+ Copyright (C) Dan Sledz 2009
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,15 +23,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __SDDL_H__
-#define __SDDL_H__
-
-#include "librpc/gen_ndr/security.h"
+#ifndef _PASSDB_PDB_WBC_SAM_H_
+#define _PASSDB_PDB_WBC_SAM_H_
-struct security_descriptor *sddl_decode(TALLOC_CTX *mem_ctx, const char *sddl,
- const struct dom_sid *domain_sid);
-char *sddl_encode(TALLOC_CTX *mem_ctx, const struct security_descriptor *sd,
- const struct dom_sid *domain_sid);
+/* The following definitions come from passdb/pdb_wbc_sam.c */
+NTSTATUS pdb_wbc_sam_init(void);
-#endif /* __SDDL_H__ */
+#endif /* _PASSDB_PDB_WBC_SAM_H_ */
diff --git a/source3/passdb/proto.h b/source3/passdb/proto.h
index 63208ea..6a95454 100644
--- a/source3/passdb/proto.h
+++ b/source3/passdb/proto.h
@@ -340,18 +340,6 @@ NTSTATUS pdb_nds_init(void);
NTSTATUS pdb_ipa_init(void);
-/* The following definitions come from passdb/pdb_smbpasswd.c */
-
-NTSTATUS pdb_smbpasswd_init(void) ;
-
-/* The following definitions come from passdb/pdb_wbc_sam.c */
-
-NTSTATUS pdb_wbc_sam_init(void);
-
-/* The following definitions come from passdb/pdb_tdb.c */
-
-NTSTATUS pdb_tdbsam_init(void);
-
/* The following definitions come from passdb/pdb_util.c */
NTSTATUS create_builtin_users(const struct dom_sid *sid);
--
Samba Shared Repository
More information about the samba-cvs
mailing list