summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--source3/utils/net_ads.c8
-rw-r--r--source4/torture/ldap/netlogon.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index e96377f8fa..7f3d74d782 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -99,7 +99,9 @@ static int net_ads_cldap_netlogon(struct net_context *c, ADS_STRUCT *ads)
"\tHas a hardware clock: %s\n"
"\tIs a non-domain NC serviced by LDAP server: %s\n"
"\tIs NT6 DC that has some secrets: %s\n"
- "\tIs NT6 DC that has all secrets: %s\n"),
+ "\tIs NT6 DC that has all secrets: %s\n"
+ "\tRuns Active Directory Web Services: %s\n"
+ "\tRuns on Windows 2012 or later: %s\n"),
(reply.server_type & NBT_SERVER_PDC) ? _("yes") : _("no"),
(reply.server_type & NBT_SERVER_GC) ? _("yes") : _("no"),
(reply.server_type & NBT_SERVER_LDAP) ? _("yes") : _("no"),
@@ -111,7 +113,9 @@ static int net_ads_cldap_netlogon(struct net_context *c, ADS_STRUCT *ads)
(reply.server_type & NBT_SERVER_GOOD_TIMESERV) ? _("yes") : _("no"),
(reply.server_type & NBT_SERVER_NDNC) ? _("yes") : _("no"),
(reply.server_type & NBT_SERVER_SELECT_SECRET_DOMAIN_6) ? _("yes") : _("no"),
- (reply.server_type & NBT_SERVER_FULL_SECRET_DOMAIN_6) ? _("yes") : _("no"));
+ (reply.server_type & NBT_SERVER_FULL_SECRET_DOMAIN_6) ? _("yes") : _("no"),
+ (reply.server_type & NBT_SERVER_ADS_WEB_SERVICE) ? _("yes") : _("no"),
+ (reply.server_type & NBT_SERVER_DS_8) ? _("yes") : _("no"));
printf(_("Forest:\t\t\t%s\n"), reply.forest);
diff --git a/source4/torture/ldap/netlogon.c b/source4/torture/ldap/netlogon.c
index 8c6345b0bd..064a5b3404 100644
--- a/source4/torture/ldap/netlogon.c
+++ b/source4/torture/ldap/netlogon.c
@@ -341,6 +341,10 @@ static bool test_ldap_netlogon_flags(struct torture_context *tctx,
printf("NBT_SERVER_SELECT_SECRET_DOMAIN_6");
if (server_type & NBT_SERVER_FULL_SECRET_DOMAIN_6)
printf("NBT_SERVER_FULL_SECRET_DOMAIN_6");
+ if (server_type & NBT_SERVER_ADS_WEB_SERVICE)
+ printf("NBT_SERVER_ADS_WEB_SERVICE ");
+ if (server_type & NBT_SERVER_DS_8)
+ printf("NBT_SERVER_DS_8 ");
if (server_type & DS_DNS_CONTROLLER)
printf("DS_DNS_CONTROLLER ");
if (server_type & DS_DNS_DOMAIN)