summaryrefslogtreecommitdiff
path: root/source3/libads/util.c
diff options
context:
space:
mode:
Diffstat (limited to 'source3/libads/util.c')
-rw-r--r--source3/libads/util.c54
1 files changed, 21 insertions, 33 deletions
diff --git a/source3/libads/util.c b/source3/libads/util.c
index af96c3e10a..472fe4a214 100644
--- a/source3/libads/util.c
+++ b/source3/libads/util.c
@@ -55,57 +55,45 @@ failed:
ADS_STATUS ads_guess_service_principal(ADS_STRUCT *ads,
char **returned_principal)
{
+ ADS_STATUS status;
char *princ = NULL;
+ char *server = NULL;
+ char *server_realm = NULL;
if (ads->server.realm && ads->server.ldap_server) {
- char *server, *server_realm;
-
server = SMB_STRDUP(ads->server.ldap_server);
server_realm = SMB_STRDUP(ads->server.realm);
- if (!server || !server_realm) {
- return ADS_ERROR(LDAP_NO_MEMORY);
- }
-
- strlower_m(server);
- strupper_m(server_realm);
- asprintf(&princ, "ldap/%s@%s", server, server_realm);
-
- SAFE_FREE(server);
- SAFE_FREE(server_realm);
-
- if (!princ) {
- return ADS_ERROR(LDAP_NO_MEMORY);
+ if (!server || !server_realm) {
+ status = ADS_ERROR(LDAP_NO_MEMORY);
+ goto fail;
}
} else if (ads->config.realm && ads->config.ldap_server_name) {
- char *server, *server_realm;
-
server = SMB_STRDUP(ads->config.ldap_server_name);
server_realm = SMB_STRDUP(ads->config.realm);
- if (!server || !server_realm) {
- return ADS_ERROR(LDAP_NO_MEMORY);
- }
-
- strlower_m(server);
- strupper_m(server_realm);
- asprintf(&princ, "ldap/%s@%s", server, server_realm);
-
- SAFE_FREE(server);
- SAFE_FREE(server_realm);
-
- if (!princ) {
- return ADS_ERROR(LDAP_NO_MEMORY);
- }
+ if (!server || !server_realm) {
+ status = ADS_ERROR(LDAP_NO_MEMORY);
+ goto fail;
+ }
}
+ strlower_m(server);
+ strupper_m(server_realm);
+ asprintf(&princ, "ldap/%s@%s", server, server_realm);
+
if (!princ) {
- return ADS_ERROR(LDAP_PARAM_ERROR);
+ status = ADS_ERROR(LDAP_PARAM_ERROR);
}
*returned_principal = princ;
+ status = ADS_SUCCESS;
+
+fail:
+ SAFE_FREE(server);
+ SAFE_FREE(server_realm);
- return ADS_SUCCESS;
+ return status;
}
#endif