summaryrefslogtreecommitdiff
path: root/source3/libads/ldap.c
diff options
context:
space:
mode:
authorJeremy Allison <jeremy@jeremy-desktop.(none)>2008-12-23 11:27:19 -0800
committerJeremy Allison <jeremy@jeremy-desktop.(none)>2008-12-23 11:27:19 -0800
commitb143938b8afaa7c7759e09228cc0d92ff97121d0 (patch)
treee9de7fc2f589705c0eadbe28fcbd9e00baff942a /source3/libads/ldap.c
parent7c6a20a439e5e6e9b4149df77896eea57d931e73 (diff)
downloadsamba-b143938b8afaa7c7759e09228cc0d92ff97121d0.tar.gz
samba-b143938b8afaa7c7759e09228cc0d92ff97121d0.tar.bz2
samba-b143938b8afaa7c7759e09228cc0d92ff97121d0.zip
Fix more asprintf errors and error code paths.
Jeremy.
Diffstat (limited to 'source3/libads/ldap.c')
-rw-r--r--source3/libads/ldap.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index cf8a7ebb1b..a598580941 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -603,7 +603,10 @@ got_connection:
/* Must use the userPrincipalName value here or sAMAccountName
and not servicePrincipalName; found by Guenther Deschner */
- asprintf(&ads->auth.user_name, "%s$", global_myname() );
+ if (asprintf(&ads->auth.user_name, "%s$", global_myname() ) == -1) {
+ DEBUG(0,("ads_connect: asprintf fail.\n"));
+ ads->auth.user_name = NULL;
+ }
}
if (!ads->auth.realm) {
@@ -619,10 +622,11 @@ got_connection:
/* this is a really nasty hack to avoid ADS DNS problems. It needs a patch
to MIT kerberos to work (tridge) */
{
- char *env;
- asprintf(&env, "KRB5_KDC_ADDRESS_%s", ads->config.realm);
- setenv(env, ads->auth.kdc_server, 1);
- free(env);
+ char *env = NULL;
+ if (asprintf(&env, "KRB5_KDC_ADDRESS_%s", ads->config.realm) > 0) {
+ setenv(env, ads->auth.kdc_server, 1);
+ free(env);
+ }
}
#endif