summaryrefslogtreecommitdiffstats
path: root/ipa-client
diff options
context:
space:
mode:
Diffstat (limited to 'ipa-client')
-rw-r--r--ipa-client/config.c4
-rw-r--r--ipa-client/ipa-join.c6
2 files changed, 9 insertions, 1 deletions
diff --git a/ipa-client/config.c b/ipa-client/config.c
index 0ee8f4465..493d74020 100644
--- a/ipa-client/config.c
+++ b/ipa-client/config.c
@@ -64,6 +64,10 @@ read_config_file(const char *filename)
}
left = st.st_size;
data = malloc(st.st_size + 1);
+ if (data == NULL) {
+ fprintf(stderr, _("out of memory\n"));
+ return NULL;
+ }
dest = data;
while (left != 0) {
ssize_t res;
diff --git a/ipa-client/ipa-join.c b/ipa-client/ipa-join.c
index b66c4299a..21c087b68 100644
--- a/ipa-client/ipa-join.c
+++ b/ipa-client/ipa-join.c
@@ -139,6 +139,10 @@ callRPC(xmlrpc_env * const envP,
XMLRPC_ASSERT(xmlrpc_value_type(paramArrayP) == XMLRPC_TYPE_ARRAY);
curlXportParmsP = malloc(sizeof(*curlXportParmsP));
+ if (curlXportParmsP == NULL) {
+ xmlrpc_env_set_fault(envP, XMLRPC_INTERNAL_ERROR, _("Out of memory!"));
+ return;
+ }
memset(curlXportParmsP, 0, sizeof(*curlXportParmsP));
/* Have curl do SSL certificate validation */
@@ -930,7 +934,7 @@ join(const char *server, const char *hostname, const char *bindpw, const char *k
rval = 5;
goto cleanup;
}
-
+
krberr = krb5_cc_get_principal(krbctx, ccache, &uprinc);
if (krberr) {
fprintf(stderr, _("Unable to join host: Kerberos User Principal "