svn commit: samba r24095 - in branches/SAMBA_3_2/source/libads: .

[metze]

Author: metze
Date: 2007-07-31 09:37:25 +0000 (Tue, 31 Jul 2007)
New Revision: 24095

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24095

Log:
add one more fallback alternative to
construct the principal

metze
Modified:
   branches/SAMBA_3_2/source/libads/sasl.c


Changeset:
Modified: branches/SAMBA_3_2/source/libads/sasl.c
===================================================================
--- branches/SAMBA_3_2/source/libads/sasl.c     2007-07-31 09:33:27 UTC (rev 
24094)
+++ branches/SAMBA_3_2/source/libads/sasl.c     2007-07-31 09:37:25 UTC (rev 
24095)
@@ -676,6 +676,26 @@
                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/[EMAIL PROTECTED]", server, 
server_realm);
+
+               SAFE_FREE(server);
+               SAFE_FREE(server_realm);
+
+               if (!p->string) {
+                       return ADS_ERROR(LDAP_NO_MEMORY);
+               }
        }
 
        initialize_krb5_error_table();