From bcbac69d1a38e128ffe8b763ac027d6eab33dcec Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 21 Apr 2008 19:59:27 +0200 Subject: cldap: avoid duplicate definitions so remove ads_cldap.h. Guenther (This used to be commit 538eefe22ad69540b9f73ffaa613d6be045de199) --- source3/utils/net_ads.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source3/utils') diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index dbdd3e3c59..3df9e2cff0 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -118,16 +118,16 @@ static int net_ads_cldap_netlogon(ADS_STRUCT *ads) "\tIs writable: %s\n" "\tHas a hardware clock: %s\n" "\tIs a non-domain NC serviced by LDAP server: %s\n", - (reply.server_type & ADS_PDC) ? "yes" : "no", - (reply.server_type & ADS_GC) ? "yes" : "no", - (reply.server_type & ADS_LDAP) ? "yes" : "no", - (reply.server_type & ADS_DS) ? "yes" : "no", - (reply.server_type & ADS_KDC) ? "yes" : "no", - (reply.server_type & ADS_TIMESERV) ? "yes" : "no", - (reply.server_type & ADS_CLOSEST) ? "yes" : "no", - (reply.server_type & ADS_WRITABLE) ? "yes" : "no", - (reply.server_type & ADS_GOOD_TIMESERV) ? "yes" : "no", - (reply.server_type & ADS_NDNC) ? "yes" : "no"); + (reply.server_type & NBT_SERVER_PDC) ? "yes" : "no", + (reply.server_type & NBT_SERVER_GC) ? "yes" : "no", + (reply.server_type & NBT_SERVER_LDAP) ? "yes" : "no", + (reply.server_type & NBT_SERVER_DS) ? "yes" : "no", + (reply.server_type & NBT_SERVER_KDC) ? "yes" : "no", + (reply.server_type & NBT_SERVER_TIMESERV) ? "yes" : "no", + (reply.server_type & NBT_SERVER_CLOSEST) ? "yes" : "no", + (reply.server_type & NBT_SERVER_WRITABLE) ? "yes" : "no", + (reply.server_type & NBT_SERVER_GOOD_TIMESERV) ? "yes" : "no", + (reply.server_type & DS_SERVER_NDNC) ? "yes" : "no"); printf("Forest:\t\t\t%s\n", reply.forest); printf("Domain:\t\t\t%s\n", reply.dns_domain); -- cgit