(merge from 3.0)

Try to keep vl happy - shorten some of these lines.

--

Grumble... grumble... fix the build...

--

Show the sid type in name->sid translatons in a way that can be easily
understood by humans.

Andrew Bartlett
(This used to be commit c5d1e2112baa7d87cd6b9f0855c2fd8b006af01d)

1 files changed, 12 insertions, 6 deletions

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 8aaca01bbf..79f267a6a8 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -1668,7 +1668,8 @@ char **ads_pull_strings_range(ADS_STRUCT *ads,
 			   &range_start) == 1) {
 			*more_strings = False;
 		} else {
-			DEBUG(1, ("ads_pull_strings_range:  Cannot parse Range attriubte (%s)\n", range_attr));
+			DEBUG(1, ("ads_pull_strings_range:  Cannot parse Range attriubte (%s)\n", 
+				  range_attr));
 			ldap_memfree(range_attr);
 			*more_strings = False;
 			return NULL;
@@ -1676,7 +1677,8 @@ char **ads_pull_strings_range(ADS_STRUCT *ads,
 	}
 
 	if ((*num_strings) != range_start) {
-		DEBUG(1, ("ads_pull_strings_range: Range attribute (%s) doesn't start at %u, but at %lu - aborting range retreival\n",
+		DEBUG(1, ("ads_pull_strings_range: Range attribute (%s) doesn't start at %u, but at %lu"
+			  " - aborting range retreival\n",
 			  range_attr, *num_strings + 1, range_start));
 		ldap_memfree(range_attr);
 		*more_strings = False;
@@ -1686,8 +1688,10 @@ char **ads_pull_strings_range(ADS_STRUCT *ads,
 	new_strings = ads_pull_strings(ads, mem_ctx, msg, range_attr, &num_new_strings);
 	
 	if (*more_strings && ((*num_strings + num_new_strings) != (range_end + 1))) {
-		DEBUG(1, ("ads_pull_strings_range: Range attribute (%s) tells us we have %lu strings in this bunch, but we only got %lu - aborting range retreival\n",
-			  range_attr, (unsigned long int)range_end - range_start + 1, (unsigned long int)num_new_strings));
+		DEBUG(1, ("ads_pull_strings_range: Range attribute (%s) tells us we have %lu "
+			  "strings in this bunch, but we only got %lu - aborting range retreival\n",
+			  range_attr, (unsigned long int)range_end - range_start + 1, 
+			  (unsigned long int)num_new_strings));
 		ldap_memfree(range_attr);
 		*more_strings = False;
 		return NULL;
@@ -1992,7 +1996,8 @@ ADS_STATUS ads_server_info(ADS_STRUCT *ads)
 	p = strchr(value, ':');
 	if (!p) {
 		talloc_destroy(ctx);
-		DEBUG(1, ("ads_server_info: returned ldap server name did not contain a ':' so was deemed invalid\n"));
+		DEBUG(1, ("ads_server_info: returned ldap server name did not contain a ':' "
+			  "so was deemed invalid\n"));
 		return ADS_ERROR(LDAP_DECODING_ERROR);
 	}
 
@@ -2002,7 +2007,8 @@ ADS_STATUS ads_server_info(ADS_STRUCT *ads)
 	p = strchr(ads->config.ldap_server_name, '$');
 	if (!p || p[1] != '@') {
 		talloc_destroy(ctx);
-		DEBUG(1, ("ads_server_info: returned ldap server name (%s) does not contain '$@' so was deemed invalid\n", ads->config.ldap_server_name));
+		DEBUG(1, ("ads_server_info: returned ldap server name (%s) does not contain '$@'"
+			  " so was deemed invalid\n", ads->config.ldap_server_name));
 		SAFE_FREE(ads->config.ldap_server_name);
 		return ADS_ERROR(LDAP_DECODING_ERROR);
 	}