diff options
Diffstat (limited to 'source/groupdb/aliasdb.c')
| -rw-r--r-- | source/groupdb/aliasdb.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/source/groupdb/aliasdb.c b/source/groupdb/aliasdb.c index 05f584f980d..33b9fcc37f5 100644 --- a/source/groupdb/aliasdb.c +++ b/source/groupdb/aliasdb.c @@ -1,6 +1,7 @@ /* - Unix SMB/CIFS implementation. - Password and authentication handling + Unix SMB/Netbios implementation. + Version 1.9. + Pasesword and authentication handling Copyright (C) Jeremy Allison 1996-1998 Copyright (C) Luke Kenneth Caseson Leighton 1996-1998 @@ -41,7 +42,9 @@ BOOL initialise_alias_db(void) return True; } -#ifdef WITH_LDAP +#ifdef WITH_NISPLUS + aldb_ops = nisplus_initialise_alias_db(); +#elif defined(WITH_LDAP) aldb_ops = ldap_initialise_alias_db(); #else aldb_ops = file_initialise_alias_db(); @@ -140,9 +143,10 @@ BOOL add_domain_alias(LOCAL_GRP **alss, int *num_alss, LOCAL_GRP *als) if (alss == NULL || num_alss == NULL || als == NULL) return False; - talss = Realloc((*alss), ((*num_alss)+1) * sizeof(LOCAL_GRP)); - if (talss == NULL) { - SAFE_FREE(*alss); + talss = (LOCAL_GRP *)Realloc((*alss), ((*num_alss)+1) * sizeof(LOCAL_GRP)); + if (talss == NULL) { + if (*alss) + free(*alss); return False; } else (*alss) = talss; @@ -222,7 +226,8 @@ BOOL iterate_getuseraliasnam(char *user_name, LOCAL_GRP **alss, int *num_alss) ret = add_domain_alias(alss, num_alss, als); } - SAFE_FREE(mem); + free(mem); + mem = NULL; num_mem = 0; if (!ret) |