summaryrefslogtreecommitdiffstats
path: root/source/sam
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-08-04 05:42:36 +0000
committerGerald Carter <jerry@samba.org>2004-08-04 05:42:36 +0000
commitfecd5ea163ffcd1bbee5b06e05112dbff9aa71b1 (patch)
tree917402d02525c39dd42d3aed01609ac02be104b4 /source/sam
parent7cc5217c98cab4d0d970a2eb7f378319bedb6a46 (diff)
downloadsamba-fecd5ea163ffcd1bbee5b06e05112dbff9aa71b1.tar.gz
samba-fecd5ea163ffcd1bbee5b06e05112dbff9aa71b1.tar.xz
samba-fecd5ea163ffcd1bbee5b06e05112dbff9aa71b1.zip
r1643: syncing all changes from 3.0 and hopefully get 3.0.6rc2 out tomorrow
Diffstat (limited to 'source/sam')
-rw-r--r--source/sam/idmap.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/sam/idmap.c b/source/sam/idmap.c
index bbb4980c766..d541776f391 100644
--- a/source/sam/idmap.c
+++ b/source/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;