svn commit: samba r24769 - in branches: SAMBA_3_2/source/libads
SAMBA_3_2_0/source/libads
gd at samba.org
gd at samba.org
Wed Aug 29 10:12:44 GMT 2007
Author: gd
Date: 2007-08-29 10:12:43 +0000 (Wed, 29 Aug 2007)
New Revision: 24769
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24769
Log:
Merge error handling for locator plugin.
Guenther
Modified:
branches/SAMBA_3_2/source/libads/smb_krb5_locator.c
branches/SAMBA_3_2_0/source/libads/smb_krb5_locator.c
Changeset:
Modified: branches/SAMBA_3_2/source/libads/smb_krb5_locator.c
===================================================================
--- branches/SAMBA_3_2/source/libads/smb_krb5_locator.c 2007-08-29 06:58:25 UTC (rev 24768)
+++ branches/SAMBA_3_2/source/libads/smb_krb5_locator.c 2007-08-29 10:12:43 UTC (rev 24769)
@@ -24,10 +24,14 @@
#endif
#if defined(HAVE_KRB5) && defined(HAVE_KRB5_LOCATE_PLUGIN_H)
-BOOL winbind_env_set( void );
+BOOL winbind_env_set(void);
#include <krb5/locate_plugin.h>
+#ifndef KRB5_PLUGIN_NO_HANDLE
+#define KRB5_PLUGIN_NO_HANDLE KRB5_KDC_UNREACH /* Heimdal */
+#endif
+
static const char *get_service_from_locate_service_type(enum locate_service_type svc)
{
switch (svc) {
@@ -123,11 +127,7 @@
break;
case locate_service_kadmin:
case locate_service_krb524:
-#ifdef KRB5_PLUGIN_NO_HANDLE
return KRB5_PLUGIN_NO_HANDLE;
-#else
- return KRB5_KDC_UNREACH; /* Heimdal */
-#endif
default:
return EINVAL;
}
@@ -137,11 +137,7 @@
case AF_INET:
break;
case AF_INET6: /* not yet */
-#ifdef KRB5_PLUGIN_NO_HANDLE
return KRB5_PLUGIN_NO_HANDLE;
-#else
- return KRB5_KDC_UNREACH; /* Heimdal */
-#endif
default:
return EINVAL;
}
@@ -198,11 +194,7 @@
(unsigned int)getpid(), gai_strerror(ret), ret);
#endif
-#ifdef KRB5_PLUGIN_NO_HANDLE
return KRB5_PLUGIN_NO_HANDLE;
-#else
- return KRB5_KDC_UNREACH; /* Heimdal */
-#endif
}
ret = cbfunc(cbdata, out->ai_socktype, out->ai_addr);
@@ -365,11 +357,7 @@
return ret;
failed:
-#ifdef KRB5_PLUGIN_NO_HANDLE
return KRB5_PLUGIN_NO_HANDLE;
-#else
- return KRB5_KDC_UNREACH; /* Heimdal */
-#endif
}
#ifdef HEIMDAL_KRB5_LOCATE_PLUGIN_H
Modified: branches/SAMBA_3_2_0/source/libads/smb_krb5_locator.c
===================================================================
--- branches/SAMBA_3_2_0/source/libads/smb_krb5_locator.c 2007-08-29 06:58:25 UTC (rev 24768)
+++ branches/SAMBA_3_2_0/source/libads/smb_krb5_locator.c 2007-08-29 10:12:43 UTC (rev 24769)
@@ -24,10 +24,14 @@
#endif
#if defined(HAVE_KRB5) && defined(HAVE_KRB5_LOCATE_PLUGIN_H)
-BOOL winbind_env_set( void );
+BOOL winbind_env_set(void);
#include <krb5/locate_plugin.h>
+#ifndef KRB5_PLUGIN_NO_HANDLE
+#define KRB5_PLUGIN_NO_HANDLE KRB5_KDC_UNREACH /* Heimdal */
+#endif
+
static const char *get_service_from_locate_service_type(enum locate_service_type svc)
{
switch (svc) {
@@ -123,11 +127,7 @@
break;
case locate_service_kadmin:
case locate_service_krb524:
-#ifdef KRB5_PLUGIN_NO_HANDLE
return KRB5_PLUGIN_NO_HANDLE;
-#else
- return KRB5_KDC_UNREACH; /* Heimdal */
-#endif
default:
return EINVAL;
}
@@ -137,11 +137,7 @@
case AF_INET:
break;
case AF_INET6: /* not yet */
-#ifdef KRB5_PLUGIN_NO_HANDLE
return KRB5_PLUGIN_NO_HANDLE;
-#else
- return KRB5_KDC_UNREACH; /* Heimdal */
-#endif
default:
return EINVAL;
}
@@ -198,11 +194,7 @@
(unsigned int)getpid(), gai_strerror(ret), ret);
#endif
-#ifdef KRB5_PLUGIN_NO_HANDLE
return KRB5_PLUGIN_NO_HANDLE;
-#else
- return KRB5_KDC_UNREACH; /* Heimdal */
-#endif
}
ret = cbfunc(cbdata, out->ai_socktype, out->ai_addr);
@@ -365,11 +357,7 @@
return ret;
failed:
-#ifdef KRB5_PLUGIN_NO_HANDLE
return KRB5_PLUGIN_NO_HANDLE;
-#else
- return KRB5_KDC_UNREACH; /* Heimdal */
-#endif
}
#ifdef HEIMDAL_KRB5_LOCATE_PLUGIN_H
More information about the samba-cvs
mailing list