Changes from APPLIANCE_HEAD:

    source/rpc_parse/parse_lsa.c
        - off by one unistr length bug in init_lsa_trans_name()

    source/lib/util_sid.c
        - resolve more BUILTIN sid values to names.

    source/nsswitch/wb_client.c
        - fix typo in debug message
        - set errno on error so we don't get bogus value from last failure.

    source/rpc_server/srv_spoolss_nt.c
        - add debug to track number of open printer handles for ease of
          tracking handle leaks in the future.

    source/rpc_server/srv_lsa.c
        - fix off-by-one string bug.  This was preventing NT from
          displaying names for well-know SIDs in printer permissions
          dialog.
(This used to be commit 59229b9025cff54cbdd05e374616ffbf9c6fee33)

2 files changed, 5 insertions, 3 deletions

diff --git a/source3/rpc_server/srv_lsa.c b/source3/rpc_server/srv_lsa.c
index ed65e787b4..3538beefda 100644
--- a/source3/rpc_server/srv_lsa.c
+++ b/source3/rpc_server/srv_lsa.c
@@ -88,13 +88,13 @@ Init dom_query
 
 static void init_dom_query(DOM_QUERY *d_q, char *dom_name, DOM_SID *dom_sid)
 {
-	int domlen = (dom_name != NULL) ? strlen(dom_name)+1 : 0;
+	int domlen = (dom_name != NULL) ? strlen(dom_name) : 0;
 
 	d_q->uni_dom_max_len = domlen * 2;
 	d_q->uni_dom_str_len = domlen * 2;
 
-	d_q->buffer_dom_name = (dom_name != 0)   ? 1 : 0;
-	d_q->buffer_dom_sid  = (dom_sid != NULL) ? 1 : 0;
+	d_q->buffer_dom_name = dom_name ? 1 : 0;
+	d_q->buffer_dom_sid  = dom_sid ? 1 : 0;
 
 	/* this string is supposed to be character short */
 	init_unistr2(&d_q->uni_domain_name, dom_name, domlen);
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 23f8ab15ef..4355e2eb59 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -526,6 +526,8 @@ static BOOL open_printer_hnd(POLICY_HND *hnd, char *name)
 		return False;
 	}
 
+	DEBUG(5, ("%d printer handles active\n", ubi_dlCount(&Printer_list)));
+
 	return True;
 }