small fixes

make lp_sam_backend() a list
(This used to be commit 06eb3138ab14ff450bbc44f5fa539867ce67a7dd)

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index a64df8e2f30f7b98cf45313de51b3928c47792be..3ac6fb70f11c9991806da6d91927ee8127440cf6 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -112,6 +112,7 @@ typedef struct
        char *szSMBPasswdFile;
        char *szPrivateDir;
        char **szPassdbBackend;
+       char **szSamBackend;
        char *szPasswordServer;
        char *szSocketOptions;
        char *szWorkGroup;
@@ -701,6 +702,7 @@ static struct parm_struct parm_table[] = {
        {"smb passwd file", P_STRING, P_GLOBAL, &Globals.szSMBPasswdFile, NULL, NULL, 0},
        {"private dir", P_STRING, P_GLOBAL, &Globals.szPrivateDir, NULL, NULL, 0},
        {"passdb backend", P_LIST, P_GLOBAL, &Globals.szPassdbBackend, NULL, NULL, 0},
+       {"sam backend", P_LIST, P_GLOBAL, &Globals.szSamBackend, NULL, NULL, 0},
        {"non unix account range", P_STRING, P_GLOBAL, &Globals.szNonUnixAccountRange, handle_non_unix_account_range, NULL, 0},
        {"algorithmic rid base", P_INTEGER, P_GLOBAL, &Globals.bAlgorithmicRidBase, NULL, NULL, 0},
        {"root directory", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, 0},
@@ -1514,6 +1516,7 @@ FN_GLOBAL_STRING(lp_nis_home_map_name, &Globals.szNISHomeMapName)
 static FN_GLOBAL_STRING(lp_announce_version, &Globals.szAnnounceVersion)
 FN_GLOBAL_LIST(lp_netbios_aliases, &Globals.szNetbiosAliases)
 FN_GLOBAL_LIST(lp_passdb_backend, &Globals.szPassdbBackend)
+FN_GLOBAL_LIST(lp_sam_backend, &Globals.szSamBackend)
 FN_GLOBAL_STRING(lp_panic_action, &Globals.szPanicAction)
 FN_GLOBAL_STRING(lp_adduser_script, &Globals.szAddUserScript)
 FN_GLOBAL_STRING(lp_deluser_script, &Globals.szDelUserScript)

diff --git a/source3/passdb/pdb_plugin.c b/source3/passdb/pdb_plugin.c
index e8ac5ccfac86663131ed96d062cc9b9c36449539..ea67da23a552a04de4a76a6dab9dc7bc69991e04 100644 (file)
--- a/source3/passdb/pdb_plugin.c
+++ b/source3/passdb/pdb_plugin.c
@@ -59,7 +59,7 @@ NTSTATUS pdb_init_plugin(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, con
                return NT_STATUS_UNSUCCESSFUL;
        }
 
-       if (plugin_version()!=PASSDB_INTERFACE_VERSION) {
+       if (plugin_version() != PASSDB_INTERFACE_VERSION) {
                sys_dlclose(dl_handle);
                DEBUG(0, ("Wrong PASSDB_INTERFACE_VERSION! sam plugin has version %d and version %d is needed! Please update!\n",
                            plugin_version(),PASSDB_INTERFACE_VERSION));

diff --git a/source3/sam/get_set_domain.c b/source3/sam/get_set_domain.c
index 9e4d41a49ec1d69b6a5b9e79e5e06465d691487c..8ca876524aca46d6d4136bee7f48812623c6626b 100644 (file)
--- a/source3/sam/get_set_domain.c
+++ b/source3/sam/get_set_domain.c
@@ -1,7 +1,6 @@
 /* 
    Unix SMB/CIFS implementation.
    SAM_DOMAIN access routines
-   Copyright (C) Luke Kenneth Casson Leighton  1996-1998
    Copyright (C) Andrew Bartlett                       2002
    Copyright (C) Stefan (metze) Metzmacher     2002
    Copyright (C) Jelmer Vernooij                       2002

diff --git a/source3/sam/interface.c b/source3/sam/interface.c
index 3d886d72817e9f031c7f25878901163c6c4a81a2..ef2a4d5f8ad8ecfcedb329a46275448824750186 100644 (file)
--- a/source3/sam/interface.c
+++ b/source3/sam/interface.c
@@ -646,17 +646,17 @@ NTSTATUS context_sam_add_group(const SAM_CONTEXT *context, const SAM_GROUP_HANDL
        return NT_STATUS_OK;
 }
 
-NTSTATUS context_sam_update_group(const SAM_CONTEXT *context, const DOM_SID *domainsid, const SAM_GROUP_HANDLE *group)
+NTSTATUS context_sam_update_group(const SAM_CONTEXT *context, const SAM_GROUP_HANDLE *group)
 {
        DOM_SID         domainsid;
        DOM_SID         *groupsid;
        struct sam_methods *tmp_methods;
        uint32          rid;
-       NTSTATUS status;
+       NTSTATUS nt_status;
 
-       if (!NT_STATUS_IS_OK(status = sam_get_group_sid(group, &groupsid))) {
+       if (!NT_STATUS_IS_OK(nt_status = sam_get_group_sid(group, &groupsid))) {
                DEBUG(0,("Can't get group SID\n"));
-               return status;
+               return nt_status;
        }
 
        sid_copy(&domainsid, groupsid);
@@ -665,9 +665,9 @@ NTSTATUS context_sam_update_group(const SAM_CONTEXT *context, const DOM_SID *dom
                return NT_STATUS_INVALID_SID;
        }
 
-       if (!NT_STATUS_IS_OK(status = sam_get_methods_by_sid(context, &tmp_methods, &domainsid))) {
+       if (!NT_STATUS_IS_OK(nt_status = sam_get_methods_by_sid(context, &tmp_methods, &domainsid))) {
                DEBUG(4,("sam_get_methods_by_sid failed\n"));
-               return status;
+               return nt_status;
        }
 
        if (!tmp_methods->sam_update_group) {