summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2002-08-29 09:20:49 +0000
committerJelmer Vernooij <jelmer@samba.org>2002-08-29 09:20:49 +0000
commit558297b703fc29feb6e6fac205570f24b33d8b37 (patch)
tree17163b9212a4754942eb9642958f88d7fc513004
parent66c389fe92510991e6c9d2cb93443692e5007edb (diff)
downloadsamba-558297b703fc29feb6e6fac205570f24b33d8b37.tar.gz
samba-558297b703fc29feb6e6fac205570f24b33d8b37.tar.bz2
samba-558297b703fc29feb6e6fac205570f24b33d8b37.zip
small fixes
make lp_sam_backend() a list (This used to be commit 06eb3138ab14ff450bbc44f5fa539867ce67a7dd)
-rw-r--r--source3/param/loadparm.c3
-rw-r--r--source3/passdb/pdb_plugin.c2
-rw-r--r--source3/sam/get_set_domain.c1
-rw-r--r--source3/sam/interface.c12
4 files changed, 10 insertions, 8 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index a64df8e2f3..3ac6fb70f1 100644
--- 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 e8ac5ccfac..ea67da23a5 100644
--- 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 9e4d41a49e..8ca876524a 100644
--- 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 3d886d7281..ef2a4d5f8a 100644
--- 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) {