r24095: add one more fallback alternative to

construct the principal

metze
(This used to be commit b545667d2a45a79bba05c9fe9e93a19951d60af7)

diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
index 732691942f6452585a81a7702010f6ef5fb4a53b..4436551d88d44b2b63743dcb1bc877a44068e6cb 100644 (file)
--- a/source3/libads/sasl.c
+++ b/source3/libads/sasl.c
@@ -673,6 +673,26 @@ static ADS_STATUS ads_generate_service_principal(ADS_STRUCT *ads,
                SAFE_FREE(server);
                SAFE_FREE(server_realm);
 
+               if (!p->string) {
+                       return ADS_ERROR(LDAP_NO_MEMORY);
+               }
+       } 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(&p->string, "ldap/%s@%s", server, server_realm);
+
+               SAFE_FREE(server);
+               SAFE_FREE(server_realm);
+
                if (!p->string) {
                        return ADS_ERROR(LDAP_NO_MEMORY);
                }