r24807: Add WINBINDD_LOCATOR_KDC_ADDRESS env which will be used for the case when the

locator gets called from within winbindd.

Guenther
(This used to be commit 46dbd6034ec2c6475f428cd2d5cce56268bc34a7)

diff --git a/source3/nsswitch/winbindd_nss.h b/source3/nsswitch/winbindd_nss.h
index 46f78ffbe665312fa323103c0822b58189f48ca8..eadbb0e8ba41802292edde7094f1a068d14fc783 100644 (file)
--- a/source3/nsswitch/winbindd_nss.h
+++ b/source3/nsswitch/winbindd_nss.h
@@ -39,6 +39,7 @@
 #define WINBINDD_PRIV_SOCKET_SUBDIR "winbindd_privileged" /* name of subdirectory of lp_lockdir() to hold the 'privileged' pipe */
 #define WINBINDD_DOMAIN_ENV  "WINBINDD_DOMAIN" /* Environment variables */
 #define WINBINDD_DONT_ENV    "_NO_WINBINDD"
+#define WINBINDD_LOCATOR_KDC_ADDRESS "WINBINDD_LOCATOR_KDC_ADDRESS"
 
 /* Update this when you change the interface.  */
 

diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index d12dff09325ae133c7b01e14eaef9aec4f8917b8..225c6b5be1dcfdabbf800660b8f08090792d66cb 100644 (file)
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -1365,3 +1365,36 @@ BOOL winbindd_internal_child(struct winbindd_child *child)
 
        return False;
 }
+
+/*********************************************************************
+ ********************************************************************/
+
+void winbindd_set_locator_kdc_env(const struct winbindd_domain *domain)
+{
+       char *var = NULL;
+       const char *kdc = NULL;
+
+       if (!domain) {
+               return;
+       }
+
+       kdc = inet_ntoa(domain->dcaddr.sin_addr);
+       if (!kdc) {
+               kdc = domain->dcname;
+       }
+
+       if (!kdc || !*kdc) {
+               return;
+       }
+
+       if (asprintf(&var, "%s_%s", WINBINDD_LOCATOR_KDC_ADDRESS,
+                    strupper_static(domain->alt_name)) == -1) {
+               return;
+       }
+
+       DEBUG(10,("winbindd_set_locator_kdc_env: setting var: %s to: %s\n",
+               var, kdc));
+
+       setenv(var, kdc, 1);
+       free(var);
+}