summaryrefslogtreecommitdiff
path: root/source3/sam
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2004-07-10 17:00:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:11 -0500
commitf0f87cf7faecb9899a6a04da72e13ed6c408d01b (patch)
tree9a71ffac30238640a9546984ac1360d1f4f28695 /source3/sam
parent608172ebe31abd4ffa9584fd3fe411cb0955f5fa (diff)
downloadsamba-f0f87cf7faecb9899a6a04da72e13ed6c408d01b.tar.gz
samba-f0f87cf7faecb9899a6a04da72e13ed6c408d01b.tar.bz2
samba-f0f87cf7faecb9899a6a04da72e13ed6c408d01b.zip
r1430: Although prepared for only one remote backend, make the 'idmap backend'
parameter a list instead of a string. This makes idmap backend = ldap:"ldap://localhost/ ldap://fallback/" possible. Volker (This used to be commit ea718347937ec0e5640b29e0e9edf6eda2b45e34)
Diffstat (limited to 'source3/sam')
-rw-r--r--source3/sam/idmap.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/sam/idmap.c b/source3/sam/idmap.c
index bbb4980c76..d541776f39 100644
--- a/source3/sam/idmap.c
+++ b/source3/sam/idmap.c
@@ -96,7 +96,7 @@ NTSTATUS smb_register_idmap(int version, const char *name, struct idmap_methods
Initialise idmap cache and a remote backend (if configured).
**********************************************************************/
-BOOL idmap_init(const char *remote_backend)
+BOOL idmap_init(const char **remote_backend)
{
if (!backends)
static_init_idmap;
@@ -115,8 +115,9 @@ BOOL idmap_init(const char *remote_backend)
}
}
- if (!remote_map && remote_backend && *remote_backend != 0) {
- char *rem_backend = smb_xstrdup(remote_backend);
+ if ((remote_map == NULL) && (remote_backend != NULL) &&
+ (*remote_backend != NULL) && (**remote_backend != '\0')) {
+ char *rem_backend = smb_xstrdup(*remote_backend);
fstring params = "";
char *pparams;