Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25389/src
Modified Files:
util.c
Log Message:
2006-04-27 Sven Herzberg <he...@gn...>
* src/util.c: add the configured base dn if it's not in the list
of supplied base dn's (but only in that case)
Index: util.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/util.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** util.c 18 Apr 2006 16:00:51 -0000 1.95
--- util.c 27 Apr 2006 15:25:26 -0000 1.96
***************
*** 1881,1888 ****
len--;
p[i + len] = '\0';
!
suffixes = g_list_append(suffixes,
g_strdup(p + i));
! /* add_suffix(entry, ctreeroot, node, p + i); */
num_suffixes++;
}
--- 1881,1888 ----
len--;
p[i + len] = '\0';
!
suffixes = g_list_append(suffixes,
g_strdup(p + i));
! /* add_suffix(entry, ctreeroot, node, p + i); */
num_suffixes++;
}
***************
*** 1898,1915 ****
}
! if (num_suffixes == 0) {
!
! /* last resort: add the configured base DN and hope something comes out */
! if(strlen(server->basedn)) {
! suffixes = g_list_append(suffixes,
! g_strdup(server->basedn));
! /* add_suffix(entry, ctreeroot, node, entry->server->basedn); */
! num_suffixes++;
! }
}
!
set_normalcursor();
close_connection(server, FALSE);
!
statusbar_msg(ngettext("One suffix found", "%d suffixes found",
num_suffixes),
--- 1898,1911 ----
}
!
! /* add the configured base DN if it's a different one */
! if(strlen(server->basedn) && (g_list_find_custom(suffixes, server->basedn, (GCompareFunc) strcmp) == NULL)) {
! suffixes = g_list_append(suffixes, g_strdup(server->basedn));
! num_suffixes++;
}
!
set_normalcursor();
close_connection(server, FALSE);
!
statusbar_msg(ngettext("One suffix found", "%d suffixes found",
num_suffixes),
|
