|
 |
ee8dc1 |
From 10a4dbb5978b6f05cf75f820d97da908e735ace8 Mon Sep 17 00:00:00 2001
|
|
|
ee8dc1 |
From: Sumit Bose <sbose@redhat.com>
|
|
|
ee8dc1 |
Date: Fri, 22 Mar 2019 10:37:11 +0100
|
|
|
ee8dc1 |
Subject: [PATCH 3/4] library: _adcli_krb5_build_principal allow principals as
|
|
|
ee8dc1 |
names
|
|
|
ee8dc1 |
|
|
|
ee8dc1 |
Make _adcli_krb5_build_principal a bit more robust by checking if the
|
|
|
ee8dc1 |
given name already contains a realm suffix.
|
|
|
ee8dc1 |
|
|
|
ee8dc1 |
Related to https://bugzilla.redhat.com/show_bug.cgi?id=1630187
|
|
|
ee8dc1 |
---
|
|
|
ee8dc1 |
library/adkrb5.c | 12 ++++++++----
|
|
|
ee8dc1 |
1 file changed, 8 insertions(+), 4 deletions(-)
|
|
|
ee8dc1 |
|
|
|
ee8dc1 |
diff --git a/library/adkrb5.c b/library/adkrb5.c
|
|
|
ee8dc1 |
index 7f77373..da835d7 100644
|
|
|
ee8dc1 |
--- a/library/adkrb5.c
|
|
|
ee8dc1 |
+++ b/library/adkrb5.c
|
|
|
ee8dc1 |
@@ -41,12 +41,16 @@ _adcli_krb5_build_principal (krb5_context k5,
|
|
|
ee8dc1 |
krb5_principal *principal)
|
|
|
ee8dc1 |
{
|
|
|
ee8dc1 |
krb5_error_code code;
|
|
|
ee8dc1 |
- char *name;
|
|
|
ee8dc1 |
+ char *name = NULL;
|
|
|
ee8dc1 |
|
|
|
ee8dc1 |
- if (asprintf (&name, "%s@%s", user, realm) < 0)
|
|
|
ee8dc1 |
- return_val_if_reached (ENOMEM);
|
|
|
ee8dc1 |
+ /* Use user if user contains a @-character and add @realm otherwise */
|
|
|
ee8dc1 |
+ if (strchr (user, '@') == NULL) {
|
|
|
ee8dc1 |
+ if (asprintf (&name, "%s@%s", user, realm) < 0) {
|
|
|
ee8dc1 |
+ return_val_if_reached (ENOMEM);
|
|
|
ee8dc1 |
+ }
|
|
|
ee8dc1 |
+ }
|
|
|
ee8dc1 |
|
|
|
ee8dc1 |
- code = krb5_parse_name (k5, name, principal);
|
|
|
ee8dc1 |
+ code = krb5_parse_name (k5, name != NULL ? name : user, principal);
|
|
|
ee8dc1 |
return_val_if_fail (code == 0, code);
|
|
|
ee8dc1 |
|
|
|
ee8dc1 |
free (name);
|
|
|
ee8dc1 |
--
|
|
|
ee8dc1 |
2.20.1
|
|
|
ee8dc1 |
|