sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

r15566: Fix Coverity bug # 284. The lp_ldap_xx_suffix function only return NULL if

Browse Source 
talloc fails.

Volker
(This used to be commit 0ece5b32f97f162be0af2ea3354a597c56ed4373)
This commit is contained in:
Volker Lendecke 2006-05-13 17:10:20 +00:00 committed by Gerald (Jerry) Carter
parent c2e6ebe22c
commit f390936c5b
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source3/utils/net_rpc_samsync.c
View File

@ -1042,10 +1042,12 @@ static NTSTATUS populate_ldap_for_ldif(fstring sid, const char *suffix, const ch
fflush(add_fd);
user_suffix = lp_ldap_user_suffix();
if (user_suffix == NULL) {
return NT_STATUS_NO_MEMORY;
}
/* If it exists and is distinct from other containers,
Write the Users entity */
if (user_suffix && *user_suffix &&
strcmp(user_suffix, suffix)) {
if (*user_suffix && strcmp(user_suffix, suffix)) {
user_attr = sstring_sub(lp_ldap_user_suffix(), '=', ',');
fprintf(add_fd, "# %s\n", user_suffix);
fprintf(add_fd, "dn: %s\n", user_suffix);
@ -1057,10 +1059,12 @@ static NTSTATUS populate_ldap_for_ldif(fstring sid, const char *suffix, const ch
group_suffix = lp_ldap_group_suffix();
if (group_suffix == NULL) {
return NT_STATUS_NO_MEMORY;
}
/* If it exists and is distinct from other containers,
Write the Groups entity */
if (group_suffix && *group_suffix &&
strcmp(group_suffix, suffix)) {
if (*group_suffix && strcmp(group_suffix, suffix)) {
group_attr = sstring_sub(lp_ldap_group_suffix(), '=', ',');
fprintf(add_fd, "# %s\n", group_suffix);
fprintf(add_fd, "dn: %s\n", group_suffix);
@ -1073,8 +1077,10 @@ static NTSTATUS populate_ldap_for_ldif(fstring sid, const char *suffix, const ch
/* If it exists and is distinct from other containers,
Write the Computers entity */
machine_suffix = lp_ldap_machine_suffix();
if (machine_suffix && *machine_suffix &&
strcmp(machine_suffix, user_suffix) &&
if (machine_suffix == NULL) {
return NT_STATUS_NO_MEMORY;
}
if (*machine_suffix && strcmp(machine_suffix, user_suffix) &&
strcmp(machine_suffix, suffix)) {
char *machine_ou = NULL;
fprintf(add_fd, "# %s\n", machine_suffix);
@ -1092,7 +1098,10 @@ static NTSTATUS populate_ldap_for_ldif(fstring sid, const char *suffix, const ch
/* If it exists and is distinct from other containers,
Write the IdMap entity */
idmap_suffix = lp_ldap_idmap_suffix();
if (idmap_suffix && *idmap_suffix &&
if (idmap_suffix == NULL) {
return NT_STATUS_NO_MEMORY;
}
if (*idmap_suffix &&
strcmp(idmap_suffix, user_suffix) &&
strcmp(idmap_suffix, suffix)) {
char *s;