updated the 3.0 branch from the head branch - ready for alpha18

(This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)

2 files changed, 83 insertions, 19 deletions

diff --git a/examples/pdb/README b/examples/pdb/README
index ccc39248aac..a2126047925 100644
--- a/examples/pdb/README
+++ b/examples/pdb/README
@@ -1,5 +1,41 @@
 README for Samba Password Database (PDB) examples
 ====================================================
+21-6-2002 Stefan (metze) Metzmacher <metze@metzemix.de>
+
+I have added an interface versioning.
+
+Every module MUST have a pdb_version() function.
+
+this is defined in include/passdb.h:
+#define PDB_MODULE_VERSIONING_MAGIC \
+int pdb_version(void)\
+{\
+	return PASSDB_INTERFACE_VERSION;\
+}
+
+You MUST add this line inside a module:
+PDB_MODULE_VERSIONING_MAGIC
+
+21-6-2002 Stefan (metze) Metzmacher <metze@metzemix.de>
+
+The pdb_interface was changed:
+
+this function are deleted:
+static BOOL testsam_getsampwrid (struct pdb_methods *methods, SAM_ACCOUNT *user, uint32 rid)
+
+this function are added:
+static BOOL testsam_getsampwsid (struct pdb_methods *methods, SAM_ACCOUNT *user, DOM_SID sid)
+
+In the SAM_ACCOUNT struct:
+
+this fields are deleted:
+uint32 user_rid;
+uint32 group_rid;
+
+this fields are added:
+DOM_SID user_sid;
+DOM_SID group_sid; 
+
 15-2-2002 Jelmer Vernooij <jelmer@nl.linux.org>
 
 The pdb_test.c file in this directory contains a very basic example of 
@@ -7,3 +43,9 @@ a pdb plugin. It just prints the name of the function that is executed using
 DEBUG. Maybe it's nice to include some of the arguments to the function in the 
 future too..
 
+To debug passdb backends, try to run gdb on the 'pdbedit' executable. That's really much easier than restarting smbd constantly and attaching with your debugger.
+
+New passdb plugins should go into the samba lib directory, (/usr/lib/samba/ for
+most distributions) and should be prefixed with 'pdb_'. An example would be: 
+/usr/lib/samba/pdb_test.so
+
diff --git a/examples/pdb/pdb_test.c b/examples/pdb/pdb_test.c
index 4b4189e9d57..d2722d2e036 100644
--- a/examples/pdb/pdb_test.c
+++ b/examples/pdb/pdb_test.c
@@ -17,11 +17,24 @@
  * Mass Ave, Cambridge, MA 02139, USA.
  */
 
+
 #include "includes.h"
 
-static BOOL testsam_setsampwent(struct pdb_context *context, BOOL update)
+static int testsam_debug_level = DBGC_ALL;
+
+#undef DBGC_CLASS
+#define DBGC_CLASS testsam_debug_level
+
+/* define the version of the passdb interface */ 
+PDB_MODULE_VERSIONING_MAGIC
+
+/***************************************************************
+ Start enumeration of the passwd list.
+****************************************************************/
+
+static BOOL testsam_setsampwent(struct pdb_methods *methods, BOOL update)
 {
-	DEBUG(0, ("testsam_setsampwent called\n"));
+	DEBUG(10, ("testsam_setsampwent called\n"));
 	return True;
 }
 
@@ -29,18 +42,18 @@ static BOOL testsam_setsampwent(struct pdb_context *context, BOOL update)
  End enumeration of the passwd list.
 ****************************************************************/
 
-static void testsam_endsampwent(struct pdb_context *context)
+static void testsam_endsampwent(struct pdb_methods *methods)
 {
-	DEBUG(0, ("testsam_endsampwent called\n"));
+	DEBUG(10, ("testsam_endsampwent called\n"));
 }
 
 /*****************************************************************
  Get one SAM_ACCOUNT from the list (next in line)
 *****************************************************************/
 
-static BOOL testsam_getsampwent(struct pdb_context *context, SAM_ACCOUNT *user)
+static BOOL testsam_getsampwent(struct pdb_methods *methods, SAM_ACCOUNT *user)
 {
-	DEBUG(0, ("testsam_getsampwent called\n"));
+	DEBUG(10, ("testsam_getsampwent called\n"));
 	return False;
 }
 
@@ -48,19 +61,19 @@ static BOOL testsam_getsampwent(struct pdb_context *context, SAM_ACCOUNT *user)
  Lookup a name in the SAM database
 ******************************************************************/
 
-static BOOL testsam_getsampwnam (struct pdb_context *context, SAM_ACCOUNT *user, const char *sname)
+static BOOL testsam_getsampwnam (struct pdb_methods *methods, SAM_ACCOUNT *user, const char *sname)
 {
-	DEBUG(0, ("testsam_getsampwnam called\n"));
+	DEBUG(10, ("testsam_getsampwnam called\n"));
 	return False;
 }
 
 /***************************************************************************
- Search by rid
+ Search by sid
  **************************************************************************/
 
-static BOOL testsam_getsampwrid (struct pdb_context *context, SAM_ACCOUNT *user, uint32 rid)
+static BOOL testsam_getsampwsid (struct pdb_methods *methods, SAM_ACCOUNT *user, DOM_SID sid)
 {
-	DEBUG(0, ("testsam_getsampwrid called\n"));
+	DEBUG(10, ("testsam_getsampwsid called\n"));
 	return False;
 }
 
@@ -68,9 +81,9 @@ static BOOL testsam_getsampwrid (struct pdb_context *context, SAM_ACCOUNT *user,
  Delete a SAM_ACCOUNT
 ****************************************************************************/
 
-static BOOL testsam_delete_sam_account(struct pdb_context *context, const SAM_ACCOUNT *sam_pass)
+static BOOL testsam_delete_sam_account(struct pdb_methods *methods, const SAM_ACCOUNT *sam_pass)
 {
-	DEBUG(0, ("testsam_delete_sam_account called\n"));
+	DEBUG(10, ("testsam_delete_sam_account called\n"));
 	return False;
 }
 
@@ -78,9 +91,9 @@ static BOOL testsam_delete_sam_account(struct pdb_context *context, const SAM_AC
  Modifies an existing SAM_ACCOUNT
 ****************************************************************************/
 
-static BOOL testsam_update_sam_account (struct pdb_context *context, const SAM_ACCOUNT *newpwd)
+static BOOL testsam_update_sam_account (struct pdb_methods *methods, const SAM_ACCOUNT *newpwd)
 {
-	DEBUG(0, ("testsam_update_sam_account called\n"));
+	DEBUG(10, ("testsam_update_sam_account called\n"));
 	return False;
 }
 
@@ -88,9 +101,9 @@ static BOOL testsam_update_sam_account (struct pdb_context *context, const SAM_A
  Adds an existing SAM_ACCOUNT
 ****************************************************************************/
 
-static BOOL testsam_add_sam_account (struct pdb_context *context, const SAM_ACCOUNT *newpwd)
+static BOOL testsam_add_sam_account (struct pdb_methods *methods, const SAM_ACCOUNT *newpwd)
 {
-	DEBUG(0, ("testsam_add_sam_account called\n"));
+	DEBUG(10, ("testsam_add_sam_account called\n"));
 	return False;
 }
 
@@ -104,18 +117,27 @@ NTSTATUS pdb_init(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, const char
 
 	(*pdb_method)->name = "testsam";
 
+	/* Functions your pdb module doesn't provide should be set 
+	 * to NULL */
+
 	(*pdb_method)->setsampwent = testsam_setsampwent;
 	(*pdb_method)->endsampwent = testsam_endsampwent;
 	(*pdb_method)->getsampwent = testsam_getsampwent;
 	(*pdb_method)->getsampwnam = testsam_getsampwnam;
-	(*pdb_method)->getsampwrid = testsam_getsampwrid;
+	(*pdb_method)->getsampwsid = testsam_getsampwsid;
 	(*pdb_method)->add_sam_account = testsam_add_sam_account;
 	(*pdb_method)->update_sam_account = testsam_update_sam_account;
 	(*pdb_method)->delete_sam_account = testsam_delete_sam_account;
+
+	testsam_debug_level = debug_add_class("testsam");
+	if (testsam_debug_level == -1) {
+		testsam_debug_level = DBGC_ALL;
+		DEBUG(0, ("testsam: Couldn't register custom debugging class!\n"));
+	} else DEBUG(0, ("testsam: Debug class number of 'testsam': %d\n", testsam_debug_level));
     
 	DEBUG(0, ("Initializing testsam\n"));
 	if (location)
-		DEBUG(0, ("Location: %s\n", location));
+		DEBUG(10, ("Location: %s\n", location));
 
 	return NT_STATUS_OK;
 }