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

r16429: Fix final 4 Klocwork bugs we're going to fix before

Browse Source 
release - #785, #786, #787, #788.
Jeremy.
This commit is contained in:
Jeremy Allison 2006-06-20 20:43:05 +00:00 committed by Gerald (Jerry) Carter
parent adf2dcce09
commit 9017547ccc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/param/loadparm.c
View File

@ -3244,9 +3244,9 @@ static BOOL handle_debug_list( int snum, const char *pszParmValueIn, char **ptr
Handle ldap suffixes - default to ldapsuffix if sub-suffixes are not defined.
***************************************************************************/
static char* append_ldap_suffix( const char *str )
static const char *append_ldap_suffix( const char *str )
{
char *suffix_string;
const char *suffix_string;
if (!lp_talloc)
@ -3255,13 +3255,13 @@ static char* append_ldap_suffix( const char *str )
suffix_string = talloc_asprintf( lp_talloc, "%s,%s", str, Globals.szLdapSuffix );
if ( !suffix_string ) {
DEBUG(0,("append_ldap_suffix: talloc_asprintf() failed!\n"));
return NULL;
return "";
}
return suffix_string;
}
char *lp_ldap_machine_suffix(void)
const char *lp_ldap_machine_suffix(void)
{
if (Globals.szLdapMachineSuffix[0])
return append_ldap_suffix(Globals.szLdapMachineSuffix);
@ -3269,7 +3269,7 @@ char *lp_ldap_machine_suffix(void)
return lp_string(Globals.szLdapSuffix);
}
char *lp_ldap_user_suffix(void)
const char *lp_ldap_user_suffix(void)
{
if (Globals.szLdapUserSuffix[0])
return append_ldap_suffix(Globals.szLdapUserSuffix);
@ -3277,7 +3277,7 @@ char *lp_ldap_user_suffix(void)
return lp_string(Globals.szLdapSuffix);
}
char *lp_ldap_group_suffix(void)
const char *lp_ldap_group_suffix(void)
{
if (Globals.szLdapGroupSuffix[0])
return append_ldap_suffix(Globals.szLdapGroupSuffix);
@ -3285,7 +3285,7 @@ char *lp_ldap_group_suffix(void)
return lp_string(Globals.szLdapSuffix);
}
char *lp_ldap_idmap_suffix(void)
const char *lp_ldap_idmap_suffix(void)
{
if (Globals.szLdapIdmapSuffix[0])
return append_ldap_suffix(Globals.szLdapIdmapSuffix);

2
source/utils/net_rpc_samsync.c
View File

@ -1025,7 +1025,7 @@ static NTSTATUS fetch_database(struct rpc_pipe_client *pipe_hnd, uint32 db_type,
static NTSTATUS populate_ldap_for_ldif(fstring sid, const char *suffix, const char
*builtin_sid, FILE *add_fd)
{
char *user_suffix, *group_suffix, *machine_suffix, *idmap_suffix;
const char *user_suffix, *group_suffix, *machine_suffix, *idmap_suffix;
char *user_attr=NULL, *group_attr=NULL;
char *suffix_attr;
int len;