1) logon hours _is_ a 32-bit not a 16-bit. oops

2) logon to local workstation when it is a member of a domain is also
   allowed, by making domain_client_validate accept our own localservername
   as the domain name (a la MYSERVERNAME\user)

5 files changed, 1943 insertions, 1440 deletions

diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index 6deaf5383f5..80d0562206e 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -148,7 +148,7 @@ SamrTestPrivateFunctionsUser
 
 typedef struct logon_hours_info
 {
-	uint16 len; /* normally 21 bytes */
+	uint32 len; /* normally 21 bytes */
 	uint8 hours[32];
 
 } LOGON_HRS;
diff --git a/source/libsmb/clientgen.c b/source/libsmb/clientgen.c
index 5b887cdf56f..f3a53a61e52 100644
--- a/source/libsmb/clientgen.c
+++ b/source/libsmb/clientgen.c
@@ -3901,11 +3901,19 @@ BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail)
 
 BOOL get_any_dc_name(const char *domain, char *srv_name)
 {
+	extern pstring global_myname;
 	struct cli_state cli;
 	char *servers;
 
 	DEBUG(10,("get_any_dc_name: domain %s\n", domain));
 
+	if (strequal(domain, global_myname))
+	{
+		DEBUG(10,("get_any_dc_name: our own server!\n"));
+		fstrcpy(srv_name, "\\\\.");
+		return True;
+	}
+
 	servers = get_trusted_serverlist(domain);
 
 	if (servers == NULL)
diff --git a/source/netlogond/srv_netlogon_nt.c b/source/netlogond/srv_netlogon_nt.c
index 6377bb48bc4..f9281e6cd02 100644
--- a/source/netlogond/srv_netlogon_nt.c
+++ b/source/netlogond/srv_netlogon_nt.c
@@ -155,7 +155,8 @@ static BOOL get_md4pw(char *md4pw, char *trust_name, char *trust_acct)
 	}
 #endif /* 0 */
 
-	if (strequal(trust_name, global_myname))
+	if (strequal(trust_name, global_myname)
+	    || strequal(trust_name, "\\\\."))
 	{
 		BOOL ret;
 		DEBUG(10, ("get_md4pw: loop-back, use $MACHINE.ACC\n"));
@@ -1009,8 +1010,8 @@ uint32 _net_sam_logon(const DOM_SAM_INFO * sam_id,
 				/* interactive login. */
 				status =
 					net_login_interactive(&
-							      (sam_id->ctr->
-							       auth.id1),
+							      (sam_id->
+							       ctr->auth.id1),
 							      &dc);
 				break;
 			}
@@ -1019,10 +1020,10 @@ uint32 _net_sam_logon(const DOM_SAM_INFO * sam_id,
 				/* network login.  lm challenge and 24 byte responses */
 				status =
 					net_login_network(&
-							  (sam_id->ctr->auth.
-							   id2), acb_info,
-							  &dc, usr_sess_key,
-lm_pw8);
+							  (sam_id->ctr->
+							   auth.id2),
+							  acb_info, &dc,
+usr_sess_key, lm_pw8);
 				padding = lm_pw8;
 				enc_user_sess_key = usr_sess_key;
 				break;
diff --git a/source/rpc_client/msrpc_netlogon.c b/source/rpc_client/msrpc_netlogon.c
index 1f72202f2a1..1a8ffb771d4 100644
--- a/source/rpc_client/msrpc_netlogon.c
+++ b/source/rpc_client/msrpc_netlogon.c
@@ -85,10 +85,8 @@ static uint32 domain_client_validate(const char *user, const char *domain,
 		smb_ntpasslen == 0;
 
 	DEBUG(100, ("domain_client_validate: %s %s\n", user, domain));
-#ifdef DEBUG_PASSWORD
 	dump_data_pw("lmpw:", smb_apasswd, smb_apasslen);
 	dump_data_pw("ntpw:", smb_ntpasswd, smb_ntpasslen);
-#endif
 
 	fstrcpy(trust_acct, acct_name);
 	fstrcat(trust_acct, "$");
diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index 2cf46859268..6777fb4e213 100644
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -33,11 +33,12 @@ extern int DEBUGLEVEL;
 /*******************************************************************
 makes a SAMR_Q_CLOSE_HND structure.
 ********************************************************************/
-BOOL make_samr_q_close_hnd(SAMR_Q_CLOSE_HND *q_c, POLICY_HND *hnd)
+BOOL make_samr_q_close_hnd(SAMR_Q_CLOSE_HND * q_c, POLICY_HND * hnd)
 {
-	if (q_c == NULL || hnd == NULL) return False;
+	if (q_c == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_close_hnd\n"));
+	DEBUG(5, ("make_samr_q_close_hnd\n"));
 
 	memcpy(&(q_c->pol), hnd, sizeof(q_c->pol));
 
@@ -47,16 +48,18 @@ BOOL make_samr_q_close_hnd(SAMR_Q_CLOSE_HND *q_c, POLICY_HND *hnd)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_close_hnd(char *desc,  SAMR_Q_CLOSE_HND *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_close_hnd(char *desc, SAMR_Q_CLOSE_HND * q_u, prs_struct * ps,
+			 int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_close_hnd");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth);
 	prs_align(ps);
 
 	return True;
@@ -65,16 +68,18 @@ BOOL samr_io_q_close_hnd(char *desc,  SAMR_Q_CLOSE_HND *q_u, prs_struct *ps, int
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_close_hnd(char *desc,  SAMR_R_CLOSE_HND *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_close_hnd(char *desc, SAMR_R_CLOSE_HND * r_u, prs_struct * ps,
+			 int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_close_hnd");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(r_u->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(r_u->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("status", ps, depth, &(r_u->status));
@@ -85,14 +90,15 @@ BOOL samr_io_r_close_hnd(char *desc,  SAMR_R_CLOSE_HND *r_u, prs_struct *ps, int
 /*******************************************************************
 makes a SAMR_Q_LOOKUP_DOMAIN structure.
 ********************************************************************/
-BOOL make_samr_q_lookup_domain(SAMR_Q_LOOKUP_DOMAIN *q_u,
-		POLICY_HND *pol, const char *dom_name)
+BOOL make_samr_q_lookup_domain(SAMR_Q_LOOKUP_DOMAIN * q_u,
+			       POLICY_HND * pol, const char *dom_name)
 {
 	int len_name = strlen(dom_name);
 
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_lookup_domain\n"));
+	DEBUG(5, ("make_samr_q_lookup_domain\n"));
 
 	memcpy(&(q_u->connect_pol), pol, sizeof(*pol));
 
@@ -105,9 +111,11 @@ BOOL make_samr_q_lookup_domain(SAMR_Q_LOOKUP_DOMAIN *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_lookup_domain(char *desc, SAMR_Q_LOOKUP_DOMAIN *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_lookup_domain(char *desc, SAMR_Q_LOOKUP_DOMAIN * q_u,
+			     prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_lookup_domain");
 	depth++;
@@ -128,12 +136,13 @@ BOOL samr_io_q_lookup_domain(char *desc, SAMR_Q_LOOKUP_DOMAIN *q_u, prs_struct *
 /*******************************************************************
 makes a SAMR_R_LOOKUP_DOMAIN structure.
 ********************************************************************/
-BOOL make_samr_r_lookup_domain(SAMR_R_LOOKUP_DOMAIN *r_u,
-		DOM_SID *dom_sid, uint32 status)
+BOOL make_samr_r_lookup_domain(SAMR_R_LOOKUP_DOMAIN * r_u,
+			       DOM_SID * dom_sid, uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_lookup_domain\n"));
+	DEBUG(5, ("make_samr_r_lookup_domain\n"));
 
 	r_u->status = status;
 	r_u->ptr_sid = 0;
@@ -149,9 +158,11 @@ BOOL make_samr_r_lookup_domain(SAMR_R_LOOKUP_DOMAIN *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_lookup_domain(char *desc, SAMR_R_LOOKUP_DOMAIN *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_lookup_domain(char *desc, SAMR_R_LOOKUP_DOMAIN * r_u,
+			     prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_lookup_domain");
 	depth++;
@@ -174,13 +185,13 @@ BOOL samr_io_r_lookup_domain(char *desc, SAMR_R_LOOKUP_DOMAIN *r_u, prs_struct *
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL make_samr_q_unknown_2d(SAMR_Q_UNKNOWN_2D *q_u,
-				const POLICY_HND *dom_pol, 
-				const DOM_SID *sid)
+BOOL make_samr_q_unknown_2d(SAMR_Q_UNKNOWN_2D * q_u,
+			    const POLICY_HND * dom_pol, const DOM_SID * sid)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("samr_make_samr_q_unknown_2d\n"));
+	DEBUG(5, ("samr_make_samr_q_unknown_2d\n"));
 
 	memcpy(&q_u->dom_pol, dom_pol, sizeof(q_u->dom_pol));
 	make_dom_sid2(&(q_u->sid), sid);
@@ -191,19 +202,21 @@ BOOL make_samr_q_unknown_2d(SAMR_Q_UNKNOWN_2D *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_unknown_2d(char *desc,  SAMR_Q_UNKNOWN_2D *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_unknown_2d(char *desc, SAMR_Q_UNKNOWN_2D * q_u,
+			  prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_unknown_2d");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("domain_pol", &(q_u->dom_pol), ps, depth); 
+	smb_io_pol_hnd("domain_pol", &(q_u->dom_pol), ps, depth);
 	prs_align(ps);
 
-	smb_io_dom_sid2("sid", &(q_u->sid), ps, depth); 
+	smb_io_dom_sid2("sid", &(q_u->sid), ps, depth);
 	prs_align(ps);
 
 	return True;
@@ -213,9 +226,11 @@ BOOL samr_io_q_unknown_2d(char *desc,  SAMR_Q_UNKNOWN_2D *q_u, prs_struct *ps, i
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_unknown_2d(char *desc,  SAMR_R_UNKNOWN_2D *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_unknown_2d(char *desc, SAMR_R_UNKNOWN_2D * r_u,
+			  prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_unknown_2d");
 	depth++;
@@ -230,13 +245,14 @@ BOOL samr_io_r_unknown_2d(char *desc,  SAMR_R_UNKNOWN_2D *r_u, prs_struct *ps, i
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL make_samr_q_open_domain(SAMR_Q_OPEN_DOMAIN *q_u,
-				const POLICY_HND *connect_pol, uint32 flags,
-				const DOM_SID *sid)
+BOOL make_samr_q_open_domain(SAMR_Q_OPEN_DOMAIN * q_u,
+			     const POLICY_HND * connect_pol, uint32 flags,
+			     const DOM_SID * sid)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("samr_make_samr_q_open_domain\n"));
+	DEBUG(5, ("samr_make_samr_q_open_domain\n"));
 
 	memcpy(&q_u->connect_pol, connect_pol, sizeof(q_u->connect_pol));
 	q_u->flags = flags;
@@ -248,21 +264,23 @@ BOOL make_samr_q_open_domain(SAMR_Q_OPEN_DOMAIN *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_open_domain(char *desc,  SAMR_Q_OPEN_DOMAIN *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_open_domain(char *desc, SAMR_Q_OPEN_DOMAIN * q_u,
+			   prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_open_domain");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("connect_pol", &(q_u->connect_pol), ps, depth); 
+	smb_io_pol_hnd("connect_pol", &(q_u->connect_pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("flags", ps, depth, &(q_u->flags));
 
-	smb_io_dom_sid2("sid", &(q_u->dom_sid), ps, depth); 
+	smb_io_dom_sid2("sid", &(q_u->dom_sid), ps, depth);
 	prs_align(ps);
 
 	return True;
@@ -272,16 +290,18 @@ BOOL samr_io_q_open_domain(char *desc,  SAMR_Q_OPEN_DOMAIN *q_u, prs_struct *ps,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_open_domain(char *desc,  SAMR_R_OPEN_DOMAIN *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_open_domain(char *desc, SAMR_R_OPEN_DOMAIN * r_u,
+			   prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_open_domain");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("domain_pol", &(r_u->domain_pol), ps, depth); 
+	smb_io_pol_hnd("domain_pol", &(r_u->domain_pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("status", ps, depth, &(r_u->status));
@@ -292,11 +312,13 @@ BOOL samr_io_r_open_domain(char *desc,  SAMR_R_OPEN_DOMAIN *r_u, prs_struct *ps,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL make_samr_q_get_usrdom_pwinfo(SAMR_Q_GET_USRDOM_PWINFO *q_u, POLICY_HND *user_pol)
+BOOL make_samr_q_get_usrdom_pwinfo(SAMR_Q_GET_USRDOM_PWINFO * q_u,
+				   POLICY_HND * user_pol)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("samr_make_samr_q_get_usrdom_pwinfo\n"));
+	DEBUG(5, ("samr_make_samr_q_get_usrdom_pwinfo\n"));
 
 	memcpy(&q_u->user_pol, user_pol, sizeof(q_u->user_pol));
 
@@ -307,16 +329,18 @@ BOOL make_samr_q_get_usrdom_pwinfo(SAMR_Q_GET_USRDOM_PWINFO *q_u, POLICY_HND *us
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_get_usrdom_pwinfo(char *desc,  SAMR_Q_GET_USRDOM_PWINFO *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_get_usrdom_pwinfo(char *desc, SAMR_Q_GET_USRDOM_PWINFO * q_u,
+				 prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_get_usrdom_pwinfo");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("user_pol", &(q_u->user_pol), ps, depth); 
+	smb_io_pol_hnd("user_pol", &(q_u->user_pol), ps, depth);
 	prs_align(ps);
 
 	return True;
@@ -325,9 +349,11 @@ BOOL samr_io_q_get_usrdom_pwinfo(char *desc,  SAMR_Q_GET_USRDOM_PWINFO *q_u, prs
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_get_usrdom_pwinfo(char *desc,  SAMR_R_GET_USRDOM_PWINFO *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_get_usrdom_pwinfo(char *desc, SAMR_R_GET_USRDOM_PWINFO * r_u,
+				 prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_get_usrdom_pwinfo");
 	depth++;
@@ -337,7 +363,7 @@ BOOL samr_io_r_get_usrdom_pwinfo(char *desc,  SAMR_R_GET_USRDOM_PWINFO *r_u, prs
 	prs_uint16("unknown_0", ps, depth, &(r_u->unknown_0));
 	prs_uint16("unknown_1", ps, depth, &(r_u->unknown_1));
 	prs_uint32("unknown_2", ps, depth, &(r_u->unknown_2));
-	prs_uint32("status   ", ps, depth, &(r_u->status   ));
+	prs_uint32("status   ", ps, depth, &(r_u->status));
 
 	return True;
 }
@@ -345,12 +371,13 @@ BOOL samr_io_r_get_usrdom_pwinfo(char *desc,  SAMR_R_GET_USRDOM_PWINFO *r_u, prs
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL make_samr_q_query_sec_obj(SAMR_Q_QUERY_SEC_OBJ *q_u,
-				const POLICY_HND *user_pol, uint32 sec_info)
+BOOL make_samr_q_query_sec_obj(SAMR_Q_QUERY_SEC_OBJ * q_u,
+			       const POLICY_HND * user_pol, uint32 sec_info)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("samr_make_samr_q_query_sec_obj\n"));
+	DEBUG(5, ("samr_make_samr_q_query_sec_obj\n"));
 
 	q_u->user_pol = *user_pol;
 	q_u->sec_info = sec_info;
@@ -362,16 +389,18 @@ BOOL make_samr_q_query_sec_obj(SAMR_Q_QUERY_SEC_OBJ *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_query_sec_obj(char *desc,  SAMR_Q_QUERY_SEC_OBJ *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_query_sec_obj(char *desc, SAMR_Q_QUERY_SEC_OBJ * q_u,
+			     prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_query_sec_obj");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("user_pol", &(q_u->user_pol), ps, depth); 
+	smb_io_pol_hnd("user_pol", &(q_u->user_pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("sec_info", ps, depth, &(q_u->sec_info));
@@ -382,12 +411,13 @@ BOOL samr_io_q_query_sec_obj(char *desc,  SAMR_Q_QUERY_SEC_OBJ *q_u, prs_struct
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL make_samr_q_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO *q_u,
-				POLICY_HND *domain_pol, uint16 switch_value)
+BOOL make_samr_q_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO * q_u,
+				POLICY_HND * domain_pol, uint16 switch_value)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("samr_make_samr_q_query_dom_info\n"));
+	DEBUG(5, ("samr_make_samr_q_query_dom_info\n"));
 
 	q_u->domain_pol = *domain_pol;
 	q_u->switch_value = switch_value;
@@ -398,16 +428,18 @@ BOOL make_samr_q_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_query_dom_info(char *desc,  SAMR_Q_QUERY_DOMAIN_INFO *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_query_dom_info(char *desc, SAMR_Q_QUERY_DOMAIN_INFO * q_u,
+			      prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_query_dom_info");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth); 
+	smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint16("switch_value", ps, depth, &(q_u->switch_value));
@@ -420,9 +452,10 @@ BOOL samr_io_q_query_dom_info(char *desc,  SAMR_Q_QUERY_DOMAIN_INFO *q_u, prs_st
 /*******************************************************************
 makes a structure.
 ********************************************************************/
-BOOL make_unk_info3(SAM_UNK_INFO_3 *u_3)
+BOOL make_unk_info3(SAM_UNK_INFO_3 * u_3)
 {
-	if (u_3 == NULL) return False;
+	if (u_3 == NULL)
+		return False;
 
 	u_3->unknown_0 = 0x00000000;
 	u_3->unknown_1 = 0x80000000;
@@ -433,15 +466,17 @@ BOOL make_unk_info3(SAM_UNK_INFO_3 *u_3)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_unk_info3(char *desc, SAM_UNK_INFO_3 *u_3, prs_struct *ps, int depth)
+static BOOL sam_io_unk_info3(char *desc, SAM_UNK_INFO_3 * u_3,
+			     prs_struct * ps, int depth)
 {
-	if (u_3 == NULL) return False;
+	if (u_3 == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_unk_info3");
 	depth++;
 
-	prs_uint32("unknown_0", ps, depth, &u_3->unknown_0); /* 0x0000 0000 */
-	prs_uint32("unknown_1", ps, depth, &u_3->unknown_1); /* 0x8000 0000 */
+	prs_uint32("unknown_0", ps, depth, &u_3->unknown_0);	/* 0x0000 0000 */
+	prs_uint32("unknown_1", ps, depth, &u_3->unknown_1);	/* 0x8000 0000 */
 
 	prs_align(ps);
 
@@ -452,13 +487,14 @@ static BOOL sam_io_unk_info3(char *desc, SAM_UNK_INFO_3 *u_3, prs_struct *ps, in
 /*******************************************************************
 makes a structure.
 ********************************************************************/
-BOOL make_unk_info6(SAM_UNK_INFO_6 *u_6)
+BOOL make_unk_info6(SAM_UNK_INFO_6 * u_6)
 {
-	if (u_6 == NULL) return False;
+	if (u_6 == NULL)
+		return False;
 
 	u_6->unknown_0 = 0x00000000;
 	u_6->ptr_0 = 1;
-	memset(u_6->padding, 0, sizeof(u_6->padding)); /* 12 bytes zeros */
+	memset(u_6->padding, 0, sizeof(u_6->padding));	/* 12 bytes zeros */
 
 	return True;
 }
@@ -466,16 +502,18 @@ BOOL make_unk_info6(SAM_UNK_INFO_6 *u_6)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_unk_info6(char *desc, SAM_UNK_INFO_6 *u_6, prs_struct *ps, int depth)
+static BOOL sam_io_unk_info6(char *desc, SAM_UNK_INFO_6 * u_6,
+			     prs_struct * ps, int depth)
 {
-	if (u_6 == NULL) return False;
+	if (u_6 == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_unk_info6");
 	depth++;
 
-	prs_uint32("unknown_0", ps, depth, &u_6->unknown_0); /* 0x0000 0000 */
-	prs_uint32("ptr_0", ps, depth, &u_6->ptr_0);     /* pointer to unknown structure */
-	prs_uint8s(False, "padding", ps, depth, u_6->padding, sizeof(u_6->padding)); /* 12 bytes zeros */
+	prs_uint32("unknown_0", ps, depth, &u_6->unknown_0);	/* 0x0000 0000 */
+	prs_uint32("ptr_0", ps, depth, &u_6->ptr_0);	/* pointer to unknown structure */
+	prs_uint8s(False, "padding", ps, depth, u_6->padding, sizeof(u_6->padding));	/* 12 bytes zeros */
 
 	prs_align(ps);
 
@@ -486,9 +524,10 @@ static BOOL sam_io_unk_info6(char *desc, SAM_UNK_INFO_6 *u_6, prs_struct *ps, in
 /*******************************************************************
 makes a structure.
 ********************************************************************/
-BOOL make_unk_info7(SAM_UNK_INFO_7 *u_7)
+BOOL make_unk_info7(SAM_UNK_INFO_7 * u_7)
 {
-	if (u_7 == NULL) return False;
+	if (u_7 == NULL)
+		return False;
 
 	u_7->unknown_0 = 0x0003;
 
@@ -498,14 +537,16 @@ BOOL make_unk_info7(SAM_UNK_INFO_7 *u_7)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_unk_info7(char *desc, SAM_UNK_INFO_7 *u_7, prs_struct *ps, int depth)
+static BOOL sam_io_unk_info7(char *desc, SAM_UNK_INFO_7 * u_7,
+			     prs_struct * ps, int depth)
 {
-	if (u_7 == NULL) return False;
+	if (u_7 == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_unk_info7");
 	depth++;
 
-	prs_uint16("unknown_0", ps, depth, &u_7->unknown_0); /* 0x0003 */
+	prs_uint16("unknown_0", ps, depth, &u_7->unknown_0);	/* 0x0003 */
 	prs_align(ps);
 
 
@@ -515,12 +556,13 @@ static BOOL sam_io_unk_info7(char *desc, SAM_UNK_INFO_7 *u_7, prs_struct *ps, in
 /*******************************************************************
 makes a structure.
 ********************************************************************/
-BOOL make_unk_info2(SAM_UNK_INFO_2 *u_2, char *domain, char *server)
+BOOL make_unk_info2(SAM_UNK_INFO_2 * u_2, char *domain, char *server)
 {
 	int len_domain = strlen(domain);
 	int len_server = strlen(server);
 
-	if (u_2 == NULL) return False;
+	if (u_2 == NULL)
+		return False;
 
 	u_2->unknown_0 = 0x00000000;
 	u_2->unknown_1 = 0x80000000;
@@ -532,15 +574,15 @@ BOOL make_unk_info2(SAM_UNK_INFO_2 *u_2, char *domain, char *server)
 
 	u_2->seq_num = 0x10000000;
 	u_2->unknown_3 = 0x00000000;
-	
-	u_2->unknown_4  = 0x00000001;
-	u_2->unknown_5  = 0x00000003;
-	u_2->unknown_6  = 0x00000001;
-	u_2->num_domain_usrs  = MAX_SAM_ENTRIES;
+
+	u_2->unknown_4 = 0x00000001;
+	u_2->unknown_5 = 0x00000003;
+	u_2->unknown_6 = 0x00000001;
+	u_2->num_domain_usrs = MAX_SAM_ENTRIES;
 	u_2->num_domain_grps = MAX_SAM_ENTRIES;
 	u_2->num_local_grps = MAX_SAM_ENTRIES;
 
-	memset(u_2->padding, 0, sizeof(u_2->padding)); /* 12 bytes zeros */
+	memset(u_2->padding, 0, sizeof(u_2->padding));	/* 12 bytes zeros */
 
 	make_unistr2(&u_2->uni_domain, domain, len_domain);
 	make_unistr2(&u_2->uni_server, server, len_server);
@@ -551,40 +593,44 @@ BOOL make_unk_info2(SAM_UNK_INFO_2 *u_2, char *domain, char *server)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_unk_info2(char *desc, SAM_UNK_INFO_2 *u_2, prs_struct *ps, int depth)
+static BOOL sam_io_unk_info2(char *desc, SAM_UNK_INFO_2 * u_2,
+			     prs_struct * ps, int depth)
 {
-	if (u_2 == NULL) return False;
+	if (u_2 == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_unk_info2");
 	depth++;
 
-	prs_uint32("unknown_0", ps, depth, &u_2->unknown_0); /* 0x0000 0000 */
-	prs_uint32("unknown_1", ps, depth, &u_2->unknown_1); /* 0x8000 0000 */
-	prs_uint32("unknown_2", ps, depth, &u_2->unknown_2); /* 0x0000 0000 */
+	prs_uint32("unknown_0", ps, depth, &u_2->unknown_0);	/* 0x0000 0000 */
+	prs_uint32("unknown_1", ps, depth, &u_2->unknown_1);	/* 0x8000 0000 */
+	prs_uint32("unknown_2", ps, depth, &u_2->unknown_2);	/* 0x0000 0000 */
 
-	prs_uint32("ptr_0", ps, depth, &u_2->ptr_0);     /* pointer to unknown structure */
-	smb_io_unihdr("hdr_domain", &u_2->hdr_domain, ps, depth); /* domain name unicode header */
-	smb_io_unihdr("hdr_server", &u_2->hdr_server, ps, depth); /* server name unicode header */
+	prs_uint32("ptr_0", ps, depth, &u_2->ptr_0);	/* pointer to unknown structure */
+	smb_io_unihdr("hdr_domain", &u_2->hdr_domain, ps, depth);	/* domain name unicode header */
+	smb_io_unihdr("hdr_server", &u_2->hdr_server, ps, depth);	/* server name unicode header */
 
 	/* put all the data in here, at the moment, including what the above
 	   pointer is referring to
 	 */
 
-	prs_uint32("seq_num ", ps, depth, &u_2->seq_num ); /* 0x0000 0099 or 0x1000 0000 */
-	prs_uint32("unknown_3 ", ps, depth, &u_2->unknown_3 ); /* 0x0000 0000 */
-	
-	prs_uint32("unknown_4 ", ps, depth, &u_2->unknown_4 ); /* 0x0000 0001 */
-	prs_uint32("unknown_5 ", ps, depth, &u_2->unknown_5 ); /* 0x0000 0003 */
-	prs_uint32("unknown_6 ", ps, depth, &u_2->unknown_6 ); /* 0x0000 0001 */
-	prs_uint32("num_domain_usrs ", ps, depth, &u_2->num_domain_usrs ); /* 0x0000 0008 */
-	prs_uint32("num_domain_grps", ps, depth, &u_2->num_domain_grps); /* 0x0000 0003 */
-	prs_uint32("num_local_grps", ps, depth, &u_2->num_local_grps); /* 0x0000 0003 */
+	prs_uint32("seq_num ", ps, depth, &u_2->seq_num);	/* 0x0000 0099 or 0x1000 0000 */
+	prs_uint32("unknown_3 ", ps, depth, &u_2->unknown_3);	/* 0x0000 0000 */
 
-	prs_uint8s(False, "padding", ps, depth, u_2->padding, sizeof(u_2->padding)); /* 12 bytes zeros */
+	prs_uint32("unknown_4 ", ps, depth, &u_2->unknown_4);	/* 0x0000 0001 */
+	prs_uint32("unknown_5 ", ps, depth, &u_2->unknown_5);	/* 0x0000 0003 */
+	prs_uint32("unknown_6 ", ps, depth, &u_2->unknown_6);	/* 0x0000 0001 */
+	prs_uint32("num_domain_usrs ", ps, depth, &u_2->num_domain_usrs);	/* 0x0000 0008 */
+	prs_uint32("num_domain_grps", ps, depth, &u_2->num_domain_grps);	/* 0x0000 0003 */
+	prs_uint32("num_local_grps", ps, depth, &u_2->num_local_grps);	/* 0x0000 0003 */
 
-	smb_io_unistr2( "uni_domain", &u_2->uni_domain, u_2->hdr_domain.buffer, ps, depth); /* domain name unicode string */
+	prs_uint8s(False, "padding", ps, depth, u_2->padding, sizeof(u_2->padding));	/* 12 bytes zeros */
+
+	smb_io_unistr2("uni_domain", &u_2->uni_domain, u_2->hdr_domain.buffer,
+		       ps, depth);	/* domain name unicode string */
 	prs_align(ps);
-	smb_io_unistr2( "uni_server", &u_2->uni_server, u_2->hdr_server.buffer, ps, depth); /* server name unicode string */
+	smb_io_unistr2("uni_server", &u_2->uni_server, u_2->hdr_server.buffer,
+		       ps, depth);	/* server name unicode string */
 
 	prs_align(ps);
 
@@ -595,11 +641,12 @@ static BOOL sam_io_unk_info2(char *desc, SAM_UNK_INFO_2 *u_2, prs_struct *ps, in
 /*******************************************************************
 makes a structure.
 ********************************************************************/
-BOOL make_unk_info1(SAM_UNK_INFO_1 *u_1)
+BOOL make_unk_info1(SAM_UNK_INFO_1 * u_1)
 {
-	if (u_1 == NULL) return False;
+	if (u_1 == NULL)
+		return False;
 
-	memset(u_1->padding, 0, sizeof(u_1->padding)); /* 12 bytes zeros */
+	memset(u_1->padding, 0, sizeof(u_1->padding));	/* 12 bytes zeros */
 	u_1->unknown_1 = 0x80000000;
 	u_1->unknown_2 = 0x00000000;
 
@@ -609,17 +656,19 @@ BOOL make_unk_info1(SAM_UNK_INFO_1 *u_1)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_unk_info1(char *desc, SAM_UNK_INFO_1 *u_1, prs_struct *ps, int depth)
+static BOOL sam_io_unk_info1(char *desc, SAM_UNK_INFO_1 * u_1,
+			     prs_struct * ps, int depth)
 {
-	if (u_1 == NULL) return False;
+	if (u_1 == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_unk_info1");
 	depth++;
 
-	prs_uint8s(False, "padding", ps, depth, u_1->padding, sizeof(u_1->padding)); /* 12 bytes zeros */
+	prs_uint8s(False, "padding", ps, depth, u_1->padding, sizeof(u_1->padding));	/* 12 bytes zeros */
 
-	prs_uint32("unknown_1", ps, depth, &u_1->unknown_1); /* 0x8000 0000 */
-	prs_uint32("unknown_2", ps, depth, &u_1->unknown_2); /* 0x0000 0000 */
+	prs_uint32("unknown_1", ps, depth, &u_1->unknown_1);	/* 0x8000 0000 */
+	prs_uint32("unknown_2", ps, depth, &u_1->unknown_2);	/* 0x0000 0000 */
 
 	prs_align(ps);
 
@@ -629,17 +678,18 @@ static BOOL sam_io_unk_info1(char *desc, SAM_UNK_INFO_1 *u_1, prs_struct *ps, in
 /*******************************************************************
 makes a SAMR_R_QUERY_DOMAIN_INFO structure.
 ********************************************************************/
-BOOL make_samr_r_query_dom_info(SAMR_R_QUERY_DOMAIN_INFO *r_u, 
-				uint16 switch_value, SAM_UNK_CTR *ctr,
+BOOL make_samr_r_query_dom_info(SAMR_R_QUERY_DOMAIN_INFO * r_u,
+				uint16 switch_value, SAM_UNK_CTR * ctr,
 				uint32 status)
 {
-	if (r_u == NULL || ctr == NULL) return False;
+	if (r_u == NULL || ctr == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_query_dom_info\n"));
+	DEBUG(5, ("make_samr_r_query_dom_info\n"));
 
 	r_u->ptr_0 = 0;
 	r_u->switch_value = 0;
-	r_u->status = status; /* return status */
+	r_u->status = status;	/* return status */
 
 	if (status == 0)
 	{
@@ -654,9 +704,11 @@ BOOL make_samr_r_query_dom_info(SAMR_R_QUERY_DOMAIN_INFO *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_query_dom_info(char *desc, SAMR_R_QUERY_DOMAIN_INFO *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_query_dom_info(char *desc, SAMR_R_QUERY_DOMAIN_INFO * r_u,
+			      prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_query_dom_info");
 	depth++;
@@ -674,34 +726,47 @@ BOOL samr_io_r_query_dom_info(char *desc, SAMR_R_QUERY_DOMAIN_INFO *r_u, prs_str
 		{
 			case 0x07:
 			{
-				sam_io_unk_info7("unk_inf7", &r_u->ctr->info.inf7, ps, depth);
+				sam_io_unk_info7("unk_inf7",
+						 &r_u->ctr->info.inf7, ps,
+						 depth);
 				break;
 			}
 			case 0x06:
 			{
-				sam_io_unk_info6("unk_inf6", &r_u->ctr->info.inf6, ps, depth);
+				sam_io_unk_info6("unk_inf6",
+						 &r_u->ctr->info.inf6, ps,
+						 depth);
 				break;
 			}
 			case 0x03:
 			{
-				sam_io_unk_info3("unk_inf3", &r_u->ctr->info.inf3, ps, depth);
+				sam_io_unk_info3("unk_inf3",
+						 &r_u->ctr->info.inf3, ps,
+						 depth);
 				break;
 			}
 			case 0x02:
 			{
-				sam_io_unk_info2("unk_inf2", &r_u->ctr->info.inf2, ps, depth);
+				sam_io_unk_info2("unk_inf2",
+						 &r_u->ctr->info.inf2, ps,
+						 depth);
 				break;
 			}
 			case 0x01:
 			{
-				sam_io_unk_info1("unk_inf1", &r_u->ctr->info.inf1, ps, depth);
+				sam_io_unk_info1("unk_inf1",
+						 &r_u->ctr->info.inf1, ps,
+						 depth);
 				break;
 			}
 			default:
 			{
-				DEBUG(3,("samr_io_r_query_dom_info: unknown switch level 0x%x\n",
-				          r_u->switch_value));
-				r_u->status = 0xC0000000|NT_STATUS_INVALID_INFO_CLASS;
+				DEBUG(3,
+				      ("samr_io_r_query_dom_info: unknown switch level 0x%x\n",
+				       r_u->switch_value));
+				r_u->status =
+					0xC0000000 |
+					NT_STATUS_INVALID_INFO_CLASS;
 				return False;
 			}
 		}
@@ -716,9 +781,11 @@ BOOL samr_io_r_query_dom_info(char *desc, SAMR_R_QUERY_DOMAIN_INFO *r_u, prs_str
 /*******************************************************************
 reads or writes a SAMR_R_QUERY_SEC_OBJ structure.
 ********************************************************************/
-BOOL samr_io_r_query_sec_obj(char *desc,  SAMR_R_QUERY_SEC_OBJ *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_query_sec_obj(char *desc, SAMR_R_QUERY_SEC_OBJ * r_u,
+			     prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_query_sec_obj");
 	depth++;
@@ -738,20 +805,23 @@ BOOL samr_io_r_query_sec_obj(char *desc,  SAMR_R_QUERY_SEC_OBJ *r_u, prs_struct
 /*******************************************************************
 reads or writes a SAM_STR1 structure.
 ********************************************************************/
-static BOOL sam_io_sam_str1(char *desc,  SAM_STR1 *sam, uint32 acct_buf, uint32 name_buf, uint32 desc_buf, prs_struct *ps, int depth)
+static BOOL sam_io_sam_str1(char *desc, SAM_STR1 * sam, uint32 acct_buf,
+			    uint32 name_buf, uint32 desc_buf, prs_struct * ps,
+			    int depth)
 {
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_sam_str1");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_unistr2("name", &(sam->uni_acct_name), acct_buf, ps, depth); /* account name unicode string */
+	smb_io_unistr2("name", &(sam->uni_acct_name), acct_buf, ps, depth);	/* account name unicode string */
 	prs_align(ps);
-	smb_io_unistr2("full_name", &(sam->uni_full_name), name_buf, ps, depth); /* full name unicode string */
+	smb_io_unistr2("full_name", &(sam->uni_full_name), name_buf, ps, depth);	/* full name unicode string */
 	prs_align(ps);
-	smb_io_unistr2("desc", &(sam->uni_acct_desc), desc_buf, ps, depth); /* account desc unicode string */
+	smb_io_unistr2("desc", &(sam->uni_acct_desc), desc_buf, ps, depth);	/* account desc unicode string */
 	prs_align(ps);
 
 	return True;
@@ -760,18 +830,20 @@ static BOOL sam_io_sam_str1(char *desc,  SAM_STR1 *sam, uint32 acct_buf, uint32
 /*******************************************************************
 makes a SAM_ENTRY1 structure.
 ********************************************************************/
-static BOOL make_sam_entry1(SAM_ENTRY1 *sam, uint32 user_idx, 
-				uint32 len_sam_name, uint32 len_sam_full, uint32 len_sam_desc,
-				uint32 rid_user, uint16 acb_info)
+static BOOL make_sam_entry1(SAM_ENTRY1 * sam, uint32 user_idx,
+			    uint32 len_sam_name, uint32 len_sam_full,
+			    uint32 len_sam_desc, uint32 rid_user,
+			    uint16 acb_info)
 {
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
-	DEBUG(5,("make_sam_entry1\n"));
+	DEBUG(5, ("make_sam_entry1\n"));
 
 	sam->user_idx = user_idx;
 	sam->rid_user = rid_user;
 	sam->acb_info = acb_info;
-	sam->pad      = 0;
+	sam->pad = 0;
 
 	make_uni_hdr(&(sam->hdr_acct_name), len_sam_name);
 	make_uni_hdr(&(sam->hdr_user_name), len_sam_full);
@@ -783,24 +855,26 @@ static BOOL make_sam_entry1(SAM_ENTRY1 *sam, uint32 user_idx,
 /*******************************************************************
 reads or writes a SAM_ENTRY1 structure.
 ********************************************************************/
-static BOOL sam_io_sam_entry1(char *desc,  SAM_ENTRY1 *sam, prs_struct *ps, int depth)
+static BOOL sam_io_sam_entry1(char *desc, SAM_ENTRY1 * sam, prs_struct * ps,
+			      int depth)
 {
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_sam_entry1");
 	depth++;
 
 	prs_align(ps);
 
-	prs_uint32("user_idx ", ps, depth, &(sam->user_idx ));
+	prs_uint32("user_idx ", ps, depth, &(sam->user_idx));
 
-	prs_uint32("rid_user ", ps, depth, &(sam->rid_user ));
-	prs_uint16("acb_info ", ps, depth, &(sam->acb_info ));
-	prs_uint16("pad      ", ps, depth, &(sam->pad      ));
+	prs_uint32("rid_user ", ps, depth, &(sam->rid_user));
+	prs_uint16("acb_info ", ps, depth, &(sam->acb_info));
+	prs_uint16("pad      ", ps, depth, &(sam->pad));
 
-	smb_io_unihdr("unihdr", &(sam->hdr_acct_name), ps, depth); /* account name unicode string header */
-	smb_io_unihdr("unihdr", &(sam->hdr_user_name), ps, depth); /* account name unicode string header */
-	smb_io_unihdr("unihdr", &(sam->hdr_user_desc), ps, depth); /* account name unicode string header */
+	smb_io_unihdr("unihdr", &(sam->hdr_acct_name), ps, depth);	/* account name unicode string header */
+	smb_io_unihdr("unihdr", &(sam->hdr_user_name), ps, depth);	/* account name unicode string header */
+	smb_io_unihdr("unihdr", &(sam->hdr_user_desc), ps, depth);	/* account name unicode string header */
 
 	return True;
 }
@@ -808,18 +882,20 @@ static BOOL sam_io_sam_entry1(char *desc,  SAM_ENTRY1 *sam, prs_struct *ps, int
 /*******************************************************************
 reads or writes a SAM_STR2 structure.
 ********************************************************************/
-static BOOL sam_io_sam_str2(char *desc,  SAM_STR2 *sam, uint32 acct_buf, uint32 desc_buf, prs_struct *ps, int depth)
+static BOOL sam_io_sam_str2(char *desc, SAM_STR2 * sam, uint32 acct_buf,
+			    uint32 desc_buf, prs_struct * ps, int depth)
 {
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_sam_str2");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_unistr2("unistr2", &(sam->uni_srv_name), acct_buf, ps, depth); /* account name unicode string */
+	smb_io_unistr2("unistr2", &(sam->uni_srv_name), acct_buf, ps, depth);	/* account name unicode string */
 	prs_align(ps);
-	smb_io_unistr2("unistr2", &(sam->uni_srv_desc), desc_buf, ps, depth); /* account desc unicode string */
+	smb_io_unistr2("unistr2", &(sam->uni_srv_desc), desc_buf, ps, depth);	/* account desc unicode string */
 	prs_align(ps);
 
 	return True;
@@ -828,18 +904,19 @@ static BOOL sam_io_sam_str2(char *desc,  SAM_STR2 *sam, uint32 acct_buf, uint32
 /*******************************************************************
 makes a SAM_ENTRY2 structure.
 ********************************************************************/
-static BOOL make_sam_entry2(SAM_ENTRY2 *sam, uint32 user_idx, 
-				uint32 len_sam_name, uint32 len_sam_desc,
-				uint32 rid_user, uint16 acb_info)
+static BOOL make_sam_entry2(SAM_ENTRY2 * sam, uint32 user_idx,
+			    uint32 len_sam_name, uint32 len_sam_desc,
+			    uint32 rid_user, uint16 acb_info)
 {
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
-	DEBUG(5,("make_sam_entry2\n"));
+	DEBUG(5, ("make_sam_entry2\n"));
 
 	sam->user_idx = user_idx;
 	sam->rid_user = rid_user;
 	sam->acb_info = acb_info;
-	sam->pad      = 0;
+	sam->pad = 0;
 
 	make_uni_hdr(&(sam->hdr_srv_name), len_sam_name);
 	make_uni_hdr(&(sam->hdr_srv_desc), len_sam_desc);
@@ -850,23 +927,25 @@ static BOOL make_sam_entry2(SAM_ENTRY2 *sam, uint32 user_idx,
 /*******************************************************************
 reads or writes a SAM_ENTRY2 structure.
 ********************************************************************/
-static BOOL sam_io_sam_entry2(char *desc,  SAM_ENTRY2 *sam, prs_struct *ps, int depth)
+static BOOL sam_io_sam_entry2(char *desc, SAM_ENTRY2 * sam, prs_struct * ps,
+			      int depth)
 {
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_sam_entry2");
 	depth++;
 
 	prs_align(ps);
 
-	prs_uint32("user_idx ", ps, depth, &(sam->user_idx ));
+	prs_uint32("user_idx ", ps, depth, &(sam->user_idx));
 
-	prs_uint32("rid_user ", ps, depth, &(sam->rid_user ));
-	prs_uint16("acb_info ", ps, depth, &(sam->acb_info ));
-	prs_uint16("pad      ", ps, depth, &(sam->pad      ));
+	prs_uint32("rid_user ", ps, depth, &(sam->rid_user));
+	prs_uint16("acb_info ", ps, depth, &(sam->acb_info));
+	prs_uint16("pad      ", ps, depth, &(sam->pad));
 
-	smb_io_unihdr("unihdr", &(sam->hdr_srv_name), ps, depth); /* account name unicode string header */
-	smb_io_unihdr("unihdr", &(sam->hdr_srv_desc), ps, depth); /* account name unicode string header */
+	smb_io_unihdr("unihdr", &(sam->hdr_srv_name), ps, depth);	/* account name unicode string header */
+	smb_io_unihdr("unihdr", &(sam->hdr_srv_desc), ps, depth);	/* account name unicode string header */
 
 	return True;
 }
@@ -874,18 +953,20 @@ static BOOL sam_io_sam_entry2(char *desc,  SAM_ENTRY2 *sam, prs_struct *ps, int
 /*******************************************************************
 reads or writes a SAM_STR3 structure.
 ********************************************************************/
-static BOOL sam_io_sam_str3(char *desc,  SAM_STR3 *sam, uint32 acct_buf, uint32 desc_buf, prs_struct *ps, int depth)
+static BOOL sam_io_sam_str3(char *desc, SAM_STR3 * sam, uint32 acct_buf,
+			    uint32 desc_buf, prs_struct * ps, int depth)
 {
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_sam_str3");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_unistr2("unistr2", &(sam->uni_grp_name), acct_buf, ps, depth); /* account name unicode string */
+	smb_io_unistr2("unistr2", &(sam->uni_grp_name), acct_buf, ps, depth);	/* account name unicode string */
 	prs_align(ps);
-	smb_io_unistr2("unistr2", &(sam->uni_grp_desc), desc_buf, ps, depth); /* account desc unicode string */
+	smb_io_unistr2("unistr2", &(sam->uni_grp_desc), desc_buf, ps, depth);	/* account desc unicode string */
 	prs_align(ps);
 
 	return True;
@@ -894,16 +975,18 @@ static BOOL sam_io_sam_str3(char *desc,  SAM_STR3 *sam, uint32 acct_buf, uint32
 /*******************************************************************
 makes a SAM_ENTRY3 structure.
 ********************************************************************/
-static BOOL make_sam_entry3(SAM_ENTRY3 *sam, uint32 grp_idx, 
-				uint32 len_grp_name, uint32 len_grp_desc, uint32 rid_grp)
+static BOOL make_sam_entry3(SAM_ENTRY3 * sam, uint32 grp_idx,
+			    uint32 len_grp_name, uint32 len_grp_desc,
+			    uint32 rid_grp)
 {
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
-	DEBUG(5,("make_sam_entry3\n"));
+	DEBUG(5, ("make_sam_entry3\n"));
 
 	sam->grp_idx = grp_idx;
 	sam->rid_grp = rid_grp;
-	sam->attr    = 0x07; /* group rid attributes - gets ignored by nt 4.0 */
+	sam->attr = 0x07;	/* group rid attributes - gets ignored by nt 4.0 */
 
 	make_uni_hdr(&(sam->hdr_grp_name), len_grp_name);
 	make_uni_hdr(&(sam->hdr_grp_desc), len_grp_desc);
@@ -914,9 +997,11 @@ static BOOL make_sam_entry3(SAM_ENTRY3 *sam, uint32 grp_idx,
 /*******************************************************************
 reads or writes a SAM_ENTRY3 structure.
 ********************************************************************/
-static BOOL sam_io_sam_entry3(char *desc,  SAM_ENTRY3 *sam, prs_struct *ps, int depth)
+static BOOL sam_io_sam_entry3(char *desc, SAM_ENTRY3 * sam, prs_struct * ps,
+			      int depth)
 {
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_sam_entry3");
 	depth++;
@@ -926,10 +1011,10 @@ static BOOL sam_io_sam_entry3(char *desc,  SAM_ENTRY3 *sam, prs_struct *ps, int
 	prs_uint32("grp_idx", ps, depth, &(sam->grp_idx));
 
 	prs_uint32("rid_grp", ps, depth, &(sam->rid_grp));
-	prs_uint32("attr   ", ps, depth, &(sam->attr   ));
+	prs_uint32("attr   ", ps, depth, &(sam->attr));
 
-	smb_io_unihdr("unihdr", &(sam->hdr_grp_name), ps, depth); /* account name unicode string header */
-	smb_io_unihdr("unihdr", &(sam->hdr_grp_desc), ps, depth); /* account name unicode string header */
+	smb_io_unihdr("unihdr", &(sam->hdr_grp_name), ps, depth);	/* account name unicode string header */
+	smb_io_unihdr("unihdr", &(sam->hdr_grp_desc), ps, depth);	/* account name unicode string header */
 
 	return True;
 }
@@ -937,12 +1022,13 @@ static BOOL sam_io_sam_entry3(char *desc,  SAM_ENTRY3 *sam, prs_struct *ps, int
 /*******************************************************************
 makes a SAM_ENTRY4 structure.
 ********************************************************************/
-static BOOL make_sam_entry4(SAM_ENTRY4 *sam, uint32 user_idx, 
-				uint32 len_acct_name)
+static BOOL make_sam_entry4(SAM_ENTRY4 * sam, uint32 user_idx,
+			    uint32 len_acct_name)
 {
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
-	DEBUG(5,("make_sam_entry4\n"));
+	DEBUG(5, ("make_sam_entry4\n"));
 
 	sam->user_idx = user_idx;
 	make_str_hdr(&(sam->hdr_acct_name), len_acct_name, len_acct_name,
@@ -954,9 +1040,11 @@ static BOOL make_sam_entry4(SAM_ENTRY4 *sam, uint32 user_idx,
 /*******************************************************************
 reads or writes a SAM_ENTRY4 structure.
 ********************************************************************/
-static BOOL sam_io_sam_entry4(char *desc, SAM_ENTRY4 *sam, prs_struct *ps, int depth)
+static BOOL sam_io_sam_entry4(char *desc, SAM_ENTRY4 * sam, prs_struct * ps,
+			      int depth)
 {
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_sam_entry4");
 	depth++;
@@ -972,12 +1060,13 @@ static BOOL sam_io_sam_entry4(char *desc, SAM_ENTRY4 *sam, prs_struct *ps, int d
 /*******************************************************************
 makes a SAM_ENTRY5 structure.
 ********************************************************************/
-static BOOL make_sam_entry5(SAM_ENTRY5 *sam, uint32 grp_idx, 
-				uint32 len_grp_name)
+static BOOL make_sam_entry5(SAM_ENTRY5 * sam, uint32 grp_idx,
+			    uint32 len_grp_name)
 {
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
-	DEBUG(5,("make_sam_entry5\n"));
+	DEBUG(5, ("make_sam_entry5\n"));
 
 	sam->grp_idx = grp_idx;
 	make_str_hdr(&(sam->hdr_grp_name), len_grp_name, len_grp_name,
@@ -989,9 +1078,11 @@ static BOOL make_sam_entry5(SAM_ENTRY5 *sam, uint32 grp_idx,
 /*******************************************************************
 reads or writes a SAM_ENTRY5 structure.
 ********************************************************************/
-static BOOL sam_io_sam_entry5(char *desc, SAM_ENTRY5 *sam, prs_struct *ps, int depth)
+static BOOL sam_io_sam_entry5(char *desc, SAM_ENTRY5 * sam, prs_struct * ps,
+			      int depth)
 {
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_sam_entry5");
 	depth++;
@@ -1007,11 +1098,12 @@ static BOOL sam_io_sam_entry5(char *desc, SAM_ENTRY5 *sam, prs_struct *ps, int d
 /*******************************************************************
 makes a SAM_ENTRY structure.
 ********************************************************************/
-BOOL make_sam_entry(SAM_ENTRY *sam, uint32 len_sam_name, uint32 rid)
+BOOL make_sam_entry(SAM_ENTRY * sam, uint32 len_sam_name, uint32 rid)
 {
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
-	DEBUG(10,("make_sam_entry: %d %d\n", len_sam_name, rid));
+	DEBUG(10, ("make_sam_entry: %d %d\n", len_sam_name, rid));
 
 	sam->rid = rid;
 	make_uni_hdr(&(sam->hdr_name), len_sam_name);
@@ -1022,16 +1114,18 @@ BOOL make_sam_entry(SAM_ENTRY *sam, uint32 len_sam_name, uint32 rid)
 /*******************************************************************
 reads or writes a SAM_ENTRY structure.
 ********************************************************************/
-static BOOL sam_io_sam_entry(char *desc,  SAM_ENTRY *sam, prs_struct *ps, int depth)
+static BOOL sam_io_sam_entry(char *desc, SAM_ENTRY * sam, prs_struct * ps,
+			     int depth)
 {
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_sam_entry");
 	depth++;
 
 	prs_align(ps);
-	prs_uint32("rid", ps, depth, &(sam->rid ));
-	smb_io_unihdr("unihdr", &(sam->hdr_name), ps, depth); /* account name unicode string header */
+	prs_uint32("rid", ps, depth, &(sam->rid));
+	smb_io_unihdr("unihdr", &(sam->hdr_name), ps, depth);	/* account name unicode string header */
 
 	return True;
 }
@@ -1040,18 +1134,19 @@ static BOOL sam_io_sam_entry(char *desc,  SAM_ENTRY *sam, prs_struct *ps, int de
 /*******************************************************************
 makes a SAMR_Q_ENUM_DOM_USERS structure.
 ********************************************************************/
-BOOL make_samr_q_enum_dom_users(SAMR_Q_ENUM_DOM_USERS *q_e, POLICY_HND *pol,
-				uint32 start_idx, 
+BOOL make_samr_q_enum_dom_users(SAMR_Q_ENUM_DOM_USERS * q_e, POLICY_HND * pol,
+				uint32 start_idx,
 				uint16 acb_mask, uint16 unk_1, uint32 size)
 {
-	if (q_e == NULL || pol == NULL) return False;
+	if (q_e == NULL || pol == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_enum_dom_users\n"));
+	DEBUG(5, ("make_samr_q_enum_dom_users\n"));
 
 	q_e->pol = *pol;
 
-	q_e->start_idx = start_idx; /* zero indicates lots */
-	q_e->acb_mask  = acb_mask;
+	q_e->start_idx = start_idx;	/* zero indicates lots */
+	q_e->acb_mask = acb_mask;
 	q_e->unknown_1 = unk_1;
 	q_e->max_size = size;
 
@@ -1061,23 +1156,25 @@ BOOL make_samr_q_enum_dom_users(SAMR_Q_ENUM_DOM_USERS *q_e, POLICY_HND *pol,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_enum_dom_users(char *desc,  SAMR_Q_ENUM_DOM_USERS *q_e, prs_struct *ps, int depth)
+BOOL samr_io_q_enum_dom_users(char *desc, SAMR_Q_ENUM_DOM_USERS * q_e,
+			      prs_struct * ps, int depth)
 {
-	if (q_e == NULL) return False;
+	if (q_e == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_enum_dom_users");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("start_idx", ps, depth, &(q_e->start_idx));
-	prs_uint16("acb_mask ", ps, depth, &(q_e->acb_mask ));
+	prs_uint16("acb_mask ", ps, depth, &(q_e->acb_mask));
 	prs_uint16("unknown_1", ps, depth, &(q_e->unknown_1));
 
-	prs_uint32("max_size ", ps, depth, &(q_e->max_size ));
+	prs_uint32("max_size ", ps, depth, &(q_e->max_size));
 
 	prs_align(ps);
 
@@ -1088,13 +1185,13 @@ BOOL samr_io_q_enum_dom_users(char *desc,  SAMR_Q_ENUM_DOM_USERS *q_e, prs_struc
 /*******************************************************************
 makes a SAMR_R_ENUM_DOM_USERS structure.
 ********************************************************************/
-BOOL make_samr_r_enum_dom_users(SAMR_R_ENUM_DOM_USERS *r_u,
-		uint32 next_idx,
-		uint32 num_sam_entries)
+BOOL make_samr_r_enum_dom_users(SAMR_R_ENUM_DOM_USERS * r_u,
+				uint32 next_idx, uint32 num_sam_entries)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_enum_dom_users\n"));
+	DEBUG(5, ("make_samr_r_enum_dom_users\n"));
 
 	r_u->next_idx = next_idx;
 
@@ -1120,18 +1217,20 @@ BOOL make_samr_r_enum_dom_users(SAMR_R_ENUM_DOM_USERS *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_enum_dom_users(char *desc, SAMR_R_ENUM_DOM_USERS *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_enum_dom_users(char *desc, SAMR_R_ENUM_DOM_USERS * r_u,
+			      prs_struct * ps, int depth)
 {
 	uint32 i;
 
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_enum_dom_users");
 	depth++;
 
 	prs_align(ps);
 
-	prs_uint32("next_idx    ", ps, depth, &(r_u->next_idx    ));
+	prs_uint32("next_idx    ", ps, depth, &(r_u->next_idx));
 	prs_uint32("ptr_entries1", ps, depth, &(r_u->ptr_entries1));
 
 	if (r_u->ptr_entries1 != 0)
@@ -1142,15 +1241,25 @@ BOOL samr_io_r_enum_dom_users(char *desc, SAMR_R_ENUM_DOM_USERS *r_u, prs_struct
 
 		if (ps->io)
 		{
-			r_u->sam = (SAM_ENTRY*)Realloc(NULL, r_u->num_entries2 * sizeof(r_u->sam[0]));
-			r_u->uni_acct_name = (UNISTR2*)Realloc(NULL, r_u->num_entries2 * sizeof(r_u->uni_acct_name[0]));
+			r_u->sam =
+				(SAM_ENTRY *) Realloc(NULL,
+						      r_u->num_entries2 *
+						      sizeof(r_u->sam[0]));
+			r_u->uni_acct_name =
+				(UNISTR2 *) Realloc(NULL,
+						    r_u->num_entries2 *
+						    sizeof(r_u->
+							   uni_acct_name[0]));
 		}
 
-		if ((r_u->sam == NULL || r_u->uni_acct_name == NULL) && r_u->num_entries2 != 0)
+		if ((r_u->sam == NULL || r_u->uni_acct_name == NULL)
+		    && r_u->num_entries2 != 0)
 		{
-			DEBUG(0,("NULL pointers in SAMR_R_ENUM_DOM_USERS\n"));
+			DEBUG(0,
+			      ("NULL pointers in SAMR_R_ENUM_DOM_USERS\n"));
 			r_u->num_entries4 = 0;
-			r_u->status = 0xC0000000|NT_STATUS_MEMORY_NOT_ALLOCATED;
+			r_u->status =
+				0xC0000000 | NT_STATUS_MEMORY_NOT_ALLOCATED;
 			return False;
 		}
 
@@ -1161,7 +1270,9 @@ BOOL samr_io_r_enum_dom_users(char *desc, SAMR_R_ENUM_DOM_USERS *r_u, prs_struct
 
 		for (i = 0; i < r_u->num_entries2; i++)
 		{
-			smb_io_unistr2("", &(r_u->uni_acct_name[i]), r_u->sam[i].hdr_name.buffer, ps, depth);
+			smb_io_unistr2("", &(r_u->uni_acct_name[i]),
+				       r_u->sam[i].hdr_name.buffer, ps,
+				       depth);
 			prs_align(ps);
 		}
 
@@ -1178,13 +1289,14 @@ BOOL samr_io_r_enum_dom_users(char *desc, SAMR_R_ENUM_DOM_USERS *r_u, prs_struct
 /*******************************************************************
 makes a SAMR_Q_QUERY_DISPINFO structure.
 ********************************************************************/
-BOOL make_samr_q_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_e, POLICY_HND *pol,
+BOOL make_samr_q_query_dispinfo(SAMR_Q_QUERY_DISPINFO * q_e, POLICY_HND * pol,
 				uint16 switch_level, uint32 start_idx,
 				uint32 max_entries)
 {
-	if (q_e == NULL || pol == NULL) return False;
+	if (q_e == NULL || pol == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_query_dispinfo\n"));
+	DEBUG(5, ("make_samr_q_query_dispinfo\n"));
 
 	q_e->domain_pol = *pol;
 
@@ -1192,7 +1304,7 @@ BOOL make_samr_q_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_e, POLICY_HND *pol,
 
 	q_e->start_idx = start_idx;
 	q_e->max_entries = max_entries;
-	q_e->max_size = 0xffff; /* Not especially useful */
+	q_e->max_size = 0xffff;	/* Not especially useful */
 
 	return True;
 }
@@ -1200,24 +1312,26 @@ BOOL make_samr_q_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_e, POLICY_HND *pol,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_query_dispinfo(char *desc,  SAMR_Q_QUERY_DISPINFO *q_e, prs_struct *ps, int depth)
+BOOL samr_io_q_query_dispinfo(char *desc, SAMR_Q_QUERY_DISPINFO * q_e,
+			      prs_struct * ps, int depth)
 {
-	if (q_e == NULL) return False;
+	if (q_e == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_query_dispinfo");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("domain_pol", &(q_e->domain_pol), ps, depth); 
+	smb_io_pol_hnd("domain_pol", &(q_e->domain_pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint16("switch_level", ps, depth, &(q_e->switch_level));
 	prs_align(ps);
 
-	prs_uint32("start_idx   ", ps, depth, &(q_e->start_idx   ));
-	prs_uint32("max_entries ", ps, depth, &(q_e->max_entries ));
-	prs_uint32("max_size    ", ps, depth, &(q_e->max_size    ));
+	prs_uint32("start_idx   ", ps, depth, &(q_e->start_idx));
+	prs_uint32("max_entries ", ps, depth, &(q_e->max_entries));
+	prs_uint32("max_size    ", ps, depth, &(q_e->max_size));
 
 	return True;
 }
@@ -1226,8 +1340,8 @@ BOOL samr_io_q_query_dispinfo(char *desc,  SAMR_Q_QUERY_DISPINFO *q_e, prs_struc
 /*******************************************************************
 makes a SAM_DISPINFO_1 structure.
 ********************************************************************/
-BOOL make_sam_dispinfo_1(SAM_DISPINFO_1 *sam, uint32 *num_entries,
-			 uint32 *data_size, uint32 start_idx,
+BOOL make_sam_dispinfo_1(SAM_DISPINFO_1 * sam, uint32 * num_entries,
+			 uint32 * data_size, uint32 start_idx,
 			 SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES])
 {
 	uint32 len_sam_name, len_sam_full, len_sam_desc;
@@ -1235,13 +1349,14 @@ BOOL make_sam_dispinfo_1(SAM_DISPINFO_1 *sam, uint32 *num_entries,
 	uint32 dsize = 0;
 	uint32 i;
 
-	if (sam == NULL || num_entries == NULL || data_size == NULL) return False;
+	if (sam == NULL || num_entries == NULL || data_size == NULL)
+		return False;
 
 	max_entries = *num_entries;
 	max_data_size = *data_size;
 
-	DEBUG(5,("make_sam_dispinfo_1: max_entries: %d max_dsize: 0x%x\n",
-	           max_entries, max_data_size));
+	DEBUG(5, ("make_sam_dispinfo_1: max_entries: %d max_dsize: 0x%x\n",
+		  max_entries, max_data_size));
 
 	for (i = 0; (i < max_entries) && (dsize < max_data_size); i++)
 	{
@@ -1253,16 +1368,19 @@ BOOL make_sam_dispinfo_1(SAM_DISPINFO_1 *sam, uint32 *num_entries,
 				len_sam_name, len_sam_full, len_sam_desc,
 				pass[i].user_rid, pass[i].acb_info);
 
-		copy_unistr2(&(sam->str[i].uni_acct_name), &(pass[i].uni_user_name));
-		copy_unistr2(&(sam->str[i].uni_full_name), &(pass[i].uni_full_name));
-		copy_unistr2(&(sam->str[i].uni_acct_desc), &(pass[i].uni_acct_desc));
+		copy_unistr2(&(sam->str[i].uni_acct_name),
+			     &(pass[i].uni_user_name));
+		copy_unistr2(&(sam->str[i].uni_full_name),
+			     &(pass[i].uni_full_name));
+		copy_unistr2(&(sam->str[i].uni_acct_desc),
+			     &(pass[i].uni_acct_desc));
 
 		dsize += sizeof(SAM_ENTRY1);
 		dsize += len_sam_name + len_sam_full + len_sam_desc;
 	}
 
 	*num_entries = i;
-        *data_size = dsize;
+	*data_size = dsize;
 
 	return True;
 }
@@ -1270,11 +1388,14 @@ BOOL make_sam_dispinfo_1(SAM_DISPINFO_1 *sam, uint32 *num_entries,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_sam_dispinfo_1(char *desc, SAM_DISPINFO_1 *sam, uint32 num_entries, prs_struct *ps, int depth)
+static BOOL sam_io_sam_dispinfo_1(char *desc, SAM_DISPINFO_1 * sam,
+				  uint32 num_entries, prs_struct * ps,
+				  int depth)
 {
 	uint32 i;
 
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_1");
 	depth++;
@@ -1290,11 +1411,10 @@ static BOOL sam_io_sam_dispinfo_1(char *desc, SAM_DISPINFO_1 *sam, uint32 num_en
 
 	for (i = 0; i < num_entries; i++)
 	{
-		sam_io_sam_str1 ("", &(sam->str[i]),
-				 sam->sam[i].hdr_acct_name.buffer,
-				 sam->sam[i].hdr_user_name.buffer,
-				 sam->sam[i].hdr_user_desc.buffer,
-				 ps, depth);
+		sam_io_sam_str1("", &(sam->str[i]),
+				sam->sam[i].hdr_acct_name.buffer,
+				sam->sam[i].hdr_user_name.buffer,
+				sam->sam[i].hdr_user_desc.buffer, ps, depth);
 	}
 
 	return True;
@@ -1304,8 +1424,8 @@ static BOOL sam_io_sam_dispinfo_1(char *desc, SAM_DISPINFO_1 *sam, uint32 num_en
 /*******************************************************************
 makes a SAM_DISPINFO_2 structure.
 ********************************************************************/
-BOOL make_sam_dispinfo_2(SAM_DISPINFO_2 *sam, uint32 *num_entries,
-			 uint32 *data_size, uint32 start_idx,
+BOOL make_sam_dispinfo_2(SAM_DISPINFO_2 * sam, uint32 * num_entries,
+			 uint32 * data_size, uint32 start_idx,
 			 SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES])
 {
 	uint32 len_sam_name, len_sam_desc;
@@ -1313,9 +1433,10 @@ BOOL make_sam_dispinfo_2(SAM_DISPINFO_2 *sam, uint32 *num_entries,
 	uint32 dsize = 0;
 	uint32 i;
 
-	if (sam == NULL || num_entries == NULL || data_size == NULL) return False;
+	if (sam == NULL || num_entries == NULL || data_size == NULL)
+		return False;
 
-	DEBUG(5,("make_sam_dispinfo_2\n"));
+	DEBUG(5, ("make_sam_dispinfo_2\n"));
 
 	max_entries = *num_entries;
 	max_data_size = *data_size;
@@ -1329,15 +1450,17 @@ BOOL make_sam_dispinfo_2(SAM_DISPINFO_2 *sam, uint32 *num_entries,
 				len_sam_name, len_sam_desc,
 				pass[i].user_rid, pass[i].acb_info);
 
-		copy_unistr2(&(sam->str[i].uni_srv_name), &(pass[i].uni_user_name));
-		copy_unistr2(&(sam->str[i].uni_srv_desc), &(pass[i].uni_acct_desc));
+		copy_unistr2(&(sam->str[i].uni_srv_name),
+			     &(pass[i].uni_user_name));
+		copy_unistr2(&(sam->str[i].uni_srv_desc),
+			     &(pass[i].uni_acct_desc));
 
 		dsize += sizeof(SAM_ENTRY2);
 		dsize += len_sam_name + len_sam_desc;
 	}
 
 	*num_entries = i;
-        *data_size = dsize;
+	*data_size = dsize;
 
 	return True;
 }
@@ -1345,11 +1468,14 @@ BOOL make_sam_dispinfo_2(SAM_DISPINFO_2 *sam, uint32 *num_entries,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_sam_dispinfo_2(char *desc, SAM_DISPINFO_2 *sam, uint32 num_entries, prs_struct *ps, int depth)
+static BOOL sam_io_sam_dispinfo_2(char *desc, SAM_DISPINFO_2 * sam,
+				  uint32 num_entries, prs_struct * ps,
+				  int depth)
 {
 	uint32 i;
 
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_2");
 	depth++;
@@ -1365,10 +1491,9 @@ static BOOL sam_io_sam_dispinfo_2(char *desc, SAM_DISPINFO_2 *sam, uint32 num_en
 
 	for (i = 0; i < num_entries; i++)
 	{
-		sam_io_sam_str2 ("", &(sam->str[i]),
-				 sam->sam[i].hdr_srv_name.buffer,
-				 sam->sam[i].hdr_srv_desc.buffer,
-				 ps, depth);
+		sam_io_sam_str2("", &(sam->str[i]),
+				sam->sam[i].hdr_srv_name.buffer,
+				sam->sam[i].hdr_srv_desc.buffer, ps, depth);
 	}
 
 	return True;
@@ -1378,18 +1503,19 @@ static BOOL sam_io_sam_dispinfo_2(char *desc, SAM_DISPINFO_2 *sam, uint32 num_en
 /*******************************************************************
 makes a SAM_DISPINFO_3 structure.
 ********************************************************************/
-BOOL make_sam_dispinfo_3(SAM_DISPINFO_3 *sam, uint32 *num_entries,
-			 uint32 *data_size, uint32 start_idx,
-			 DOMAIN_GRP *grp)
+BOOL make_sam_dispinfo_3(SAM_DISPINFO_3 * sam, uint32 * num_entries,
+			 uint32 * data_size, uint32 start_idx,
+			 DOMAIN_GRP * grp)
 {
 	uint32 len_sam_name, len_sam_desc;
 	uint32 max_entries, max_data_size;
 	uint32 dsize = 0;
 	uint32 i;
 
-	if (sam == NULL || num_entries == NULL || data_size == NULL) return False;
+	if (sam == NULL || num_entries == NULL || data_size == NULL)
+		return False;
 
-	DEBUG(5,("make_sam_dispinfo_3\n"));
+	DEBUG(5, ("make_sam_dispinfo_3\n"));
 
 	max_entries = *num_entries;
 	max_data_size = *data_size;
@@ -1400,11 +1526,12 @@ BOOL make_sam_dispinfo_3(SAM_DISPINFO_3 *sam, uint32 *num_entries,
 		len_sam_desc = strlen(grp[i].comment);
 
 		make_sam_entry3(&(sam->sam[i]), start_idx + i + 1,
-				len_sam_name, len_sam_desc,
-				grp[i].rid);
+				len_sam_name, len_sam_desc, grp[i].rid);
 
-		make_unistr2(&(sam->str[i].uni_grp_name), grp[i].name   , len_sam_name);
-		make_unistr2(&(sam->str[i].uni_grp_desc), grp[i].comment, len_sam_desc);
+		make_unistr2(&(sam->str[i].uni_grp_name), grp[i].name,
+			     len_sam_name);
+		make_unistr2(&(sam->str[i].uni_grp_desc), grp[i].comment,
+			     len_sam_desc);
 
 		dsize += sizeof(SAM_ENTRY3);
 		dsize += (len_sam_name + len_sam_desc) * 2;
@@ -1412,7 +1539,7 @@ BOOL make_sam_dispinfo_3(SAM_DISPINFO_3 *sam, uint32 *num_entries,
 	}
 
 	*num_entries = i;
-        *data_size = dsize;
+	*data_size = dsize;
 
 	return True;
 }
@@ -1420,11 +1547,14 @@ BOOL make_sam_dispinfo_3(SAM_DISPINFO_3 *sam, uint32 *num_entries,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_sam_dispinfo_3(char *desc, SAM_DISPINFO_3 *sam, uint32 num_entries, prs_struct *ps, int depth)
+static BOOL sam_io_sam_dispinfo_3(char *desc, SAM_DISPINFO_3 * sam,
+				  uint32 num_entries, prs_struct * ps,
+				  int depth)
 {
 	uint32 i;
 
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_3");
 	depth++;
@@ -1440,10 +1570,9 @@ static BOOL sam_io_sam_dispinfo_3(char *desc, SAM_DISPINFO_3 *sam, uint32 num_en
 
 	for (i = 0; i < num_entries; i++)
 	{
-		sam_io_sam_str3 ("", &(sam->str[i]),
-				 sam->sam[i].hdr_grp_name.buffer,
-				 sam->sam[i].hdr_grp_desc.buffer,
-				 ps, depth);
+		sam_io_sam_str3("", &(sam->str[i]),
+				sam->sam[i].hdr_grp_name.buffer,
+				sam->sam[i].hdr_grp_desc.buffer, ps, depth);
 	}
 
 	return True;
@@ -1453,8 +1582,8 @@ static BOOL sam_io_sam_dispinfo_3(char *desc, SAM_DISPINFO_3 *sam, uint32 num_en
 /*******************************************************************
 makes a SAM_DISPINFO_4 structure.
 ********************************************************************/
-BOOL make_sam_dispinfo_4(SAM_DISPINFO_4 *sam, uint32 *num_entries,
-			 uint32 *data_size, uint32 start_idx,
+BOOL make_sam_dispinfo_4(SAM_DISPINFO_4 * sam, uint32 * num_entries,
+			 uint32 * data_size, uint32 start_idx,
 			 SAM_USER_INFO_21 pass[MAX_SAM_ENTRIES])
 {
 	fstring sam_name;
@@ -1463,9 +1592,10 @@ BOOL make_sam_dispinfo_4(SAM_DISPINFO_4 *sam, uint32 *num_entries,
 	uint32 dsize = 0;
 	uint32 i;
 
-	if (sam == NULL || num_entries == NULL || data_size == NULL) return False;
+	if (sam == NULL || num_entries == NULL || data_size == NULL)
+		return False;
 
-	DEBUG(5,("make_sam_dispinfo_4\n"));
+	DEBUG(5, ("make_sam_dispinfo_4\n"));
 
 	max_entries = *num_entries;
 	max_data_size = *data_size;
@@ -1477,15 +1607,17 @@ BOOL make_sam_dispinfo_4(SAM_DISPINFO_4 *sam, uint32 *num_entries,
 		make_sam_entry4(&(sam->sam[i]), start_idx + i + 1,
 				len_sam_name);
 
-		unistr2_to_ascii(sam_name, &(pass[i].uni_user_name), sizeof(sam_name));
-		make_string2(&(sam->str[i].acct_name), sam_name, len_sam_name);
+		unistr2_to_ascii(sam_name, &(pass[i].uni_user_name),
+				 sizeof(sam_name));
+		make_string2(&(sam->str[i].acct_name), sam_name,
+			     len_sam_name);
 
 		dsize += sizeof(SAM_ENTRY4);
 		dsize += len_sam_name;
 	}
 
 	*num_entries = i;
-        *data_size = dsize;
+	*data_size = dsize;
 
 	return True;
 }
@@ -1493,11 +1625,14 @@ BOOL make_sam_dispinfo_4(SAM_DISPINFO_4 *sam, uint32 *num_entries,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_sam_dispinfo_4(char *desc, SAM_DISPINFO_4 *sam, uint32 num_entries, prs_struct *ps, int depth)
+static BOOL sam_io_sam_dispinfo_4(char *desc, SAM_DISPINFO_4 * sam,
+				  uint32 num_entries, prs_struct * ps,
+				  int depth)
 {
 	uint32 i;
 
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_4");
 	depth++;
@@ -1525,18 +1660,19 @@ static BOOL sam_io_sam_dispinfo_4(char *desc, SAM_DISPINFO_4 *sam, uint32 num_en
 /*******************************************************************
 makes a SAM_DISPINFO_5 structure.
 ********************************************************************/
-BOOL make_sam_dispinfo_5(SAM_DISPINFO_5 *sam, uint32 *num_entries,
-			 uint32 *data_size, uint32 start_idx,
-			 DOMAIN_GRP *grp)
+BOOL make_sam_dispinfo_5(SAM_DISPINFO_5 * sam, uint32 * num_entries,
+			 uint32 * data_size, uint32 start_idx,
+			 DOMAIN_GRP * grp)
 {
 	uint32 len_sam_name;
 	uint32 max_entries, max_data_size;
 	uint32 dsize = 0;
 	uint32 i;
 
-	if (sam == NULL || num_entries == NULL || data_size == NULL) return False;
+	if (sam == NULL || num_entries == NULL || data_size == NULL)
+		return False;
 
-	DEBUG(5,("make_sam_dispinfo_5\n"));
+	DEBUG(5, ("make_sam_dispinfo_5\n"));
 
 	max_entries = *num_entries;
 	max_data_size = *data_size;
@@ -1556,7 +1692,7 @@ BOOL make_sam_dispinfo_5(SAM_DISPINFO_5 *sam, uint32 *num_entries,
 	}
 
 	*num_entries = i;
-        *data_size = dsize;
+	*data_size = dsize;
 
 	return True;
 }
@@ -1564,11 +1700,14 @@ BOOL make_sam_dispinfo_5(SAM_DISPINFO_5 *sam, uint32 *num_entries,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_sam_dispinfo_5(char *desc, SAM_DISPINFO_5 *sam, uint32 num_entries, prs_struct *ps, int depth)
+static BOOL sam_io_sam_dispinfo_5(char *desc, SAM_DISPINFO_5 * sam,
+				  uint32 num_entries, prs_struct * ps,
+				  int depth)
 {
 	uint32 i;
 
-	if (sam == NULL) return False;
+	if (sam == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_sam_dispinfo_5");
 	depth++;
@@ -1596,16 +1735,17 @@ static BOOL sam_io_sam_dispinfo_5(char *desc, SAM_DISPINFO_5 *sam, uint32 num_en
 /*******************************************************************
 makes a SAMR_R_QUERY_DISPINFO structure.
 ********************************************************************/
-BOOL make_samr_r_query_dispinfo(SAMR_R_QUERY_DISPINFO *r_u,
+BOOL make_samr_r_query_dispinfo(SAMR_R_QUERY_DISPINFO * r_u,
 				uint32 num_entries, uint32 data_size,
-				uint16 switch_level, SAM_DISPINFO_CTR *ctr,
+				uint16 switch_level, SAM_DISPINFO_CTR * ctr,
 				uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_query_dispinfo: level %d\n", switch_level));
+	DEBUG(5, ("make_samr_r_query_dispinfo: level %d\n", switch_level));
 
-	r_u->total_size = data_size; /* not calculated */
+	r_u->total_size = data_size;	/* not calculated */
 	r_u->data_size = data_size;
 
 	r_u->switch_level = switch_level;
@@ -1623,54 +1763,64 @@ BOOL make_samr_r_query_dispinfo(SAMR_R_QUERY_DISPINFO *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_query_dispinfo(char *desc, SAMR_R_QUERY_DISPINFO *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_query_dispinfo(char *desc, SAMR_R_QUERY_DISPINFO * r_u,
+			      prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_query_dispinfo");
 	depth++;
 
 	prs_align(ps);
 
-	prs_uint32("total_size  ", ps, depth, &(r_u->total_size  ));
-	prs_uint32("data_size   ", ps, depth, &(r_u->data_size   ));
+	prs_uint32("total_size  ", ps, depth, &(r_u->total_size));
+	prs_uint32("data_size   ", ps, depth, &(r_u->data_size));
 	prs_uint16("switch_level", ps, depth, &(r_u->switch_level));
 	prs_align(ps);
 
-	prs_uint32("num_entries ", ps, depth, &(r_u->num_entries ));
-	prs_uint32("ptr_entries ", ps, depth, &(r_u->ptr_entries ));
+	prs_uint32("num_entries ", ps, depth, &(r_u->num_entries));
+	prs_uint32("ptr_entries ", ps, depth, &(r_u->ptr_entries));
 	prs_uint32("num_entries2", ps, depth, &(r_u->num_entries2));
 
 	switch (r_u->switch_level)
 	{
 		case 0x1:
 		{
-			sam_io_sam_dispinfo_1("users", r_u->ctr->sam.info1, r_u->num_entries, ps, depth);
+			sam_io_sam_dispinfo_1("users", r_u->ctr->sam.info1,
+					      r_u->num_entries, ps, depth);
 			break;
 		}
 		case 0x2:
 		{
-			sam_io_sam_dispinfo_2("servers", r_u->ctr->sam.info2, r_u->num_entries, ps, depth);
+			sam_io_sam_dispinfo_2("servers", r_u->ctr->sam.info2,
+					      r_u->num_entries, ps, depth);
 			break;
 		}
 		case 0x3:
 		{
-			sam_io_sam_dispinfo_3("groups", r_u->ctr->sam.info3, r_u->num_entries, ps, depth);
+			sam_io_sam_dispinfo_3("groups", r_u->ctr->sam.info3,
+					      r_u->num_entries, ps, depth);
 			break;
 		}
 		case 0x4:
 		{
-			sam_io_sam_dispinfo_4("user list", r_u->ctr->sam.info4,r_u->num_entries, ps, depth);
+			sam_io_sam_dispinfo_4("user list",
+					      r_u->ctr->sam.info4,
+					      r_u->num_entries, ps, depth);
 			break;
 		}
 		case 0x5:
 		{
-			sam_io_sam_dispinfo_5("group list", r_u->ctr->sam.info5, r_u->num_entries, ps, depth);
+			sam_io_sam_dispinfo_5("group list",
+					      r_u->ctr->sam.info5,
+					      r_u->num_entries, ps, depth);
 			break;
 		}
 		default:
 		{
-			DEBUG(5,("samr_io_r_query_dispinfo: unknown switch value\n"));
+			DEBUG(5,
+			      ("samr_io_r_query_dispinfo: unknown switch value\n"));
 			break;
 		}
 	}
@@ -1686,13 +1836,14 @@ BOOL samr_io_r_query_dispinfo(char *desc, SAMR_R_QUERY_DISPINFO *r_u, prs_struct
 /*******************************************************************
 makes a SAMR_Q_OPEN_GROUP structure.
 ********************************************************************/
-BOOL make_samr_q_open_group(SAMR_Q_OPEN_GROUP *q_c,
-				const POLICY_HND *hnd,
-				uint32 access_mask, uint32 rid)
+BOOL make_samr_q_open_group(SAMR_Q_OPEN_GROUP * q_c,
+			    const POLICY_HND * hnd,
+			    uint32 access_mask, uint32 rid)
 {
-	if (q_c == NULL || hnd == NULL) return False;
+	if (q_c == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_open_group\n"));
+	DEBUG(5, ("make_samr_q_open_group\n"));
 
 	q_c->domain_pol = *hnd;
 	q_c->access_mask = access_mask;
@@ -1704,16 +1855,18 @@ BOOL make_samr_q_open_group(SAMR_Q_OPEN_GROUP *q_c,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_open_group(char *desc,  SAMR_Q_OPEN_GROUP *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_open_group(char *desc, SAMR_Q_OPEN_GROUP * q_u,
+			  prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_open_group");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth); 
+	smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth);
 
 	prs_uint32("access_mask", ps, depth, &(q_u->access_mask));
 	prs_uint32("rid_group", ps, depth, &(q_u->rid_group));
@@ -1724,16 +1877,18 @@ BOOL samr_io_q_open_group(char *desc,  SAMR_Q_OPEN_GROUP *q_u, prs_struct *ps, i
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_open_group(char *desc,  SAMR_R_OPEN_GROUP *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_open_group(char *desc, SAMR_R_OPEN_GROUP * r_u,
+			  prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_open_group");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(r_u->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(r_u->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("status", ps, depth, &(r_u->status));
@@ -1745,15 +1900,16 @@ BOOL samr_io_r_open_group(char *desc,  SAMR_R_OPEN_GROUP *r_u, prs_struct *ps, i
 /*******************************************************************
 makes a GROUP_INFO1 structure.
 ********************************************************************/
-BOOL make_samr_group_info1(GROUP_INFO1 *gr1,
-				char *acct_name, char *acct_desc,
-				uint32 num_members)
+BOOL make_samr_group_info1(GROUP_INFO1 * gr1,
+			   char *acct_name, char *acct_desc,
+			   uint32 num_members)
 {
 	int desc_len = acct_desc != NULL ? strlen(acct_desc) : 0;
 	int acct_len = acct_name != NULL ? strlen(acct_name) : 0;
-	if (gr1 == NULL) return False;
+	if (gr1 == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_group_info1\n"));
+	DEBUG(5, ("make_samr_group_info1\n"));
 
 	make_uni_hdr(&(gr1->hdr_acct_name), acct_len);
 
@@ -1772,26 +1928,30 @@ BOOL make_samr_group_info1(GROUP_INFO1 *gr1,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_group_info1(char *desc,  GROUP_INFO1 *gr1, prs_struct *ps, int depth)
+BOOL samr_io_group_info1(char *desc, GROUP_INFO1 * gr1, prs_struct * ps,
+			 int depth)
 {
-	if (gr1 == NULL) return False;
+	if (gr1 == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_group_info1");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_unihdr ("hdr_acct_name", &(gr1->hdr_acct_name) , ps, depth); 
+	smb_io_unihdr("hdr_acct_name", &(gr1->hdr_acct_name), ps, depth);
 
 	prs_uint32("unknown_1", ps, depth, &(gr1->unknown_1));
 	prs_uint32("num_members", ps, depth, &(gr1->num_members));
 
-	smb_io_unihdr ("hdr_acct_desc", &(gr1->hdr_acct_desc) , ps, depth); 
+	smb_io_unihdr("hdr_acct_desc", &(gr1->hdr_acct_desc), ps, depth);
 
-	smb_io_unistr2("uni_acct_name", &(gr1->uni_acct_name), gr1->hdr_acct_name.buffer, ps, depth);
+	smb_io_unistr2("uni_acct_name", &(gr1->uni_acct_name),
+		       gr1->hdr_acct_name.buffer, ps, depth);
 	prs_align(ps);
 
-	smb_io_unistr2("uni_acct_desc", &(gr1->uni_acct_desc), gr1->hdr_acct_desc.buffer, ps, depth);
+	smb_io_unistr2("uni_acct_desc", &(gr1->uni_acct_desc),
+		       gr1->hdr_acct_desc.buffer, ps, depth);
 	prs_align(ps);
 
 	return True;
@@ -1800,12 +1960,13 @@ BOOL samr_io_group_info1(char *desc,  GROUP_INFO1 *gr1, prs_struct *ps, int dept
 /*******************************************************************
 makes a GROUP_INFO4 structure.
 ********************************************************************/
-BOOL make_samr_group_info4(GROUP_INFO4 *gr4, const char *acct_desc)
+BOOL make_samr_group_info4(GROUP_INFO4 * gr4, const char *acct_desc)
 {
 	int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
-	if (gr4 == NULL) return False;
+	if (gr4 == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_group_info4\n"));
+	DEBUG(5, ("make_samr_group_info4\n"));
 
 	make_uni_hdr(&(gr4->hdr_acct_desc), acct_len);
 	make_unistr2(&(gr4->uni_acct_desc), acct_desc, acct_len);
@@ -1817,17 +1978,20 @@ BOOL make_samr_group_info4(GROUP_INFO4 *gr4, const char *acct_desc)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_group_info4(char *desc,  GROUP_INFO4 *gr4, prs_struct *ps, int depth)
+BOOL samr_io_group_info4(char *desc, GROUP_INFO4 * gr4, prs_struct * ps,
+			 int depth)
 {
-	if (gr4 == NULL) return False;
+	if (gr4 == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_group_info4");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_unihdr ("hdr_acct_desc", &(gr4->hdr_acct_desc) , ps, depth); 
-	smb_io_unistr2("uni_acct_desc", &(gr4->uni_acct_desc), gr4->hdr_acct_desc.buffer, ps, depth);
+	smb_io_unihdr("hdr_acct_desc", &(gr4->hdr_acct_desc), ps, depth);
+	smb_io_unistr2("uni_acct_desc", &(gr4->uni_acct_desc),
+		       gr4->hdr_acct_desc.buffer, ps, depth);
 	prs_align(ps);
 
 	return True;
@@ -1836,9 +2000,11 @@ BOOL samr_io_group_info4(char *desc,  GROUP_INFO4 *gr4, prs_struct *ps, int dept
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_group_info_ctr(char *desc,  GROUP_INFO_CTR *ctr, prs_struct *ps, int depth)
+BOOL samr_group_info_ctr(char *desc, GROUP_INFO_CTR * ctr, prs_struct * ps,
+			 int depth)
 {
-	if (ctr == NULL) return False;
+	if (ctr == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_group_info_ctr");
 	depth++;
@@ -1850,17 +2016,20 @@ BOOL samr_group_info_ctr(char *desc,  GROUP_INFO_CTR *ctr, prs_struct *ps, int d
 	{
 		case 1:
 		{
-			samr_io_group_info1("group_info1", &(ctr->group.info1), ps, depth);
+			samr_io_group_info1("group_info1",
+					    &(ctr->group.info1), ps, depth);
 			break;
 		}
 		case 4:
 		{
-			samr_io_group_info4("group_info4", &(ctr->group.info4), ps, depth);
+			samr_io_group_info4("group_info4",
+					    &(ctr->group.info4), ps, depth);
 			break;
 		}
 		default:
 		{
-			DEBUG(4,("samr_group_info_ctr: unsupported switch level\n"));
+			DEBUG(4,
+			      ("samr_group_info_ctr: unsupported switch level\n"));
 			break;
 		}
 	}
@@ -1874,14 +2043,14 @@ BOOL samr_group_info_ctr(char *desc,  GROUP_INFO_CTR *ctr, prs_struct *ps, int d
 /*******************************************************************
 makes a SAMR_Q_CREATE_DOM_GROUP structure.
 ********************************************************************/
-BOOL make_samr_q_create_dom_group(SAMR_Q_CREATE_DOM_GROUP *q_e,
-				POLICY_HND *pol,
-				const char *acct_desc)
+BOOL make_samr_q_create_dom_group(SAMR_Q_CREATE_DOM_GROUP * q_e,
+				  POLICY_HND * pol, const char *acct_desc)
 {
 	int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
-	if (q_e == NULL || pol == NULL) return False;
+	if (q_e == NULL || pol == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_create_dom_group\n"));
+	DEBUG(5, ("make_samr_q_create_dom_group\n"));
 
 	q_e->pol = *pol;
 
@@ -1897,20 +2066,23 @@ BOOL make_samr_q_create_dom_group(SAMR_Q_CREATE_DOM_GROUP *q_e,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_create_dom_group(char *desc,  SAMR_Q_CREATE_DOM_GROUP *q_e, prs_struct *ps, int depth)
+BOOL samr_io_q_create_dom_group(char *desc, SAMR_Q_CREATE_DOM_GROUP * q_e,
+				prs_struct * ps, int depth)
 {
-	if (q_e == NULL) return False;
+	if (q_e == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_create_dom_group");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth);
 	prs_align(ps);
 
-	smb_io_unihdr ("hdr_acct_desc", &(q_e->hdr_acct_desc), ps, depth); 
-	smb_io_unistr2("uni_acct_desc", &(q_e->uni_acct_desc), q_e->hdr_acct_desc.buffer, ps, depth);
+	smb_io_unihdr("hdr_acct_desc", &(q_e->hdr_acct_desc), ps, depth);
+	smb_io_unistr2("uni_acct_desc", &(q_e->uni_acct_desc),
+		       q_e->hdr_acct_desc.buffer, ps, depth);
 	prs_align(ps);
 
 	prs_uint32("access", ps, depth, &(q_e->access_mask));
@@ -1921,19 +2093,21 @@ BOOL samr_io_q_create_dom_group(char *desc,  SAMR_Q_CREATE_DOM_GROUP *q_e, prs_s
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_create_dom_group(char *desc,  SAMR_R_CREATE_DOM_GROUP *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_create_dom_group(char *desc, SAMR_R_CREATE_DOM_GROUP * r_u,
+				prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_create_dom_group");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(r_u->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(r_u->pol), ps, depth);
 	prs_align(ps);
 
-	prs_uint32("rid   ", ps, depth, &(r_u->rid   ));
+	prs_uint32("rid   ", ps, depth, &(r_u->rid));
 	prs_uint32("status", ps, depth, &(r_u->status));
 
 	return True;
@@ -1942,11 +2116,13 @@ BOOL samr_io_r_create_dom_group(char *desc,  SAMR_R_CREATE_DOM_GROUP *r_u, prs_s
 /*******************************************************************
 makes a SAMR_Q_DELETE_DOM_GROUP structure.
 ********************************************************************/
-BOOL make_samr_q_delete_dom_group(SAMR_Q_DELETE_DOM_GROUP *q_c, POLICY_HND *hnd)
+BOOL make_samr_q_delete_dom_group(SAMR_Q_DELETE_DOM_GROUP * q_c,
+				  POLICY_HND * hnd)
 {
-	if (q_c == NULL || hnd == NULL) return False;
+	if (q_c == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_delete_dom_group\n"));
+	DEBUG(5, ("make_samr_q_delete_dom_group\n"));
 
 	q_c->group_pol = *hnd;
 
@@ -1956,16 +2132,18 @@ BOOL make_samr_q_delete_dom_group(SAMR_Q_DELETE_DOM_GROUP *q_c, POLICY_HND *hnd)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_delete_dom_group(char *desc,  SAMR_Q_DELETE_DOM_GROUP *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_delete_dom_group(char *desc, SAMR_Q_DELETE_DOM_GROUP * q_u,
+				prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_delete_dom_group");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("group_pol", &(q_u->group_pol), ps, depth); 
+	smb_io_pol_hnd("group_pol", &(q_u->group_pol), ps, depth);
 
 	return True;
 }
@@ -1973,9 +2151,11 @@ BOOL samr_io_q_delete_dom_group(char *desc,  SAMR_Q_DELETE_DOM_GROUP *q_u, prs_s
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_delete_dom_group(char *desc,  SAMR_R_DELETE_DOM_GROUP *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_delete_dom_group(char *desc, SAMR_R_DELETE_DOM_GROUP * r_u,
+				prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_delete_dom_group");
 	depth++;
@@ -1992,13 +2172,13 @@ BOOL samr_io_r_delete_dom_group(char *desc,  SAMR_R_DELETE_DOM_GROUP *r_u, prs_s
 /*******************************************************************
 makes a SAMR_Q_DEL_GROUPMEM structure.
 ********************************************************************/
-BOOL make_samr_q_del_groupmem(SAMR_Q_DEL_GROUPMEM *q_e,
-				POLICY_HND *pol,
-				uint32 rid)
+BOOL make_samr_q_del_groupmem(SAMR_Q_DEL_GROUPMEM * q_e,
+			      POLICY_HND * pol, uint32 rid)
 {
-	if (q_e == NULL || pol == NULL) return False;
+	if (q_e == NULL || pol == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_del_groupmem\n"));
+	DEBUG(5, ("make_samr_q_del_groupmem\n"));
 
 	q_e->pol = *pol;
 
@@ -2010,16 +2190,18 @@ BOOL make_samr_q_del_groupmem(SAMR_Q_DEL_GROUPMEM *q_e,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_del_groupmem(char *desc,  SAMR_Q_DEL_GROUPMEM *q_e, prs_struct *ps, int depth)
+BOOL samr_io_q_del_groupmem(char *desc, SAMR_Q_DEL_GROUPMEM * q_e,
+			    prs_struct * ps, int depth)
 {
-	if (q_e == NULL) return False;
+	if (q_e == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_del_groupmem");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("rid    ", ps, depth, &(q_e->rid));
@@ -2031,12 +2213,13 @@ BOOL samr_io_q_del_groupmem(char *desc,  SAMR_Q_DEL_GROUPMEM *q_e, prs_struct *p
 /*******************************************************************
 makes a SAMR_R_DEL_GROUPMEM structure.
 ********************************************************************/
-BOOL make_samr_r_del_groupmem(SAMR_R_DEL_GROUPMEM *r_u, POLICY_HND *pol,
-		uint32 status)
+BOOL make_samr_r_del_groupmem(SAMR_R_DEL_GROUPMEM * r_u, POLICY_HND * pol,
+			      uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_del_groupmem\n"));
+	DEBUG(5, ("make_samr_r_del_groupmem\n"));
 
 	r_u->status = status;
 
@@ -2047,9 +2230,11 @@ BOOL make_samr_r_del_groupmem(SAMR_R_DEL_GROUPMEM *r_u, POLICY_HND *pol,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_del_groupmem(char *desc,  SAMR_R_DEL_GROUPMEM *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_del_groupmem(char *desc, SAMR_R_DEL_GROUPMEM * r_u,
+			    prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_del_groupmem");
 	depth++;
@@ -2065,13 +2250,13 @@ BOOL samr_io_r_del_groupmem(char *desc,  SAMR_R_DEL_GROUPMEM *r_u, prs_struct *p
 /*******************************************************************
 makes a SAMR_Q_ADD_GROUPMEM structure.
 ********************************************************************/
-BOOL make_samr_q_add_groupmem(SAMR_Q_ADD_GROUPMEM *q_e,
-				POLICY_HND *pol,
-				uint32 rid)
+BOOL make_samr_q_add_groupmem(SAMR_Q_ADD_GROUPMEM * q_e,
+			      POLICY_HND * pol, uint32 rid)
 {
-	if (q_e == NULL || pol == NULL) return False;
+	if (q_e == NULL || pol == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_add_groupmem\n"));
+	DEBUG(5, ("make_samr_q_add_groupmem\n"));
 
 	q_e->pol = *pol;
 
@@ -2085,16 +2270,18 @@ BOOL make_samr_q_add_groupmem(SAMR_Q_ADD_GROUPMEM *q_e,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_add_groupmem(char *desc,  SAMR_Q_ADD_GROUPMEM *q_e, prs_struct *ps, int depth)
+BOOL samr_io_q_add_groupmem(char *desc, SAMR_Q_ADD_GROUPMEM * q_e,
+			    prs_struct * ps, int depth)
 {
-	if (q_e == NULL) return False;
+	if (q_e == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_add_groupmem");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("rid    ", ps, depth, &(q_e->rid));
@@ -2107,12 +2294,13 @@ BOOL samr_io_q_add_groupmem(char *desc,  SAMR_Q_ADD_GROUPMEM *q_e, prs_struct *p
 /*******************************************************************
 makes a SAMR_R_ADD_GROUPMEM structure.
 ********************************************************************/
-BOOL make_samr_r_add_groupmem(SAMR_R_ADD_GROUPMEM *r_u, POLICY_HND *pol,
-		uint32 status)
+BOOL make_samr_r_add_groupmem(SAMR_R_ADD_GROUPMEM * r_u, POLICY_HND * pol,
+			      uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_add_groupmem\n"));
+	DEBUG(5, ("make_samr_r_add_groupmem\n"));
 
 	r_u->status = status;
 
@@ -2123,9 +2311,11 @@ BOOL make_samr_r_add_groupmem(SAMR_R_ADD_GROUPMEM *r_u, POLICY_HND *pol,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_add_groupmem(char *desc,  SAMR_R_ADD_GROUPMEM *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_add_groupmem(char *desc, SAMR_R_ADD_GROUPMEM * r_u,
+			    prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_add_groupmem");
 	depth++;
@@ -2141,12 +2331,13 @@ BOOL samr_io_r_add_groupmem(char *desc,  SAMR_R_ADD_GROUPMEM *r_u, prs_struct *p
 /*******************************************************************
 makes a SAMR_Q_SET_GROUPINFO structure.
 ********************************************************************/
-BOOL make_samr_q_set_groupinfo(SAMR_Q_SET_GROUPINFO *q_e,
-				POLICY_HND *pol, GROUP_INFO_CTR *ctr)
+BOOL make_samr_q_set_groupinfo(SAMR_Q_SET_GROUPINFO * q_e,
+			       POLICY_HND * pol, GROUP_INFO_CTR * ctr)
 {
-	if (q_e == NULL || pol == NULL) return False;
+	if (q_e == NULL || pol == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_set_groupinfo\n"));
+	DEBUG(5, ("make_samr_q_set_groupinfo\n"));
 
 	q_e->pol = *pol;
 	q_e->ctr = ctr;
@@ -2158,16 +2349,18 @@ BOOL make_samr_q_set_groupinfo(SAMR_Q_SET_GROUPINFO *q_e,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_set_groupinfo(char *desc,  SAMR_Q_SET_GROUPINFO *q_e, prs_struct *ps, int depth)
+BOOL samr_io_q_set_groupinfo(char *desc, SAMR_Q_SET_GROUPINFO * q_e,
+			     prs_struct * ps, int depth)
 {
-	if (q_e == NULL) return False;
+	if (q_e == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_set_groupinfo");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth);
 	prs_align(ps);
 
 	samr_group_info_ctr("ctr", q_e->ctr, ps, depth);
@@ -2179,12 +2372,12 @@ BOOL samr_io_q_set_groupinfo(char *desc,  SAMR_Q_SET_GROUPINFO *q_e, prs_struct
 /*******************************************************************
 makes a SAMR_R_SET_GROUPINFO structure.
 ********************************************************************/
-BOOL make_samr_r_set_groupinfo(SAMR_R_SET_GROUPINFO *r_u, 
-		uint32 status)
+BOOL make_samr_r_set_groupinfo(SAMR_R_SET_GROUPINFO * r_u, uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_set_groupinfo\n"));
+	DEBUG(5, ("make_samr_r_set_groupinfo\n"));
 
 	r_u->status = status;
 
@@ -2195,9 +2388,11 @@ BOOL make_samr_r_set_groupinfo(SAMR_R_SET_GROUPINFO *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_set_groupinfo(char *desc,  SAMR_R_SET_GROUPINFO *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_set_groupinfo(char *desc, SAMR_R_SET_GROUPINFO * r_u,
+			     prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_set_groupinfo");
 	depth++;
@@ -2212,13 +2407,13 @@ BOOL samr_io_r_set_groupinfo(char *desc,  SAMR_R_SET_GROUPINFO *r_u, prs_struct
 /*******************************************************************
 makes a SAMR_Q_QUERY_GROUPINFO structure.
 ********************************************************************/
-BOOL make_samr_q_query_groupinfo(SAMR_Q_QUERY_GROUPINFO *q_e,
-				POLICY_HND *pol,
-				uint16 switch_level)
+BOOL make_samr_q_query_groupinfo(SAMR_Q_QUERY_GROUPINFO * q_e,
+				 POLICY_HND * pol, uint16 switch_level)
 {
-	if (q_e == NULL || pol == NULL) return False;
+	if (q_e == NULL || pol == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_query_groupinfo\n"));
+	DEBUG(5, ("make_samr_q_query_groupinfo\n"));
 
 	q_e->pol = *pol;
 
@@ -2231,16 +2426,18 @@ BOOL make_samr_q_query_groupinfo(SAMR_Q_QUERY_GROUPINFO *q_e,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_query_groupinfo(char *desc,  SAMR_Q_QUERY_GROUPINFO *q_e, prs_struct *ps, int depth)
+BOOL samr_io_q_query_groupinfo(char *desc, SAMR_Q_QUERY_GROUPINFO * q_e,
+			       prs_struct * ps, int depth)
 {
-	if (q_e == NULL) return False;
+	if (q_e == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_query_groupinfo");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint16("switch_level", ps, depth, &(q_e->switch_level));
@@ -2252,12 +2449,13 @@ BOOL samr_io_q_query_groupinfo(char *desc,  SAMR_Q_QUERY_GROUPINFO *q_e, prs_str
 /*******************************************************************
 makes a SAMR_R_QUERY_GROUPINFO structure.
 ********************************************************************/
-BOOL make_samr_r_query_groupinfo(SAMR_R_QUERY_GROUPINFO *r_u, GROUP_INFO_CTR *ctr,
-		uint32 status)
+BOOL make_samr_r_query_groupinfo(SAMR_R_QUERY_GROUPINFO * r_u,
+				 GROUP_INFO_CTR * ctr, uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_query_groupinfo\n"));
+	DEBUG(5, ("make_samr_r_query_groupinfo\n"));
 
 	r_u->ptr = (status == 0x0 && ctr != NULL) ? 1 : 0;
 	r_u->ctr = ctr;
@@ -2269,9 +2467,11 @@ BOOL make_samr_r_query_groupinfo(SAMR_R_QUERY_GROUPINFO *r_u, GROUP_INFO_CTR *ct
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_query_groupinfo(char *desc,  SAMR_R_QUERY_GROUPINFO *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_query_groupinfo(char *desc, SAMR_R_QUERY_GROUPINFO * r_u,
+			       prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_query_groupinfo");
 	depth++;
@@ -2279,7 +2479,7 @@ BOOL samr_io_r_query_groupinfo(char *desc,  SAMR_R_QUERY_GROUPINFO *r_u, prs_str
 	prs_align(ps);
 
 	prs_uint32("ptr", ps, depth, &(r_u->ptr));
-	
+
 	if (r_u->ptr != 0)
 	{
 		samr_group_info_ctr("ctr", r_u->ctr, ps, depth);
@@ -2294,11 +2494,12 @@ BOOL samr_io_r_query_groupinfo(char *desc,  SAMR_R_QUERY_GROUPINFO *r_u, prs_str
 /*******************************************************************
 makes a SAMR_Q_QUERY_GROUPMEM structure.
 ********************************************************************/
-BOOL make_samr_q_query_groupmem(SAMR_Q_QUERY_GROUPMEM *q_c, POLICY_HND *hnd)
+BOOL make_samr_q_query_groupmem(SAMR_Q_QUERY_GROUPMEM * q_c, POLICY_HND * hnd)
 {
-	if (q_c == NULL || hnd == NULL) return False;
+	if (q_c == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_query_groupmem\n"));
+	DEBUG(5, ("make_samr_q_query_groupmem\n"));
 
 	q_c->group_pol = *hnd;
 
@@ -2308,16 +2509,18 @@ BOOL make_samr_q_query_groupmem(SAMR_Q_QUERY_GROUPMEM *q_c, POLICY_HND *hnd)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_query_groupmem(char *desc,  SAMR_Q_QUERY_GROUPMEM *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_query_groupmem(char *desc, SAMR_Q_QUERY_GROUPMEM * q_u,
+			      prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_query_groupmem");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("group_pol", &(q_u->group_pol), ps, depth); 
+	smb_io_pol_hnd("group_pol", &(q_u->group_pol), ps, depth);
 
 	return True;
 }
@@ -2325,30 +2528,32 @@ BOOL samr_io_q_query_groupmem(char *desc,  SAMR_Q_QUERY_GROUPMEM *q_u, prs_struc
 /*******************************************************************
 makes a SAMR_R_QUERY_GROUPMEM structure.
 ********************************************************************/
-BOOL make_samr_r_query_groupmem(SAMR_R_QUERY_GROUPMEM *r_u,
-		uint32 num_entries, uint32 *rid, uint32 *attr, uint32 status)
+BOOL make_samr_r_query_groupmem(SAMR_R_QUERY_GROUPMEM * r_u,
+				uint32 num_entries, uint32 * rid,
+				uint32 * attr, uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_query_groupmem\n"));
+	DEBUG(5, ("make_samr_r_query_groupmem\n"));
 
 	if (status == 0x0)
 	{
-		r_u->ptr         = 1;
+		r_u->ptr = 1;
 		r_u->num_entries = num_entries;
 
 		r_u->ptr_attrs = attr != NULL ? 1 : 0;
 		r_u->ptr_rids = rid != NULL ? 1 : 0;
 
 		r_u->num_rids = num_entries;
-		r_u->rid  = rid;
+		r_u->rid = rid;
 
 		r_u->num_attrs = num_entries;
 		r_u->attr = attr;
 	}
 	else
 	{
-		r_u->ptr         = 0;
+		r_u->ptr = 0;
 		r_u->num_entries = 0;
 	}
 
@@ -2360,11 +2565,13 @@ BOOL make_samr_r_query_groupmem(SAMR_R_QUERY_GROUPMEM *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_query_groupmem(char *desc,  SAMR_R_QUERY_GROUPMEM *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_query_groupmem(char *desc, SAMR_R_QUERY_GROUPMEM * r_u,
+			      prs_struct * ps, int depth)
 {
 	uint32 i;
 
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_query_groupmem");
 	depth++;
@@ -2376,7 +2583,7 @@ BOOL samr_io_r_query_groupmem(char *desc,  SAMR_R_QUERY_GROUPMEM *r_u, prs_struc
 
 	if (r_u->ptr != 0)
 	{
-		prs_uint32("ptr_rids ", ps, depth, &(r_u->ptr_rids ));
+		prs_uint32("ptr_rids ", ps, depth, &(r_u->ptr_rids));
 		prs_uint32("ptr_attrs", ps, depth, &(r_u->ptr_attrs));
 
 		if (r_u->ptr_rids != 0)
@@ -2384,9 +2591,10 @@ BOOL samr_io_r_query_groupmem(char *desc,  SAMR_R_QUERY_GROUPMEM *r_u, prs_struc
 			prs_uint32("num_rids", ps, depth, &(r_u->num_rids));
 			if (r_u->num_rids != 0)
 			{
-				r_u->rid = (uint32*)Realloc(r_u->rid,
-						       sizeof(r_u->rid[0]) *
-						       r_u->num_rids);
+				r_u->rid = (uint32 *) Realloc(r_u->rid,
+							      sizeof(r_u->
+								     rid[0]) *
+							      r_u->num_rids);
 				if (r_u->rid == NULL)
 				{
 					samr_free_r_query_groupmem(r_u);
@@ -2405,9 +2613,12 @@ BOOL samr_io_r_query_groupmem(char *desc,  SAMR_R_QUERY_GROUPMEM *r_u, prs_struc
 
 			if (r_u->num_attrs != 0)
 			{
-				r_u->attr = (uint32*)Realloc(r_u->attr,
-						       sizeof(r_u->attr[0]) *
-						       r_u->num_attrs);
+				r_u->attr = (uint32 *) Realloc(r_u->attr,
+							       sizeof(r_u->
+								      attr[0])
+							       *
+							       r_u->
+							       num_attrs);
 				if (r_u->attr == NULL)
 				{
 					samr_free_r_query_groupmem(r_u);
@@ -2436,7 +2647,7 @@ BOOL samr_io_r_query_groupmem(char *desc,  SAMR_R_QUERY_GROUPMEM *r_u, prs_struc
 /*******************************************************************
 frees a structure.
 ********************************************************************/
-void samr_free_r_query_groupmem(SAMR_R_QUERY_GROUPMEM *r_u)
+void samr_free_r_query_groupmem(SAMR_R_QUERY_GROUPMEM * r_u)
 {
 	if (r_u->rid != NULL)
 	{
@@ -2453,12 +2664,13 @@ void samr_free_r_query_groupmem(SAMR_R_QUERY_GROUPMEM *r_u)
 /*******************************************************************
 makes a SAMR_Q_QUERY_USERGROUPS structure.
 ********************************************************************/
-BOOL make_samr_q_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
-				POLICY_HND *hnd)
+BOOL make_samr_q_query_usergroups(SAMR_Q_QUERY_USERGROUPS * q_u,
+				  POLICY_HND * hnd)
 {
-	if (q_u == NULL || hnd == NULL) return False;
+	if (q_u == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_query_usergroups\n"));
+	DEBUG(5, ("make_samr_q_query_usergroups\n"));
 
 	memcpy(&(q_u->pol), hnd, sizeof(q_u->pol));
 
@@ -2469,16 +2681,18 @@ BOOL make_samr_q_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_query_usergroups(char *desc,  SAMR_Q_QUERY_USERGROUPS *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_query_usergroups(char *desc, SAMR_Q_QUERY_USERGROUPS * q_u,
+				prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_query_usergroups");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth);
 	prs_align(ps);
 
 	return True;
@@ -2487,28 +2701,30 @@ BOOL samr_io_q_query_usergroups(char *desc,  SAMR_Q_QUERY_USERGROUPS *q_u, prs_s
 /*******************************************************************
 makes a SAMR_R_QUERY_USERGROUPS structure.
 ********************************************************************/
-BOOL make_samr_r_query_usergroups(SAMR_R_QUERY_USERGROUPS *r_u,
-		uint32 num_gids, DOM_GID *gid, uint32 status)
+BOOL make_samr_r_query_usergroups(SAMR_R_QUERY_USERGROUPS * r_u,
+				  uint32 num_gids, DOM_GID * gid,
+				  uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_query_usergroups\n"));
+	DEBUG(5, ("make_samr_r_query_usergroups\n"));
 
 	if (status == 0x0)
 	{
-		r_u->ptr_0        = 1;
-		r_u->num_entries  = num_gids;
-		r_u->ptr_1        = (num_gids != 0) ? 1 : 0;
+		r_u->ptr_0 = 1;
+		r_u->num_entries = num_gids;
+		r_u->ptr_1 = (num_gids != 0) ? 1 : 0;
 		r_u->num_entries2 = num_gids;
 
 		r_u->gid = gid;
 	}
 	else
 	{
-		r_u->ptr_0       = 0;
+		r_u->ptr_0 = 0;
 		r_u->num_entries = 0;
-		r_u->ptr_1       = 0;
-		r_u->gid         = NULL;
+		r_u->ptr_1 = 0;
+		r_u->gid = NULL;
 	}
 
 	r_u->status = status;
@@ -2519,10 +2735,12 @@ BOOL make_samr_r_query_usergroups(SAMR_R_QUERY_USERGROUPS *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_gids(char *desc, uint32 *num_gids, DOM_GID **gid, prs_struct *ps, int depth)
+BOOL samr_io_gids(char *desc, uint32 * num_gids, DOM_GID ** gid,
+		  prs_struct * ps, int depth)
 {
 	uint32 i;
-	if (gid == NULL) return False;
+	if (gid == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_gids");
 	depth++;
@@ -2561,25 +2779,28 @@ BOOL samr_io_gids(char *desc, uint32 *num_gids, DOM_GID **gid, prs_struct *ps, i
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_query_usergroups(char *desc, SAMR_R_QUERY_USERGROUPS *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_query_usergroups(char *desc, SAMR_R_QUERY_USERGROUPS * r_u,
+				prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_query_usergroups");
 	depth++;
 
 	prs_align(ps);
 
-	prs_uint32("ptr_0       ", ps, depth, &(r_u->ptr_0      ));
+	prs_uint32("ptr_0       ", ps, depth, &(r_u->ptr_0));
 
 	if (r_u->ptr_0 != 0)
 	{
 		prs_uint32("num_entries ", ps, depth, &(r_u->num_entries));
-		prs_uint32("ptr_1       ", ps, depth, &(r_u->ptr_1      ));
+		prs_uint32("ptr_1       ", ps, depth, &(r_u->ptr_1));
 
 		if (r_u->num_entries != 0 && r_u->ptr_1 != 0)
 		{
-			samr_io_gids("gids", &(r_u->num_entries2), &r_u->gid, ps, depth);
+			samr_io_gids("gids", &(r_u->num_entries2), &r_u->gid,
+				     ps, depth);
 		}
 	}
 	prs_uint32("status", ps, depth, &(r_u->status));
@@ -2591,13 +2812,14 @@ BOOL samr_io_r_query_usergroups(char *desc, SAMR_R_QUERY_USERGROUPS *r_u, prs_st
 /*******************************************************************
 makes a SAMR_Q_ENUM_DOMAINS structure.
 ********************************************************************/
-BOOL make_samr_q_enum_domains(SAMR_Q_ENUM_DOMAINS *q_e,
-			      const POLICY_HND *pol,
+BOOL make_samr_q_enum_domains(SAMR_Q_ENUM_DOMAINS * q_e,
+			      const POLICY_HND * pol,
 			      uint32 start_idx, uint32 size)
 {
-	if (q_e == NULL || pol == NULL) return False;
+	if (q_e == NULL || pol == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_enum_domains\n"));
+	DEBUG(5, ("make_samr_q_enum_domains\n"));
 
 	q_e->pol = *pol;
 
@@ -2610,20 +2832,22 @@ BOOL make_samr_q_enum_domains(SAMR_Q_ENUM_DOMAINS *q_e,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_enum_domains(char *desc, SAMR_Q_ENUM_DOMAINS *q_e, prs_struct *ps, int depth)
+BOOL samr_io_q_enum_domains(char *desc, SAMR_Q_ENUM_DOMAINS * q_e,
+			    prs_struct * ps, int depth)
 {
-	if (q_e == NULL) return False;
+	if (q_e == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_enum_domains");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("start_idx", ps, depth, &(q_e->start_idx));
-	prs_uint32("max_size ", ps, depth, &(q_e->max_size ));
+	prs_uint32("max_size ", ps, depth, &(q_e->max_size));
 
 	prs_align(ps);
 
@@ -2634,12 +2858,13 @@ BOOL samr_io_q_enum_domains(char *desc, SAMR_Q_ENUM_DOMAINS *q_e, prs_struct *ps
 /*******************************************************************
 makes a SAMR_R_ENUM_DOMAINS structure.
 ********************************************************************/
-BOOL make_samr_r_enum_domains(SAMR_R_ENUM_DOMAINS *r_u,
-		uint32 next_idx, uint32 num_sam_entries)
+BOOL make_samr_r_enum_domains(SAMR_R_ENUM_DOMAINS * r_u,
+			      uint32 next_idx, uint32 num_sam_entries)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_enum_domains\n"));
+	DEBUG(5, ("make_samr_r_enum_domains\n"));
 
 	r_u->next_idx = next_idx;
 
@@ -2665,18 +2890,20 @@ BOOL make_samr_r_enum_domains(SAMR_R_ENUM_DOMAINS *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_enum_domains(char *desc, SAMR_R_ENUM_DOMAINS *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_enum_domains(char *desc, SAMR_R_ENUM_DOMAINS * r_u,
+			    prs_struct * ps, int depth)
 {
 	uint32 i;
 
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_enum_domains");
 	depth++;
 
 	prs_align(ps);
 
-	prs_uint32("next_idx    ", ps, depth, &(r_u->next_idx    ));
+	prs_uint32("next_idx    ", ps, depth, &(r_u->next_idx));
 	prs_uint32("ptr_entries1", ps, depth, &(r_u->ptr_entries1));
 
 	if (r_u->ptr_entries1 != 0)
@@ -2687,30 +2914,41 @@ BOOL samr_io_r_enum_domains(char *desc, SAMR_R_ENUM_DOMAINS *r_u, prs_struct *ps
 
 		if (ps->io)
 		{
-			r_u->sam = (SAM_ENTRY*)Realloc(NULL, r_u->num_entries2 * sizeof(r_u->sam[0]));
-			r_u->uni_dom_name = (UNISTR2*)Realloc(NULL, r_u->num_entries2 * sizeof(r_u->uni_dom_name[0]));
+			r_u->sam =
+				(SAM_ENTRY *) Realloc(NULL,
+						      r_u->num_entries2 *
+						      sizeof(r_u->sam[0]));
+			r_u->uni_dom_name =
+				(UNISTR2 *) Realloc(NULL,
+						    r_u->num_entries2 *
+						    sizeof(r_u->
+							   uni_dom_name[0]));
 		}
 
-		if ((r_u->sam == NULL || r_u->uni_dom_name == NULL) && r_u->num_entries2 != 0)
+		if ((r_u->sam == NULL || r_u->uni_dom_name == NULL)
+		    && r_u->num_entries2 != 0)
 		{
-			DEBUG(0,("NULL pointers in SAMR_R_ENUM_DOMAINS\n"));
+			DEBUG(0, ("NULL pointers in SAMR_R_ENUM_DOMAINS\n"));
 			r_u->num_entries4 = 0;
-			r_u->status = 0xC0000000|NT_STATUS_MEMORY_NOT_ALLOCATED;
+			r_u->status =
+				0xC0000000 | NT_STATUS_MEMORY_NOT_ALLOCATED;
 			return False;
 		}
 
 		for (i = 0; i < r_u->num_entries2; i++)
 		{
 			fstring tmp;
-			slprintf(tmp, sizeof(tmp)-1, "dom[%d]", i);
+			slprintf(tmp, sizeof(tmp) - 1, "dom[%d]", i);
 			sam_io_sam_entry(tmp, &(r_u->sam[i]), ps, depth);
 		}
 
 		for (i = 0; i < r_u->num_entries2; i++)
 		{
 			fstring tmp;
-			slprintf(tmp, sizeof(tmp)-1, "dom[%d]", i);
-			smb_io_unistr2(tmp, &(r_u->uni_dom_name[i]), r_u->sam[i].hdr_name.buffer, ps, depth);
+			slprintf(tmp, sizeof(tmp) - 1, "dom[%d]", i);
+			smb_io_unistr2(tmp, &(r_u->uni_dom_name[i]),
+				       r_u->sam[i].hdr_name.buffer, ps,
+				       depth);
 			prs_align(ps);
 		}
 
@@ -2728,13 +2966,14 @@ BOOL samr_io_r_enum_domains(char *desc, SAMR_R_ENUM_DOMAINS *r_u, prs_struct *ps
 /*******************************************************************
 makes a SAMR_Q_ENUM_DOM_GROUPS structure.
 ********************************************************************/
-BOOL make_samr_q_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_e,
-				 const POLICY_HND *pol,
+BOOL make_samr_q_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS * q_e,
+				 const POLICY_HND * pol,
 				 uint32 start_idx, uint32 size)
 {
-	if (q_e == NULL || pol == NULL) return False;
+	if (q_e == NULL || pol == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_enum_dom_groups\n"));
+	DEBUG(5, ("make_samr_q_enum_dom_groups\n"));
 
 	q_e->pol = *pol;
 
@@ -2747,20 +2986,22 @@ BOOL make_samr_q_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_e,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_enum_dom_groups(char *desc, SAMR_Q_ENUM_DOM_GROUPS *q_e, prs_struct *ps, int depth)
+BOOL samr_io_q_enum_dom_groups(char *desc, SAMR_Q_ENUM_DOM_GROUPS * q_e,
+			       prs_struct * ps, int depth)
 {
-	if (q_e == NULL) return False;
+	if (q_e == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_enum_dom_groups");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("start_idx", ps, depth, &(q_e->start_idx));
-	prs_uint32("max_size ", ps, depth, &(q_e->max_size ));
+	prs_uint32("max_size ", ps, depth, &(q_e->max_size));
 
 	prs_align(ps);
 
@@ -2771,12 +3012,13 @@ BOOL samr_io_q_enum_dom_groups(char *desc, SAMR_Q_ENUM_DOM_GROUPS *q_e, prs_stru
 /*******************************************************************
 makes a SAMR_R_ENUM_DOM_GROUPS structure.
 ********************************************************************/
-BOOL make_samr_r_enum_dom_groups(SAMR_R_ENUM_DOM_GROUPS *r_u,
-		uint32 next_idx, uint32 num_sam_entries)
+BOOL make_samr_r_enum_dom_groups(SAMR_R_ENUM_DOM_GROUPS * r_u,
+				 uint32 next_idx, uint32 num_sam_entries)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_enum_dom_groups\n"));
+	DEBUG(5, ("make_samr_r_enum_dom_groups\n"));
 
 	r_u->next_idx = next_idx;
 
@@ -2802,18 +3044,20 @@ BOOL make_samr_r_enum_dom_groups(SAMR_R_ENUM_DOM_GROUPS *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_enum_dom_groups(char *desc, SAMR_R_ENUM_DOM_GROUPS *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_enum_dom_groups(char *desc, SAMR_R_ENUM_DOM_GROUPS * r_u,
+			       prs_struct * ps, int depth)
 {
 	uint32 i;
 
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_enum_dom_groups");
 	depth++;
 
 	prs_align(ps);
 
-	prs_uint32("next_idx    ", ps, depth, &(r_u->next_idx    ));
+	prs_uint32("next_idx    ", ps, depth, &(r_u->next_idx));
 	prs_uint32("ptr_entries1", ps, depth, &(r_u->ptr_entries1));
 
 	if (r_u->ptr_entries1 != 0)
@@ -2824,15 +3068,25 @@ BOOL samr_io_r_enum_dom_groups(char *desc, SAMR_R_ENUM_DOM_GROUPS *r_u, prs_stru
 
 		if (ps->io)
 		{
-			r_u->sam = (SAM_ENTRY*)Realloc(NULL, r_u->num_entries2 * sizeof(r_u->sam[0]));
-			r_u->uni_grp_name = (UNISTR2*)Realloc(NULL, r_u->num_entries2 * sizeof(r_u->uni_grp_name[0]));
+			r_u->sam =
+				(SAM_ENTRY *) Realloc(NULL,
+						      r_u->num_entries2 *
+						      sizeof(r_u->sam[0]));
+			r_u->uni_grp_name =
+				(UNISTR2 *) Realloc(NULL,
+						    r_u->num_entries2 *
+						    sizeof(r_u->
+							   uni_grp_name[0]));
 		}
 
-		if ((r_u->sam == NULL || r_u->uni_grp_name == NULL) && r_u->num_entries2 != 0)
+		if ((r_u->sam == NULL || r_u->uni_grp_name == NULL)
+		    && r_u->num_entries2 != 0)
 		{
-			DEBUG(0,("NULL pointers in SAMR_R_ENUM_DOM_GROUPS\n"));
+			DEBUG(0,
+			      ("NULL pointers in SAMR_R_ENUM_DOM_GROUPS\n"));
 			r_u->num_entries4 = 0;
-			r_u->status = 0xC0000000|NT_STATUS_MEMORY_NOT_ALLOCATED;
+			r_u->status =
+				0xC0000000 | NT_STATUS_MEMORY_NOT_ALLOCATED;
 			return False;
 		}
 
@@ -2843,7 +3097,9 @@ BOOL samr_io_r_enum_dom_groups(char *desc, SAMR_R_ENUM_DOM_GROUPS *r_u, prs_stru
 
 		for (i = 0; i < r_u->num_entries2; i++)
 		{
-			smb_io_unistr2("", &(r_u->uni_grp_name[i]), r_u->sam[i].hdr_name.buffer, ps, depth);
+			smb_io_unistr2("", &(r_u->uni_grp_name[i]),
+				       r_u->sam[i].hdr_name.buffer, ps,
+				       depth);
 			prs_align(ps);
 		}
 
@@ -2860,12 +3116,14 @@ BOOL samr_io_r_enum_dom_groups(char *desc, SAMR_R_ENUM_DOM_GROUPS *r_u, prs_stru
 /*******************************************************************
 makes a SAMR_Q_ENUM_DOM_ALIASES structure.
 ********************************************************************/
-BOOL make_samr_q_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES *q_e, POLICY_HND *pol,
-				uint32 start_idx, uint32 size)
+BOOL make_samr_q_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES * q_e,
+				  POLICY_HND * pol, uint32 start_idx,
+				  uint32 size)
 {
-	if (q_e == NULL || pol == NULL) return False;
+	if (q_e == NULL || pol == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_enum_dom_aliases\n"));
+	DEBUG(5, ("make_samr_q_enum_dom_aliases\n"));
 
 	q_e->pol = *pol;
 
@@ -2879,20 +3137,22 @@ BOOL make_samr_q_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES *q_e, POLICY_HND *pol,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_enum_dom_aliases(char *desc,  SAMR_Q_ENUM_DOM_ALIASES *q_e, prs_struct *ps, int depth)
+BOOL samr_io_q_enum_dom_aliases(char *desc, SAMR_Q_ENUM_DOM_ALIASES * q_e,
+				prs_struct * ps, int depth)
 {
-	if (q_e == NULL) return False;
+	if (q_e == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_enum_dom_aliases");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("start_idx", ps, depth, &(q_e->start_idx));
-	prs_uint32("max_size ", ps, depth, &(q_e->max_size ));
+	prs_uint32("max_size ", ps, depth, &(q_e->max_size));
 
 	prs_align(ps);
 
@@ -2903,13 +3163,13 @@ BOOL samr_io_q_enum_dom_aliases(char *desc,  SAMR_Q_ENUM_DOM_ALIASES *q_e, prs_s
 /*******************************************************************
 makes a SAMR_R_ENUM_DOM_ALIASES structure.
 ********************************************************************/
-BOOL make_samr_r_enum_dom_aliases(SAMR_R_ENUM_DOM_ALIASES *r_u,
-		uint32 next_idx,
-		uint32 num_sam_entries)
+BOOL make_samr_r_enum_dom_aliases(SAMR_R_ENUM_DOM_ALIASES * r_u,
+				  uint32 next_idx, uint32 num_sam_entries)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_enum_dom_aliases\n"));
+	DEBUG(5, ("make_samr_r_enum_dom_aliases\n"));
 
 	r_u->next_idx = next_idx;
 
@@ -2935,18 +3195,20 @@ BOOL make_samr_r_enum_dom_aliases(SAMR_R_ENUM_DOM_ALIASES *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_enum_dom_aliases(char *desc, SAMR_R_ENUM_DOM_ALIASES *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_enum_dom_aliases(char *desc, SAMR_R_ENUM_DOM_ALIASES * r_u,
+				prs_struct * ps, int depth)
 {
 	uint32 i;
 
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_enum_dom_aliases");
 	depth++;
 
 	prs_align(ps);
 
-	prs_uint32("next_idx    ", ps, depth, &(r_u->next_idx    ));
+	prs_uint32("next_idx    ", ps, depth, &(r_u->next_idx));
 	prs_uint32("ptr_entries1", ps, depth, &(r_u->ptr_entries1));
 
 	if (r_u->ptr_entries1 != 0)
@@ -2957,15 +3219,25 @@ BOOL samr_io_r_enum_dom_aliases(char *desc, SAMR_R_ENUM_DOM_ALIASES *r_u, prs_st
 
 		if (ps->io)
 		{
-			r_u->sam = (SAM_ENTRY*)Realloc(NULL, r_u->num_entries2 * sizeof(r_u->sam[0]));
-			r_u->uni_grp_name = (UNISTR2*)Realloc(NULL, r_u->num_entries2 * sizeof(r_u->uni_grp_name[0]));
+			r_u->sam =
+				(SAM_ENTRY *) Realloc(NULL,
+						      r_u->num_entries2 *
+						      sizeof(r_u->sam[0]));
+			r_u->uni_grp_name =
+				(UNISTR2 *) Realloc(NULL,
+						    r_u->num_entries2 *
+						    sizeof(r_u->
+							   uni_grp_name[0]));
 		}
 
-		if ((r_u->sam == NULL || r_u->uni_grp_name == NULL) && r_u->num_entries2 != 0)
+		if ((r_u->sam == NULL || r_u->uni_grp_name == NULL)
+		    && r_u->num_entries2 != 0)
 		{
-			DEBUG(0,("NULL pointers in SAMR_R_ENUM_DOM_ALIASES\n"));
+			DEBUG(0,
+			      ("NULL pointers in SAMR_R_ENUM_DOM_ALIASES\n"));
 			r_u->num_entries4 = 0;
-			r_u->status = 0xC0000000|NT_STATUS_MEMORY_NOT_ALLOCATED;
+			r_u->status =
+				0xC0000000 | NT_STATUS_MEMORY_NOT_ALLOCATED;
 			return False;
 		}
 
@@ -2976,7 +3248,9 @@ BOOL samr_io_r_enum_dom_aliases(char *desc, SAMR_R_ENUM_DOM_ALIASES *r_u, prs_st
 
 		for (i = 0; i < r_u->num_entries2; i++)
 		{
-			smb_io_unistr2("", &(r_u->uni_grp_name[i]), r_u->sam[i].hdr_name.buffer, ps, depth);
+			smb_io_unistr2("", &(r_u->uni_grp_name[i]),
+				       r_u->sam[i].hdr_name.buffer, ps,
+				       depth);
 			prs_align(ps);
 		}
 
@@ -2994,12 +3268,13 @@ BOOL samr_io_r_enum_dom_aliases(char *desc, SAMR_R_ENUM_DOM_ALIASES *r_u, prs_st
 /*******************************************************************
 makes a ALIAS_INFO3 structure.
 ********************************************************************/
-BOOL make_samr_alias_info3(ALIAS_INFO3 *al3, const char *acct_desc)
+BOOL make_samr_alias_info3(ALIAS_INFO3 * al3, const char *acct_desc)
 {
 	int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
-	if (al3 == NULL) return False;
+	if (al3 == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_alias_info3\n"));
+	DEBUG(5, ("make_samr_alias_info3\n"));
 
 	make_uni_hdr(&(al3->hdr_acct_desc), acct_len);
 	make_unistr2(&(al3->uni_acct_desc), acct_desc, acct_len);
@@ -3010,17 +3285,20 @@ BOOL make_samr_alias_info3(ALIAS_INFO3 *al3, const char *acct_desc)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_alias_info3(char *desc,  ALIAS_INFO3 *al3, prs_struct *ps, int depth)
+BOOL samr_io_alias_info3(char *desc, ALIAS_INFO3 * al3, prs_struct * ps,
+			 int depth)
 {
-	if (al3 == NULL) return False;
+	if (al3 == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_alias_info3");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_unihdr ("hdr_acct_desc", &(al3->hdr_acct_desc) , ps, depth); 
-	smb_io_unistr2("uni_acct_desc", &(al3->uni_acct_desc), al3->hdr_acct_desc.buffer, ps, depth);
+	smb_io_unihdr("hdr_acct_desc", &(al3->hdr_acct_desc), ps, depth);
+	smb_io_unistr2("uni_acct_desc", &(al3->uni_acct_desc),
+		       al3->hdr_acct_desc.buffer, ps, depth);
 	prs_align(ps);
 
 	return True;
@@ -3029,9 +3307,11 @@ BOOL samr_io_alias_info3(char *desc,  ALIAS_INFO3 *al3, prs_struct *ps, int dept
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_alias_info_ctr(char *desc,  ALIAS_INFO_CTR *ctr, prs_struct *ps, int depth)
+BOOL samr_alias_info_ctr(char *desc, ALIAS_INFO_CTR * ctr, prs_struct * ps,
+			 int depth)
 {
-	if (ctr == NULL) return False;
+	if (ctr == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_alias_info_ctr");
 	depth++;
@@ -3043,12 +3323,14 @@ BOOL samr_alias_info_ctr(char *desc,  ALIAS_INFO_CTR *ctr, prs_struct *ps, int d
 	{
 		case 3:
 		{
-			samr_io_alias_info3("alias_info3", &(ctr->alias.info3), ps, depth);
+			samr_io_alias_info3("alias_info3",
+					    &(ctr->alias.info3), ps, depth);
 			break;
 		}
 		default:
 		{
-			DEBUG(4,("samr_alias_info_ctr: unsupported switch level\n"));
+			DEBUG(4,
+			      ("samr_alias_info_ctr: unsupported switch level\n"));
 			break;
 		}
 	}
@@ -3062,12 +3344,13 @@ BOOL samr_alias_info_ctr(char *desc,  ALIAS_INFO_CTR *ctr, prs_struct *ps, int d
 /*******************************************************************
 makes a SAMR_Q_QUERY_ALIASINFO structure.
 ********************************************************************/
-BOOL make_samr_q_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO *q_e,
-				 const POLICY_HND *pol, uint16 switch_level)
+BOOL make_samr_q_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO * q_e,
+				 const POLICY_HND * pol, uint16 switch_level)
 {
-	if (q_e == NULL || pol == NULL) return False;
+	if (q_e == NULL || pol == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_query_aliasinfo\n"));
+	DEBUG(5, ("make_samr_q_query_aliasinfo\n"));
 
 	q_e->pol = *pol;
 
@@ -3079,16 +3362,18 @@ BOOL make_samr_q_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO *q_e,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_query_aliasinfo(char *desc,  SAMR_Q_QUERY_ALIASINFO *q_e, prs_struct *ps, int depth)
+BOOL samr_io_q_query_aliasinfo(char *desc, SAMR_Q_QUERY_ALIASINFO * q_e,
+			       prs_struct * ps, int depth)
 {
-	if (q_e == NULL) return False;
+	if (q_e == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_query_aliasinfo");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_e->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint16("switch_level", ps, depth, &(q_e->switch_level));
@@ -3099,12 +3384,13 @@ BOOL samr_io_q_query_aliasinfo(char *desc,  SAMR_Q_QUERY_ALIASINFO *q_e, prs_str
 /*******************************************************************
 makes a SAMR_R_QUERY_ALIASINFO structure.
 ********************************************************************/
-BOOL make_samr_r_query_aliasinfo(SAMR_R_QUERY_ALIASINFO *r_u,
-				 ALIAS_INFO_CTR *ctr, uint32 status)
+BOOL make_samr_r_query_aliasinfo(SAMR_R_QUERY_ALIASINFO * r_u,
+				 ALIAS_INFO_CTR * ctr, uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_query_aliasinfo\n"));
+	DEBUG(5, ("make_samr_r_query_aliasinfo\n"));
 
 	r_u->ptr = (status == 0x0 && ctr != NULL) ? 1 : 0;
 	r_u->ctr = ctr;
@@ -3116,9 +3402,11 @@ BOOL make_samr_r_query_aliasinfo(SAMR_R_QUERY_ALIASINFO *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_query_aliasinfo(char *desc,  SAMR_R_QUERY_ALIASINFO *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_query_aliasinfo(char *desc, SAMR_R_QUERY_ALIASINFO * r_u,
+			       prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_query_aliasinfo");
 	depth++;
@@ -3126,7 +3414,7 @@ BOOL samr_io_r_query_aliasinfo(char *desc,  SAMR_R_QUERY_ALIASINFO *r_u, prs_str
 	prs_align(ps);
 
 	prs_uint32("ptr", ps, depth, &(r_u->ptr));
-	
+
 	if (r_u->ptr != 0)
 	{
 		samr_alias_info_ctr("ctr", r_u->ctr, ps, depth);
@@ -3141,13 +3429,13 @@ BOOL samr_io_r_query_aliasinfo(char *desc,  SAMR_R_QUERY_ALIASINFO *r_u, prs_str
 /*******************************************************************
 makes a SAMR_Q_SET_ALIASINFO structure.
 ********************************************************************/
-BOOL make_samr_q_set_aliasinfo(SAMR_Q_SET_ALIASINFO *q_u,
-			       const POLICY_HND *hnd,
-			       ALIAS_INFO_CTR *ctr)
+BOOL make_samr_q_set_aliasinfo(SAMR_Q_SET_ALIASINFO * q_u,
+			       const POLICY_HND * hnd, ALIAS_INFO_CTR * ctr)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_set_aliasinfo\n"));
+	DEBUG(5, ("make_samr_q_set_aliasinfo\n"));
 
 	q_u->alias_pol = *hnd;
 	q_u->ctr = ctr;
@@ -3158,16 +3446,18 @@ BOOL make_samr_q_set_aliasinfo(SAMR_Q_SET_ALIASINFO *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_set_aliasinfo(char *desc,  SAMR_Q_SET_ALIASINFO *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_set_aliasinfo(char *desc, SAMR_Q_SET_ALIASINFO * q_u,
+			     prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_set_aliasinfo");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth); 
+	smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth);
 	samr_alias_info_ctr("ctr", q_u->ctr, ps, depth);
 
 	return True;
@@ -3176,9 +3466,11 @@ BOOL samr_io_q_set_aliasinfo(char *desc,  SAMR_Q_SET_ALIASINFO *q_u, prs_struct
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_set_aliasinfo(char *desc,  SAMR_R_SET_ALIASINFO *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_set_aliasinfo(char *desc, SAMR_R_SET_ALIASINFO * r_u,
+			     prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_set_aliasinfo");
 	depth++;
@@ -3193,14 +3485,15 @@ BOOL samr_io_r_set_aliasinfo(char *desc,  SAMR_R_SET_ALIASINFO *r_u, prs_struct
 /*******************************************************************
 makes a SAMR_Q_QUERY_USERALIASES structure.
 ********************************************************************/
-BOOL make_samr_q_query_useraliases(SAMR_Q_QUERY_USERALIASES *q_u,
-				   const POLICY_HND *hnd,
-				   uint32  num_sids,
-				   uint32 *ptr_sid, DOM_SID2 *sid)
+BOOL make_samr_q_query_useraliases(SAMR_Q_QUERY_USERALIASES * q_u,
+				   const POLICY_HND * hnd,
+				   uint32 num_sids,
+				   uint32 * ptr_sid, DOM_SID2 * sid)
 {
-	if (q_u == NULL || hnd == NULL) return False;
+	if (q_u == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_query_useraliases\n"));
+	DEBUG(5, ("make_samr_q_query_useraliases\n"));
 
 	q_u->pol = *hnd;
 
@@ -3217,37 +3510,41 @@ BOOL make_samr_q_query_useraliases(SAMR_Q_QUERY_USERALIASES *q_u,
 /*******************************************************************
 reads or writes a SAMR_Q_QUERY_USERALIASES structure.
 ********************************************************************/
-BOOL samr_io_q_query_useraliases(char *desc,  SAMR_Q_QUERY_USERALIASES *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_query_useraliases(char *desc, SAMR_Q_QUERY_USERALIASES * q_u,
+				 prs_struct * ps, int depth)
 {
 	fstring tmp;
 	uint32 i;
 
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_query_useraliases");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("num_sids1", ps, depth, &(q_u->num_sids1));
-	prs_uint32("ptr      ", ps, depth, &(q_u->ptr      ));
+	prs_uint32("ptr      ", ps, depth, &(q_u->ptr));
 	prs_uint32("num_sids2", ps, depth, &(q_u->num_sids2));
 
 	if (q_u->num_sids2 != 0)
 	{
-		q_u->ptr_sid = (uint32*)Realloc(q_u->ptr_sid,
-		                    sizeof(q_u->ptr_sid[0]) * q_u->num_sids2);
+		q_u->ptr_sid = (uint32 *) Realloc(q_u->ptr_sid,
+						  sizeof(q_u->ptr_sid[0]) *
+						  q_u->num_sids2);
 		if (q_u->ptr_sid == NULL)
 		{
 			samr_free_q_query_useraliases(q_u);
 			return False;
 		}
 
-		q_u->sid = (DOM_SID2*)Realloc(q_u->sid,
-				       sizeof(q_u->sid[0]) * q_u->num_sids2);
+		q_u->sid = (DOM_SID2 *) Realloc(q_u->sid,
+						sizeof(q_u->sid[0]) *
+						q_u->num_sids2);
 		if (q_u->sid == NULL)
 		{
 			samr_free_q_query_useraliases(q_u);
@@ -3265,8 +3562,8 @@ BOOL samr_io_q_query_useraliases(char *desc,  SAMR_Q_QUERY_USERALIASES *q_u, prs
 	{
 		if (q_u->ptr_sid[i] != 0)
 		{
-			slprintf(tmp, sizeof(tmp)-1, "sid[%02d]", i);
-			smb_io_dom_sid2(tmp, &(q_u->sid[i]), ps, depth); 
+			slprintf(tmp, sizeof(tmp) - 1, "sid[%02d]", i);
+			smb_io_dom_sid2(tmp, &(q_u->sid[i]), ps, depth);
 		}
 	}
 
@@ -3283,7 +3580,7 @@ BOOL samr_io_q_query_useraliases(char *desc,  SAMR_Q_QUERY_USERALIASES *q_u, prs
 /*******************************************************************
 frees memory in a SAMR_Q_QUERY_USERALIASES structure.
 ********************************************************************/
-void samr_free_q_query_useraliases(SAMR_Q_QUERY_USERALIASES *q_u)
+void samr_free_q_query_useraliases(SAMR_Q_QUERY_USERALIASES * q_u)
 {
 	if (q_u->ptr_sid == NULL)
 	{
@@ -3301,16 +3598,18 @@ void samr_free_q_query_useraliases(SAMR_Q_QUERY_USERALIASES *q_u)
 /*******************************************************************
 makes a SAMR_R_QUERY_USERALIASES structure.
 ********************************************************************/
-BOOL make_samr_r_query_useraliases(SAMR_R_QUERY_USERALIASES *r_u,
-		uint32 num_rids, uint32 *rid, uint32 status)
+BOOL make_samr_r_query_useraliases(SAMR_R_QUERY_USERALIASES * r_u,
+				   uint32 num_rids, uint32 * rid,
+				   uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_query_useraliases\n"));
+	DEBUG(5, ("make_samr_r_query_useraliases\n"));
 
 	if (status == 0x0)
 	{
-		r_u->num_entries  = num_rids;
+		r_u->num_entries = num_rids;
 		r_u->ptr = 1;
 		r_u->num_entries2 = num_rids;
 
@@ -3318,7 +3617,7 @@ BOOL make_samr_r_query_useraliases(SAMR_R_QUERY_USERALIASES *r_u,
 	}
 	else
 	{
-		r_u->num_entries  = 0;
+		r_u->num_entries = 0;
 		r_u->ptr = 0;
 		r_u->num_entries2 = 0;
 	}
@@ -3331,11 +3630,13 @@ BOOL make_samr_r_query_useraliases(SAMR_R_QUERY_USERALIASES *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_rids(char *desc, uint32 *num_rids, uint32 **rid, prs_struct *ps, int depth)
+BOOL samr_io_rids(char *desc, uint32 * num_rids, uint32 ** rid,
+		  prs_struct * ps, int depth)
 {
 	fstring tmp;
 	uint32 i;
-	if (rid == NULL) return False;
+	if (rid == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_rids");
 	depth++;
@@ -3358,7 +3659,7 @@ BOOL samr_io_rids(char *desc, uint32 *num_rids, uint32 **rid, prs_struct *ps, in
 
 		for (i = 0; i < (*num_rids); i++)
 		{
-			slprintf(tmp, sizeof(tmp)-1, "rid[%02d]", i);
+			slprintf(tmp, sizeof(tmp) - 1, "rid[%02d]", i);
 			prs_uint32(tmp, ps, depth, &((*rid)[i]));
 		}
 	}
@@ -3375,9 +3676,11 @@ BOOL samr_io_rids(char *desc, uint32 *num_rids, uint32 **rid, prs_struct *ps, in
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_query_useraliases(char *desc,  SAMR_R_QUERY_USERALIASES *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_query_useraliases(char *desc, SAMR_R_QUERY_USERALIASES * r_u,
+				 prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_query_useraliases");
 	depth++;
@@ -3385,11 +3688,12 @@ BOOL samr_io_r_query_useraliases(char *desc,  SAMR_R_QUERY_USERALIASES *r_u, prs
 	prs_align(ps);
 
 	prs_uint32("num_entries", ps, depth, &(r_u->num_entries));
-	prs_uint32("ptr        ", ps, depth, &(r_u->ptr        ));
+	prs_uint32("ptr        ", ps, depth, &(r_u->ptr));
 
 	if (r_u->ptr != 0)
 	{
-		samr_io_rids("rids", &r_u->num_entries2, &r_u->rid, ps, depth);
+		samr_io_rids("rids", &r_u->num_entries2, &r_u->rid, ps,
+			     depth);
 	}
 
 	prs_uint32("status", ps, depth, &(r_u->status));
@@ -3400,19 +3704,20 @@ BOOL samr_io_r_query_useraliases(char *desc,  SAMR_R_QUERY_USERALIASES *r_u, prs
 /*******************************************************************
 makes a SAMR_Q_OPEN_ALIAS structure.
 ********************************************************************/
-BOOL make_samr_q_open_alias(SAMR_Q_OPEN_ALIAS *q_u, const POLICY_HND *pol,
-				uint32 unknown_0, uint32 rid)
+BOOL make_samr_q_open_alias(SAMR_Q_OPEN_ALIAS * q_u, const POLICY_HND * pol,
+			    uint32 unknown_0, uint32 rid)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_open_alias\n"));
+	DEBUG(5, ("make_samr_q_open_alias\n"));
 
 	memcpy(&(q_u->dom_pol), pol, sizeof(q_u->dom_pol));
 
 	/* example values: 0x0000 0008 */
-	q_u->unknown_0 = unknown_0; 
+	q_u->unknown_0 = unknown_0;
 
-	q_u->rid_alias = rid; 
+	q_u->rid_alias = rid;
 
 	return True;
 }
@@ -3420,16 +3725,18 @@ BOOL make_samr_q_open_alias(SAMR_Q_OPEN_ALIAS *q_u, const POLICY_HND *pol,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_open_alias(char *desc,  SAMR_Q_OPEN_ALIAS *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_open_alias(char *desc, SAMR_Q_OPEN_ALIAS * q_u,
+			  prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_open_alias");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("dom_pol", &(q_u->dom_pol), ps, depth); 
+	smb_io_pol_hnd("dom_pol", &(q_u->dom_pol), ps, depth);
 
 	prs_uint32("unknown_0", ps, depth, &(q_u->unknown_0));
 	prs_uint32("rid_alias", ps, depth, &(q_u->rid_alias));
@@ -3440,16 +3747,18 @@ BOOL samr_io_q_open_alias(char *desc,  SAMR_Q_OPEN_ALIAS *q_u, prs_struct *ps, i
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_open_alias(char *desc,  SAMR_R_OPEN_ALIAS *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_open_alias(char *desc, SAMR_R_OPEN_ALIAS * r_u,
+			  prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_open_alias");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(r_u->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(r_u->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("status", ps, depth, &(r_u->status));
@@ -3460,19 +3769,20 @@ BOOL samr_io_r_open_alias(char *desc,  SAMR_R_OPEN_ALIAS *r_u, prs_struct *ps, i
 /*******************************************************************
 makes a SAMR_Q_LOOKUP_RIDS structure.
 ********************************************************************/
-BOOL make_samr_q_lookup_rids(SAMR_Q_LOOKUP_RIDS *q_u,
-		const POLICY_HND *pol, uint32 flags,
-		uint32 num_rids, const uint32 *rid)
+BOOL make_samr_q_lookup_rids(SAMR_Q_LOOKUP_RIDS * q_u,
+			     const POLICY_HND * pol, uint32 flags,
+			     uint32 num_rids, const uint32 * rid)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_lookup_rids\n"));
+	DEBUG(5, ("make_samr_q_lookup_rids\n"));
 
 	q_u->pol = *pol;
 
 	q_u->num_rids1 = num_rids;
-	q_u->flags     = flags;
-	q_u->ptr       = 0;
+	q_u->flags = flags;
+	q_u->ptr = 0;
 	q_u->num_rids2 = num_rids;
 	q_u->rid = (uint32 *) memdup(rid, num_rids * sizeof(q_u->rid[0]));
 
@@ -3482,12 +3792,14 @@ BOOL make_samr_q_lookup_rids(SAMR_Q_LOOKUP_RIDS *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_lookup_rids(char *desc,  SAMR_Q_LOOKUP_RIDS *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_lookup_rids(char *desc, SAMR_Q_LOOKUP_RIDS * q_u,
+			   prs_struct * ps, int depth)
 {
 	uint32 i;
 	fstring tmp;
 
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_lookup_rids");
 	depth++;
@@ -3499,18 +3811,18 @@ BOOL samr_io_q_lookup_rids(char *desc,  SAMR_Q_LOOKUP_RIDS *q_u, prs_struct *ps,
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("num_rids1", ps, depth, &(q_u->num_rids1));
-	prs_uint32("flags    ", ps, depth, &(q_u->flags    ));
-	prs_uint32("ptr      ", ps, depth, &(q_u->ptr      ));
+	prs_uint32("flags    ", ps, depth, &(q_u->flags));
+	prs_uint32("ptr      ", ps, depth, &(q_u->ptr));
 	prs_uint32("num_rids2", ps, depth, &(q_u->num_rids2));
 
 	if (q_u->num_rids2 != 0)
 	{
-		q_u->rid = (uint32*)Realloc(q_u->rid, sizeof(q_u->rid[0]) *
-		                   q_u->num_rids2);
+		q_u->rid = (uint32 *) Realloc(q_u->rid, sizeof(q_u->rid[0]) *
+					      q_u->num_rids2);
 		if (q_u->rid == NULL)
 		{
 			samr_free_q_lookup_rids(q_u);
@@ -3538,7 +3850,7 @@ BOOL samr_io_q_lookup_rids(char *desc,  SAMR_Q_LOOKUP_RIDS *q_u, prs_struct *ps,
 /*******************************************************************
 frees a structure.
 ********************************************************************/
-void samr_free_q_lookup_rids(SAMR_Q_LOOKUP_RIDS *q_u)
+void samr_free_q_lookup_rids(SAMR_Q_LOOKUP_RIDS * q_u)
 {
 	if (q_u->rid != NULL)
 	{
@@ -3551,13 +3863,14 @@ void samr_free_q_lookup_rids(SAMR_Q_LOOKUP_RIDS *q_u)
 /*******************************************************************
 makes a SAMR_R_LOOKUP_RIDS structure.
 ********************************************************************/
-BOOL make_samr_r_lookup_rids(SAMR_R_LOOKUP_RIDS *r_u,
-		uint32 num_names, UNIHDR *hdr_name, UNISTR2 *uni_name,
-		uint32 *type)
+BOOL make_samr_r_lookup_rids(SAMR_R_LOOKUP_RIDS * r_u,
+			     uint32 num_names, UNIHDR * hdr_name,
+			     UNISTR2 * uni_name, uint32 * type)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_lookup_rids\n"));
+	DEBUG(5, ("make_samr_r_lookup_rids\n"));
 
 	r_u->hdr_name = NULL;
 	r_u->uni_name = NULL;
@@ -3566,11 +3879,11 @@ BOOL make_samr_r_lookup_rids(SAMR_R_LOOKUP_RIDS *r_u,
 	if (num_names != 0)
 	{
 		r_u->num_names1 = num_names;
-		r_u->ptr_names  = 1;
+		r_u->ptr_names = 1;
 		r_u->num_names2 = num_names;
 
 		r_u->num_types1 = num_names;
-		r_u->ptr_types  = 1;
+		r_u->ptr_types = 1;
 		r_u->num_types2 = num_names;
 
 		r_u->hdr_name = hdr_name;
@@ -3580,11 +3893,11 @@ BOOL make_samr_r_lookup_rids(SAMR_R_LOOKUP_RIDS *r_u,
 	else
 	{
 		r_u->num_names1 = num_names;
-		r_u->ptr_names  = 0;
+		r_u->ptr_names = 0;
 		r_u->num_names2 = num_names;
 
 		r_u->num_types1 = num_names;
-		r_u->ptr_types  = 0;
+		r_u->ptr_types = 0;
 		r_u->num_types2 = num_names;
 	}
 
@@ -3594,11 +3907,13 @@ BOOL make_samr_r_lookup_rids(SAMR_R_LOOKUP_RIDS *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_lookup_rids(char *desc, SAMR_R_LOOKUP_RIDS *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_lookup_rids(char *desc, SAMR_R_LOOKUP_RIDS * r_u,
+			   prs_struct * ps, int depth)
 {
 	uint32 i;
 	fstring tmp;
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_lookup_rids");
 	depth++;
@@ -3606,20 +3921,22 @@ BOOL samr_io_r_lookup_rids(char *desc, SAMR_R_LOOKUP_RIDS *r_u, prs_struct *ps,
 	prs_align(ps);
 
 	prs_uint32("num_names1", ps, depth, &(r_u->num_names1));
-	prs_uint32("ptr_names ", ps, depth, &(r_u->ptr_names ));
+	prs_uint32("ptr_names ", ps, depth, &(r_u->ptr_names));
 	prs_uint32("num_names2", ps, depth, &(r_u->num_names2));
 
 	if (r_u->ptr_names != 0 && r_u->num_names1 != 0)
 	{
-		r_u->hdr_name = (UNIHDR*)Realloc(r_u->hdr_name,
-		                   r_u->num_names2 * sizeof(r_u->hdr_name[0]));
+		r_u->hdr_name = (UNIHDR *) Realloc(r_u->hdr_name,
+						   r_u->num_names2 *
+						   sizeof(r_u->hdr_name[0]));
 		if (r_u->hdr_name == NULL)
 		{
 			return False;
 		}
 
-		r_u->uni_name = (UNISTR2*)Realloc(r_u->uni_name,
-		                    r_u->num_names2 * sizeof(r_u->uni_name[0]));
+		r_u->uni_name = (UNISTR2 *) Realloc(r_u->uni_name,
+						    r_u->num_names2 *
+						    sizeof(r_u->uni_name[0]));
 		if (r_u->uni_name == NULL)
 		{
 			free(r_u->hdr_name);
@@ -3628,12 +3945,13 @@ BOOL samr_io_r_lookup_rids(char *desc, SAMR_R_LOOKUP_RIDS *r_u, prs_struct *ps,
 		for (i = 0; i < r_u->num_names2; i++)
 		{
 			slprintf(tmp, sizeof(tmp) - 1, "hdr[%02d]  ", i);
-			smb_io_unihdr ("", &(r_u->hdr_name[i]), ps, depth); 
+			smb_io_unihdr("", &(r_u->hdr_name[i]), ps, depth);
 		}
 		for (i = 0; i < r_u->num_names2; i++)
 		{
 			slprintf(tmp, sizeof(tmp) - 1, "str[%02d]  ", i);
-			smb_io_unistr2("", &(r_u->uni_name[i]), r_u->hdr_name[i].buffer, ps, depth); 
+			smb_io_unistr2("", &(r_u->uni_name[i]),
+				       r_u->hdr_name[i].buffer, ps, depth);
 			prs_align(ps);
 		}
 	}
@@ -3641,13 +3959,13 @@ BOOL samr_io_r_lookup_rids(char *desc, SAMR_R_LOOKUP_RIDS *r_u, prs_struct *ps,
 	prs_align(ps);
 
 	prs_uint32("num_types1", ps, depth, &(r_u->num_types1));
-	prs_uint32("ptr_types ", ps, depth, &(r_u->ptr_types ));
+	prs_uint32("ptr_types ", ps, depth, &(r_u->ptr_types));
 	prs_uint32("num_types2", ps, depth, &(r_u->num_types2));
 
 	if (r_u->ptr_types != 0 && r_u->num_types1 != 0)
 	{
-		r_u->type = (uint32*)Realloc(r_u->type, r_u->num_types2 *
-		                    sizeof(r_u->type[0]));
+		r_u->type = (uint32 *) Realloc(r_u->type, r_u->num_types2 *
+					       sizeof(r_u->type[0]));
 		if (r_u->type == NULL)
 		{
 			if (r_u->uni_name != NULL)
@@ -3682,7 +4000,7 @@ BOOL samr_io_r_lookup_rids(char *desc, SAMR_R_LOOKUP_RIDS *r_u, prs_struct *ps,
 /*******************************************************************
 frees a structure.
 ********************************************************************/
-void samr_free_r_lookup_rids(SAMR_R_LOOKUP_RIDS *r_u)
+void samr_free_r_lookup_rids(SAMR_R_LOOKUP_RIDS * r_u)
 {
 	if (r_u->uni_name != NULL)
 	{
@@ -3704,11 +4022,12 @@ void samr_free_r_lookup_rids(SAMR_R_LOOKUP_RIDS *r_u)
 /*******************************************************************
 makes a SAMR_Q_OPEN_ALIAS structure.
 ********************************************************************/
-BOOL make_samr_q_delete_alias(SAMR_Q_DELETE_DOM_ALIAS *q_u, POLICY_HND *hnd)
+BOOL make_samr_q_delete_alias(SAMR_Q_DELETE_DOM_ALIAS * q_u, POLICY_HND * hnd)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_delete_alias\n"));
+	DEBUG(5, ("make_samr_q_delete_alias\n"));
 
 	memcpy(&(q_u->alias_pol), hnd, sizeof(q_u->alias_pol));
 
@@ -3719,16 +4038,18 @@ BOOL make_samr_q_delete_alias(SAMR_Q_DELETE_DOM_ALIAS *q_u, POLICY_HND *hnd)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_delete_alias(char *desc,  SAMR_Q_DELETE_DOM_ALIAS *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_delete_alias(char *desc, SAMR_Q_DELETE_DOM_ALIAS * q_u,
+			    prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_delete_alias");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth); 
+	smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth);
 
 	return True;
 }
@@ -3736,16 +4057,18 @@ BOOL samr_io_q_delete_alias(char *desc,  SAMR_Q_DELETE_DOM_ALIAS *q_u, prs_struc
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_delete_alias(char *desc,  SAMR_R_DELETE_DOM_ALIAS *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_delete_alias(char *desc, SAMR_R_DELETE_DOM_ALIAS * r_u,
+			    prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_delete_alias");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(r_u->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(r_u->pol), ps, depth);
 	prs_uint32("status", ps, depth, &(r_u->status));
 
 	return True;
@@ -3755,13 +4078,14 @@ BOOL samr_io_r_delete_alias(char *desc,  SAMR_R_DELETE_DOM_ALIAS *r_u, prs_struc
 /*******************************************************************
 makes a SAMR_Q_CREATE_DOM_ALIAS structure.
 ********************************************************************/
-BOOL make_samr_q_create_dom_alias(SAMR_Q_CREATE_DOM_ALIAS *q_u, POLICY_HND *hnd,
-				const char *acct_desc)
+BOOL make_samr_q_create_dom_alias(SAMR_Q_CREATE_DOM_ALIAS * q_u,
+				  POLICY_HND * hnd, const char *acct_desc)
 {
 	int acct_len = acct_desc != NULL ? strlen(acct_desc) : 0;
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_create_dom_alias\n"));
+	DEBUG(5, ("make_samr_q_create_dom_alias\n"));
 
 	memcpy(&(q_u->dom_pol), hnd, sizeof(q_u->dom_pol));
 
@@ -3777,19 +4101,22 @@ BOOL make_samr_q_create_dom_alias(SAMR_Q_CREATE_DOM_ALIAS *q_u, POLICY_HND *hnd,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_create_dom_alias(char *desc,  SAMR_Q_CREATE_DOM_ALIAS *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_create_dom_alias(char *desc, SAMR_Q_CREATE_DOM_ALIAS * q_u,
+				prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_create_dom_alias");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("dom_pol", &(q_u->dom_pol), ps, depth); 
+	smb_io_pol_hnd("dom_pol", &(q_u->dom_pol), ps, depth);
 
-	smb_io_unihdr ("hdr_acct_desc", &(q_u->hdr_acct_desc) , ps, depth); 
-	smb_io_unistr2("uni_acct_desc", &(q_u->uni_acct_desc), q_u->hdr_acct_desc.buffer, ps, depth);
+	smb_io_unihdr("hdr_acct_desc", &(q_u->hdr_acct_desc), ps, depth);
+	smb_io_unistr2("uni_acct_desc", &(q_u->uni_acct_desc),
+		       q_u->hdr_acct_desc.buffer, ps, depth);
 	prs_align(ps);
 
 	prs_uint32("access_mask", ps, depth, &(q_u->access_mask));
@@ -3800,16 +4127,18 @@ BOOL samr_io_q_create_dom_alias(char *desc,  SAMR_Q_CREATE_DOM_ALIAS *q_u, prs_s
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_create_dom_alias(char *desc,  SAMR_R_CREATE_DOM_ALIAS *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_create_dom_alias(char *desc, SAMR_R_CREATE_DOM_ALIAS * r_u,
+				prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_create_dom_alias");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("alias_pol", &(r_u->alias_pol), ps, depth); 
+	smb_io_pol_hnd("alias_pol", &(r_u->alias_pol), ps, depth);
 	prs_uint32("rid", ps, depth, &(r_u->rid));
 
 	prs_uint32("status", ps, depth, &(r_u->status));
@@ -3822,12 +4151,13 @@ BOOL samr_io_r_create_dom_alias(char *desc,  SAMR_R_CREATE_DOM_ALIAS *r_u, prs_s
 /*******************************************************************
 makes a SAMR_Q_ADD_ALIASMEM structure.
 ********************************************************************/
-BOOL make_samr_q_add_aliasmem(SAMR_Q_ADD_ALIASMEM *q_u, POLICY_HND *hnd,
-				DOM_SID *sid)
+BOOL make_samr_q_add_aliasmem(SAMR_Q_ADD_ALIASMEM * q_u, POLICY_HND * hnd,
+			      DOM_SID * sid)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_add_aliasmem\n"));
+	DEBUG(5, ("make_samr_q_add_aliasmem\n"));
 
 	memcpy(&(q_u->alias_pol), hnd, sizeof(q_u->alias_pol));
 	make_dom_sid2(&q_u->sid, sid);
@@ -3839,17 +4169,19 @@ BOOL make_samr_q_add_aliasmem(SAMR_Q_ADD_ALIASMEM *q_u, POLICY_HND *hnd,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_add_aliasmem(char *desc,  SAMR_Q_ADD_ALIASMEM *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_add_aliasmem(char *desc, SAMR_Q_ADD_ALIASMEM * q_u,
+			    prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_add_aliasmem");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd ("alias_pol", &(q_u->alias_pol), ps, depth); 
-	smb_io_dom_sid2("sid      ", &(q_u->sid      ), ps, depth); 
+	smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth);
+	smb_io_dom_sid2("sid      ", &(q_u->sid), ps, depth);
 
 	return True;
 }
@@ -3857,9 +4189,11 @@ BOOL samr_io_q_add_aliasmem(char *desc,  SAMR_Q_ADD_ALIASMEM *q_u, prs_struct *p
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_add_aliasmem(char *desc,  SAMR_R_ADD_ALIASMEM *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_add_aliasmem(char *desc, SAMR_R_ADD_ALIASMEM * r_u,
+			    prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_add_aliasmem");
 	depth++;
@@ -3875,12 +4209,13 @@ BOOL samr_io_r_add_aliasmem(char *desc,  SAMR_R_ADD_ALIASMEM *r_u, prs_struct *p
 /*******************************************************************
 makes a SAMR_Q_DEL_ALIASMEM structure.
 ********************************************************************/
-BOOL make_samr_q_del_aliasmem(SAMR_Q_DEL_ALIASMEM *q_u, POLICY_HND *hnd,
-				DOM_SID *sid)
+BOOL make_samr_q_del_aliasmem(SAMR_Q_DEL_ALIASMEM * q_u, POLICY_HND * hnd,
+			      DOM_SID * sid)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_del_aliasmem\n"));
+	DEBUG(5, ("make_samr_q_del_aliasmem\n"));
 
 	memcpy(&(q_u->alias_pol), hnd, sizeof(q_u->alias_pol));
 	make_dom_sid2(&q_u->sid, sid);
@@ -3892,17 +4227,19 @@ BOOL make_samr_q_del_aliasmem(SAMR_Q_DEL_ALIASMEM *q_u, POLICY_HND *hnd,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_del_aliasmem(char *desc,  SAMR_Q_DEL_ALIASMEM *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_del_aliasmem(char *desc, SAMR_Q_DEL_ALIASMEM * q_u,
+			    prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_del_aliasmem");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth); 
-	smb_io_dom_sid2("sid      ", &(q_u->sid      ), ps, depth); 
+	smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth);
+	smb_io_dom_sid2("sid      ", &(q_u->sid), ps, depth);
 
 	return True;
 }
@@ -3910,9 +4247,11 @@ BOOL samr_io_q_del_aliasmem(char *desc,  SAMR_Q_DEL_ALIASMEM *q_u, prs_struct *p
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_del_aliasmem(char *desc,  SAMR_R_DEL_ALIASMEM *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_del_aliasmem(char *desc, SAMR_R_DEL_ALIASMEM * r_u,
+			    prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_del_aliasmem");
 	depth++;
@@ -3927,11 +4266,13 @@ BOOL samr_io_r_del_aliasmem(char *desc,  SAMR_R_DEL_ALIASMEM *r_u, prs_struct *p
 /*******************************************************************
 makes a SAMR_Q_DELETE_DOM_ALIAS structure.
 ********************************************************************/
-BOOL make_samr_q_delete_dom_alias(SAMR_Q_DELETE_DOM_ALIAS *q_c, POLICY_HND *hnd)
+BOOL make_samr_q_delete_dom_alias(SAMR_Q_DELETE_DOM_ALIAS * q_c,
+				  POLICY_HND * hnd)
 {
-	if (q_c == NULL || hnd == NULL) return False;
+	if (q_c == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_delete_dom_alias\n"));
+	DEBUG(5, ("make_samr_q_delete_dom_alias\n"));
 
 	memcpy(&(q_c->alias_pol), hnd, sizeof(q_c->alias_pol));
 
@@ -3941,16 +4282,18 @@ BOOL make_samr_q_delete_dom_alias(SAMR_Q_DELETE_DOM_ALIAS *q_c, POLICY_HND *hnd)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_delete_dom_alias(char *desc,  SAMR_Q_DELETE_DOM_ALIAS *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_delete_dom_alias(char *desc, SAMR_Q_DELETE_DOM_ALIAS * q_u,
+				prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_delete_dom_alias");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth); 
+	smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth);
 
 	return True;
 }
@@ -3958,12 +4301,13 @@ BOOL samr_io_q_delete_dom_alias(char *desc,  SAMR_Q_DELETE_DOM_ALIAS *q_u, prs_s
 /*******************************************************************
 makes a SAMR_R_DELETE_DOM_ALIAS structure.
 ********************************************************************/
-BOOL make_samr_r_delete_dom_alias(SAMR_R_DELETE_DOM_ALIAS *r_u,
-		uint32 status)
+BOOL make_samr_r_delete_dom_alias(SAMR_R_DELETE_DOM_ALIAS * r_u,
+				  uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_delete_dom_alias\n"));
+	DEBUG(5, ("make_samr_r_delete_dom_alias\n"));
 
 	r_u->status = status;
 
@@ -3973,9 +4317,11 @@ BOOL make_samr_r_delete_dom_alias(SAMR_R_DELETE_DOM_ALIAS *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_delete_dom_alias(char *desc,  SAMR_R_DELETE_DOM_ALIAS *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_delete_dom_alias(char *desc, SAMR_R_DELETE_DOM_ALIAS * r_u,
+				prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_delete_dom_alias");
 	depth++;
@@ -3991,12 +4337,13 @@ BOOL samr_io_r_delete_dom_alias(char *desc,  SAMR_R_DELETE_DOM_ALIAS *r_u, prs_s
 /*******************************************************************
 makes a SAMR_Q_QUERY_ALIASMEM structure.
 ********************************************************************/
-BOOL make_samr_q_query_aliasmem(SAMR_Q_QUERY_ALIASMEM *q_c,
-				const POLICY_HND *hnd)
+BOOL make_samr_q_query_aliasmem(SAMR_Q_QUERY_ALIASMEM * q_c,
+				const POLICY_HND * hnd)
 {
-	if (q_c == NULL || hnd == NULL) return False;
+	if (q_c == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_query_aliasmem\n"));
+	DEBUG(5, ("make_samr_q_query_aliasmem\n"));
 
 	memcpy(&(q_c->alias_pol), hnd, sizeof(q_c->alias_pol));
 
@@ -4006,16 +4353,18 @@ BOOL make_samr_q_query_aliasmem(SAMR_Q_QUERY_ALIASMEM *q_c,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_query_aliasmem(char *desc,  SAMR_Q_QUERY_ALIASMEM *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_query_aliasmem(char *desc, SAMR_Q_QUERY_ALIASMEM * q_u,
+			      prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_query_aliasmem");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth); 
+	smb_io_pol_hnd("alias_pol", &(q_u->alias_pol), ps, depth);
 
 	return True;
 }
@@ -4023,24 +4372,26 @@ BOOL samr_io_q_query_aliasmem(char *desc,  SAMR_Q_QUERY_ALIASMEM *q_u, prs_struc
 /*******************************************************************
 makes a SAMR_R_QUERY_ALIASMEM structure.
 ********************************************************************/
-BOOL make_samr_r_query_aliasmem(SAMR_R_QUERY_ALIASMEM *r_u,
-		uint32 num_sids, DOM_SID2 *sid, uint32 status)
+BOOL make_samr_r_query_aliasmem(SAMR_R_QUERY_ALIASMEM * r_u,
+				uint32 num_sids, DOM_SID2 * sid,
+				uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_query_aliasmem\n"));
+	DEBUG(5, ("make_samr_r_query_aliasmem\n"));
 
 	if (status == 0x0)
 	{
-		r_u->num_sids  = num_sids;
-		r_u->ptr       = (num_sids != 0) ? 1 : 0;
+		r_u->num_sids = num_sids;
+		r_u->ptr = (num_sids != 0) ? 1 : 0;
 		r_u->num_sids1 = num_sids;
 
 		r_u->sid = sid;
 	}
 	else
 	{
-		r_u->ptr      = 0;
+		r_u->ptr = 0;
 		r_u->num_sids = 0;
 	}
 
@@ -4052,12 +4403,14 @@ BOOL make_samr_r_query_aliasmem(SAMR_R_QUERY_ALIASMEM *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_query_aliasmem(char *desc,  SAMR_R_QUERY_ALIASMEM *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_query_aliasmem(char *desc, SAMR_R_QUERY_ALIASMEM * r_u,
+			      prs_struct * ps, int depth)
 {
 	uint32 i;
 	uint32 ptr_sid[MAX_LOOKUP_SIDS];
 
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_query_aliasmem");
 	depth++;
@@ -4084,7 +4437,8 @@ BOOL samr_io_r_query_aliasmem(char *desc,  SAMR_R_QUERY_ALIASMEM *r_u, prs_struc
 			{
 				if (ptr_sid[i] != 0)
 				{
-					smb_io_dom_sid2("", &(r_u->sid[i]), ps, depth);
+					smb_io_dom_sid2("", &(r_u->sid[i]),
+							ps, depth);
 				}
 			}
 		}
@@ -4098,27 +4452,28 @@ BOOL samr_io_r_query_aliasmem(char *desc,  SAMR_R_QUERY_ALIASMEM *r_u, prs_struc
 /*******************************************************************
 makes a SAMR_Q_LOOKUP_NAMES structure.
 ********************************************************************/
-BOOL make_samr_q_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
-			      const POLICY_HND *pol, uint32 flags,
+BOOL make_samr_q_lookup_names(SAMR_Q_LOOKUP_NAMES * q_u,
+			      const POLICY_HND * pol, uint32 flags,
 			      uint32 num_names, char **name)
 {
 	uint32 i;
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_lookup_names\n"));
+	DEBUG(5, ("make_samr_q_lookup_names\n"));
 
 	memcpy(&(q_u->pol), pol, sizeof(*pol));
 
 	q_u->num_names1 = num_names;
-	q_u->flags     = flags;
-	q_u->ptr       = 0;
+	q_u->flags = flags;
+	q_u->ptr = 0;
 	q_u->num_names2 = num_names;
 
 	for (i = 0; i < num_names; i++)
 	{
 		int len_name = name[i] != NULL ? strlen(name[i]) : 0;
-		make_uni_hdr(&(q_u->hdr_name[i]), len_name);  /* unicode header for user_name */
-		make_unistr2(&(q_u->uni_name[i]), name[i], len_name);  /* unicode string for machine account */
+		make_uni_hdr(&(q_u->hdr_name[i]), len_name);	/* unicode header for user_name */
+		make_unistr2(&(q_u->uni_name[i]), name[i], len_name);	/* unicode string for machine account */
 	}
 
 	return True;
@@ -4127,11 +4482,13 @@ BOOL make_samr_q_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_lookup_names(char *desc,  SAMR_Q_LOOKUP_NAMES *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_lookup_names(char *desc, SAMR_Q_LOOKUP_NAMES * q_u,
+			    prs_struct * ps, int depth)
 {
 	uint32 i;
 
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_lookup_names");
 	depth++;
@@ -4143,23 +4500,24 @@ BOOL samr_io_q_lookup_names(char *desc,  SAMR_Q_LOOKUP_NAMES *q_u, prs_struct *p
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("num_names1", ps, depth, &(q_u->num_names1));
-	prs_uint32("flags     ", ps, depth, &(q_u->flags     ));
-	prs_uint32("ptr       ", ps, depth, &(q_u->ptr       ));
+	prs_uint32("flags     ", ps, depth, &(q_u->flags));
+	prs_uint32("ptr       ", ps, depth, &(q_u->ptr));
 	prs_uint32("num_names2", ps, depth, &(q_u->num_names2));
 
 	SMB_ASSERT_ARRAY(q_u->hdr_name, q_u->num_names2);
 
 	for (i = 0; i < q_u->num_names2; i++)
 	{
-		smb_io_unihdr ("", &(q_u->hdr_name[i]), ps, depth); 
+		smb_io_unihdr("", &(q_u->hdr_name[i]), ps, depth);
 	}
 	for (i = 0; i < q_u->num_names2; i++)
 	{
-		smb_io_unistr2("", &(q_u->uni_name[i]), q_u->hdr_name[i].buffer, ps, depth); 
+		smb_io_unistr2("", &(q_u->uni_name[i]),
+			       q_u->hdr_name[i].buffer, ps, depth);
 		prs_align(ps);
 	}
 
@@ -4177,38 +4535,39 @@ BOOL samr_io_q_lookup_names(char *desc,  SAMR_Q_LOOKUP_NAMES *q_u, prs_struct *p
 /*******************************************************************
 frees a structure.
 ********************************************************************/
-void samr_free_q_lookup_names(SAMR_Q_LOOKUP_NAMES *q_l)
+void samr_free_q_lookup_names(SAMR_Q_LOOKUP_NAMES * q_l)
 {
 }
 
 /*******************************************************************
 makes a SAMR_R_LOOKUP_NAMES structure.
 ********************************************************************/
-BOOL make_samr_r_lookup_names(SAMR_R_LOOKUP_NAMES *r_u,
+BOOL make_samr_r_lookup_names(SAMR_R_LOOKUP_NAMES * r_u,
 			      uint32 num_rids,
-			      const uint32 *rid, const uint32 *type,
+			      const uint32 * rid, const uint32 * type,
 			      uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_lookup_names\n"));
+	DEBUG(5, ("make_samr_r_lookup_names\n"));
 
 	if ((status == 0x0) && (num_rids != 0))
 	{
 		uint32 i;
 
 		r_u->num_types1 = num_rids;
-		r_u->ptr_types  = 1;
+		r_u->ptr_types = 1;
 		r_u->num_types2 = num_rids;
 
 		r_u->num_rids1 = num_rids;
-		r_u->ptr_rids  = 1;
+		r_u->ptr_rids = 1;
 		r_u->num_rids2 = num_rids;
 
-		r_u->rids  = g_new(uint32, num_rids);
+		r_u->rids = g_new(uint32, num_rids);
 		r_u->types = g_new(uint32, num_rids);
 
-		if (! r_u->rids || ! r_u->types)
+		if (!r_u->rids || !r_u->types)
 		{
 			samr_free_r_lookup_names(r_u);
 			return False;
@@ -4216,21 +4575,21 @@ BOOL make_samr_r_lookup_names(SAMR_R_LOOKUP_NAMES *r_u,
 
 		for (i = 0; i < num_rids; i++)
 		{
-			r_u->rids [i] = rid [i];
+			r_u->rids[i] = rid[i];
 			r_u->types[i] = type[i];
 		}
 	}
 	else
 	{
 		r_u->num_types1 = 0;
-		r_u->ptr_types  = 0;
+		r_u->ptr_types = 0;
 		r_u->num_types2 = 0;
 
 		r_u->num_rids1 = 0;
-		r_u->ptr_rids  = 0;
+		r_u->ptr_rids = 0;
 		r_u->num_rids2 = 0;
 
-		r_u->rids  = NULL;
+		r_u->rids = NULL;
 		r_u->types = NULL;
 	}
 
@@ -4242,12 +4601,14 @@ BOOL make_samr_r_lookup_names(SAMR_R_LOOKUP_NAMES *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_lookup_names(char *desc,  SAMR_R_LOOKUP_NAMES *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_lookup_names(char *desc, SAMR_R_LOOKUP_NAMES * r_u,
+			    prs_struct * ps, int depth)
 {
 	uint32 i;
 	fstring tmp;
 
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_lookup_names");
 	depth++;
@@ -4260,7 +4621,7 @@ BOOL samr_io_r_lookup_names(char *desc,  SAMR_R_LOOKUP_NAMES *r_u, prs_struct *p
 	prs_align(ps);
 
 	prs_uint32("num_rids1", ps, depth, &(r_u->num_rids1));
-	prs_uint32("ptr_rids ", ps, depth, &(r_u->ptr_rids ));
+	prs_uint32("ptr_rids ", ps, depth, &(r_u->ptr_rids));
 
 	if (r_u->ptr_rids != 0)
 	{
@@ -4275,7 +4636,7 @@ BOOL samr_io_r_lookup_names(char *desc,  SAMR_R_LOOKUP_NAMES *r_u, prs_struct *p
 		if (ps->io)
 			r_u->rids = g_new(uint32, r_u->num_rids2);
 
-		if (! r_u->rids)
+		if (!r_u->rids)
 		{
 			DEBUG(0, ("NULL rids in samr_io_r_lookup_names\n"));
 			samr_free_r_lookup_names(r_u);
@@ -4290,7 +4651,7 @@ BOOL samr_io_r_lookup_names(char *desc,  SAMR_R_LOOKUP_NAMES *r_u, prs_struct *p
 	}
 
 	prs_uint32("num_types1", ps, depth, &(r_u->num_types1));
-	prs_uint32("ptr_types ", ps, depth, &(r_u->ptr_types ));
+	prs_uint32("ptr_types ", ps, depth, &(r_u->ptr_types));
 
 	if (r_u->ptr_types != 0)
 	{
@@ -4305,7 +4666,7 @@ BOOL samr_io_r_lookup_names(char *desc,  SAMR_R_LOOKUP_NAMES *r_u, prs_struct *p
 		if (ps->io)
 			r_u->types = g_new(uint32, r_u->num_types2);
 
-		if (! r_u->types)
+		if (!r_u->types)
 		{
 			DEBUG(0, ("NULL types in samr_io_r_lookup_names\n"));
 			samr_free_r_lookup_names(r_u);
@@ -4333,7 +4694,7 @@ BOOL samr_io_r_lookup_names(char *desc,  SAMR_R_LOOKUP_NAMES *r_u, prs_struct *p
 /*******************************************************************
 frees a structure.
 ********************************************************************/
-void samr_free_r_lookup_names(SAMR_R_LOOKUP_NAMES *r_l)
+void samr_free_r_lookup_names(SAMR_R_LOOKUP_NAMES * r_l)
 {
 	if (r_l->rids != NULL)
 	{
@@ -4346,22 +4707,24 @@ void samr_free_r_lookup_names(SAMR_R_LOOKUP_NAMES *r_l)
 		r_l->types = NULL;
 	}
 	r_l->num_types1 = 0;
-	r_l->ptr_types  = 0;
+	r_l->ptr_types = 0;
 	r_l->num_types2 = 0;
 
 	r_l->num_rids1 = 0;
-	r_l->ptr_rids  = 0;
+	r_l->ptr_rids = 0;
 	r_l->num_rids2 = 0;
 }
 
 /*******************************************************************
 makes a SAMR_Q_DELETE_DOM_USER structure.
 ********************************************************************/
-BOOL make_samr_q_delete_dom_user(SAMR_Q_DELETE_DOM_USER *q_c, POLICY_HND *hnd)
+BOOL make_samr_q_delete_dom_user(SAMR_Q_DELETE_DOM_USER * q_c,
+				 POLICY_HND * hnd)
 {
-	if (q_c == NULL || hnd == NULL) return False;
+	if (q_c == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_delete_dom_user\n"));
+	DEBUG(5, ("make_samr_q_delete_dom_user\n"));
 
 	memcpy(&(q_c->user_pol), hnd, sizeof(q_c->user_pol));
 
@@ -4371,16 +4734,18 @@ BOOL make_samr_q_delete_dom_user(SAMR_Q_DELETE_DOM_USER *q_c, POLICY_HND *hnd)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_delete_dom_user(char *desc,  SAMR_Q_DELETE_DOM_USER *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_delete_dom_user(char *desc, SAMR_Q_DELETE_DOM_USER * q_u,
+			       prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_delete_dom_user");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("user_pol", &(q_u->user_pol), ps, depth); 
+	smb_io_pol_hnd("user_pol", &(q_u->user_pol), ps, depth);
 
 	return True;
 }
@@ -4388,9 +4753,11 @@ BOOL samr_io_q_delete_dom_user(char *desc,  SAMR_Q_DELETE_DOM_USER *q_u, prs_str
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_delete_dom_user(char *desc,  SAMR_R_DELETE_DOM_USER *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_delete_dom_user(char *desc, SAMR_R_DELETE_DOM_USER * r_u,
+			       prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_delete_dom_user");
 	depth++;
@@ -4406,18 +4773,19 @@ BOOL samr_io_r_delete_dom_user(char *desc,  SAMR_R_DELETE_DOM_USER *r_u, prs_str
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL make_samr_q_open_user(SAMR_Q_OPEN_USER *q_u,
-				const POLICY_HND *pol,
-				uint32 access_mask, uint32 rid)
+BOOL make_samr_q_open_user(SAMR_Q_OPEN_USER * q_u,
+			   const POLICY_HND * pol,
+			   uint32 access_mask, uint32 rid)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("samr_make_samr_q_open_user\n"));
+	DEBUG(5, ("samr_make_samr_q_open_user\n"));
 
 	memcpy(&q_u->domain_pol, pol, sizeof(q_u->domain_pol));
-	
+
 	q_u->access_mask = access_mask;
-	q_u->user_rid  = rid;
+	q_u->user_rid = rid;
 
 	return True;
 }
@@ -4425,20 +4793,22 @@ BOOL make_samr_q_open_user(SAMR_Q_OPEN_USER *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_open_user(char *desc,  SAMR_Q_OPEN_USER *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_open_user(char *desc, SAMR_Q_OPEN_USER * q_u, prs_struct * ps,
+			 int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_open_user");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth); 
+	smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("access_mask", ps, depth, &(q_u->access_mask));
-	prs_uint32("user_rid ", ps, depth, &(q_u->user_rid ));
+	prs_uint32("user_rid ", ps, depth, &(q_u->user_rid));
 
 	prs_align(ps);
 
@@ -4448,16 +4818,18 @@ BOOL samr_io_q_open_user(char *desc,  SAMR_Q_OPEN_USER *q_u, prs_struct *ps, int
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_open_user(char *desc,  SAMR_R_OPEN_USER *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_open_user(char *desc, SAMR_R_OPEN_USER * r_u, prs_struct * ps,
+			 int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_open_user");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("user_pol", &(r_u->user_pol), ps, depth); 
+	smb_io_pol_hnd("user_pol", &(r_u->user_pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("status", ps, depth, &(r_u->status));
@@ -4468,20 +4840,21 @@ BOOL samr_io_r_open_user(char *desc,  SAMR_R_OPEN_USER *r_u, prs_struct *ps, int
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL make_samr_q_create_user(SAMR_Q_CREATE_USER *q_u,
-				POLICY_HND *pol,
-				const char *name,
-				uint16 acb_info, uint32 access_mask)
+BOOL make_samr_q_create_user(SAMR_Q_CREATE_USER * q_u,
+			     POLICY_HND * pol,
+			     const char *name,
+			     uint16 acb_info, uint32 access_mask)
 {
 	int len_name;
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 	len_name = strlen(name);
 
-	DEBUG(5,("samr_make_samr_q_create_user\n"));
+	DEBUG(5, ("samr_make_samr_q_create_user\n"));
 
 	memcpy(&q_u->domain_pol, pol, sizeof(q_u->domain_pol));
-	
-	make_uni_hdr(&(q_u->hdr_name), len_name);  
+
+	make_uni_hdr(&(q_u->hdr_name), len_name);
 	make_unistr2(&(q_u->uni_name), name, len_name);
 
 	q_u->acb_info = acb_info;
@@ -4493,23 +4866,26 @@ BOOL make_samr_q_create_user(SAMR_Q_CREATE_USER *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_create_user(char *desc,  SAMR_Q_CREATE_USER *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_create_user(char *desc, SAMR_Q_CREATE_USER * q_u,
+			   prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_create_user");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth); 
+	smb_io_pol_hnd("domain_pol", &(q_u->domain_pol), ps, depth);
 	prs_align(ps);
 
-	smb_io_unihdr ("unihdr", &(q_u->hdr_name), ps, depth); 
-	smb_io_unistr2("unistr2", &(q_u->uni_name), q_u->hdr_name.buffer, ps, depth); 
+	smb_io_unihdr("unihdr", &(q_u->hdr_name), ps, depth);
+	smb_io_unistr2("unistr2", &(q_u->uni_name), q_u->hdr_name.buffer, ps,
+		       depth);
 	prs_align(ps);
 
-	prs_uint16("acb_info   ", ps, depth, &(q_u->acb_info   ));
+	prs_uint16("acb_info   ", ps, depth, &(q_u->acb_info));
 	prs_align(ps);
 	prs_uint32("access_mask", ps, depth, &(q_u->access_mask));
 
@@ -4521,20 +4897,22 @@ BOOL samr_io_q_create_user(char *desc,  SAMR_Q_CREATE_USER *q_u, prs_struct *ps,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_create_user(char *desc,  SAMR_R_CREATE_USER *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_create_user(char *desc, SAMR_R_CREATE_USER * r_u,
+			   prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_create_user");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("user_pol", &(r_u->user_pol), ps, depth); 
+	smb_io_pol_hnd("user_pol", &(r_u->user_pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("unknown_0", ps, depth, &(r_u->unknown_0));
-	prs_uint32("user_rid ", ps, depth, &(r_u->user_rid ));
+	prs_uint32("user_rid ", ps, depth, &(r_u->user_rid));
 	prs_uint32("status", ps, depth, &(r_u->status));
 
 	return True;
@@ -4543,12 +4921,13 @@ BOOL samr_io_r_create_user(char *desc,  SAMR_R_CREATE_USER *r_u, prs_struct *ps,
 /*******************************************************************
 makes a SAMR_Q_QUERY_USERINFO structure.
 ********************************************************************/
-BOOL make_samr_q_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u,
-				POLICY_HND *hnd, uint16 switch_value)
+BOOL make_samr_q_query_userinfo(SAMR_Q_QUERY_USERINFO * q_u,
+				POLICY_HND * hnd, uint16 switch_value)
 {
-	if (q_u == NULL || hnd == NULL) return False;
+	if (q_u == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_query_userinfo\n"));
+	DEBUG(5, ("make_samr_q_query_userinfo\n"));
 
 	memcpy(&(q_u->pol), hnd, sizeof(q_u->pol));
 	q_u->switch_value = switch_value;
@@ -4560,19 +4939,21 @@ BOOL make_samr_q_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_query_userinfo(char *desc,  SAMR_Q_QUERY_USERINFO *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_query_userinfo(char *desc, SAMR_Q_QUERY_USERINFO * q_u,
+			      prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_query_userinfo");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth);
 	prs_align(ps);
 
-	prs_uint16("switch_value", ps, depth, &(q_u->switch_value)); /* 0x0015 or 0x0011 */
+	prs_uint16("switch_value", ps, depth, &(q_u->switch_value));	/* 0x0015 or 0x0011 */
 
 	prs_align(ps);
 
@@ -4582,25 +4963,26 @@ BOOL samr_io_q_query_userinfo(char *desc,  SAMR_Q_QUERY_USERINFO *q_u, prs_struc
 /*******************************************************************
 reads or writes a LOGON_HRS structure.
 ********************************************************************/
-static BOOL sam_io_logon_hrs(char *desc,  LOGON_HRS *hrs, prs_struct *ps, int depth)
+static BOOL sam_io_logon_hrs(char *desc, LOGON_HRS * hrs, prs_struct * ps,
+			     int depth)
 {
-	if (hrs == NULL) return False;
+	if (hrs == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_logon_hrs");
 	depth++;
 
 	prs_align(ps);
-	
-	prs_uint16 (       "len  ", ps, depth, &hrs->len);
-	prs_align(ps);
+
+	prs_uint32("len  ", ps, depth, &hrs->len);
 
 	if (hrs->len > 64)
 	{
-		DEBUG(5,("sam_io_logon_hrs: truncating length\n"));
+		DEBUG(5, ("sam_io_logon_hrs: truncating length\n"));
 		hrs->len = 64;
 	}
 
-	prs_uint8s (False, "hours", ps, depth, hrs->hours, hrs->len);
+	prs_uint8s(False, "hours", ps, depth, hrs->hours, hrs->len);
 
 	return True;
 }
@@ -4608,15 +4990,14 @@ static BOOL sam_io_logon_hrs(char *desc,  LOGON_HRS *hrs, prs_struct *ps, int de
 /*******************************************************************
 makes a SAM_USER_INFO_12 structure.
 ********************************************************************/
-BOOL make_sam_user_info12(SAM_USER_INFO_12 *usr,
-				uint16 acb_info,
-				const uint8 lm_pwd[16],
-				const uint8 nt_pwd[16])
-
+BOOL make_sam_user_info12(SAM_USER_INFO_12 * usr,
+			  uint16 acb_info,
+			  const uint8 lm_pwd[16], const uint8 nt_pwd[16])
 {
-	if (usr == NULL) return False;
+	if (usr == NULL)
+		return False;
 
-	DEBUG(5,("make_sam_user_info12\n"));
+	DEBUG(5, ("make_sam_user_info12\n"));
 
 	usr->acb_info = acb_info;
 
@@ -4644,11 +5025,13 @@ BOOL make_sam_user_info12(SAM_USER_INFO_12 *usr,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL sam_io_user_info12(char *desc,  SAM_USER_INFO_12 *u, prs_struct *ps, int depth)
+BOOL sam_io_user_info12(char *desc, SAM_USER_INFO_12 * u, prs_struct * ps,
+			int depth)
 {
-	if (u == NULL) return False;
+	if (u == NULL)
+		return False;
 
-	DEBUG(0,("possible security breach!\n"));
+	DEBUG(0, ("possible security breach!\n"));
 
 	prs_debug(ps, depth, desc, "samr_io_r_user_info12");
 	depth++;
@@ -4667,12 +5050,12 @@ BOOL sam_io_user_info12(char *desc,  SAM_USER_INFO_12 *u, prs_struct *ps, int de
 /*******************************************************************
 makes a SAM_USER_INFO_10 structure.
 ********************************************************************/
-BOOL make_sam_user_info10(SAM_USER_INFO_10 *usr,
-				uint32 acb_info)
+BOOL make_sam_user_info10(SAM_USER_INFO_10 * usr, uint32 acb_info)
 {
-	if (usr == NULL) return False;
+	if (usr == NULL)
+		return False;
 
-	DEBUG(5,("make_sam_user_info10\n"));
+	DEBUG(5, ("make_sam_user_info10\n"));
 
 	usr->acb_info = acb_info;
 
@@ -4682,9 +5065,11 @@ BOOL make_sam_user_info10(SAM_USER_INFO_10 *usr,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL sam_io_user_info10(char *desc,  SAM_USER_INFO_10 *usr, prs_struct *ps, int depth)
+BOOL sam_io_user_info10(char *desc, SAM_USER_INFO_10 * usr, prs_struct * ps,
+			int depth)
 {
-	if (usr == NULL) return False;
+	if (usr == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_user_info10");
 	depth++;
@@ -4699,50 +5084,48 @@ BOOL sam_io_user_info10(char *desc,  SAM_USER_INFO_10 *usr, prs_struct *ps, int
 /*******************************************************************
 makes a SAM_USER_INFO_11 structure.
 ********************************************************************/
-BOOL make_sam_user_info11(SAM_USER_INFO_11 *usr,
-				NTTIME *expiry,
-				char *mach_acct,
-				uint32 rid_user,
-				uint32 rid_group,
-				uint16 acct_ctrl)
-				
+BOOL make_sam_user_info11(SAM_USER_INFO_11 * usr,
+			  NTTIME * expiry,
+			  char *mach_acct,
+			  uint32 rid_user, uint32 rid_group, uint16 acct_ctrl)
 {
 	int len_mach_acct;
-	if (usr == NULL || expiry == NULL || mach_acct == NULL) return False;
+	if (usr == NULL || expiry == NULL || mach_acct == NULL)
+		return False;
 
-	DEBUG(5,("make_sam_user_info11\n"));
+	DEBUG(5, ("make_sam_user_info11\n"));
 
 	len_mach_acct = strlen(mach_acct);
 
-	memcpy(&(usr->expiry),expiry, sizeof(usr->expiry)); /* expiry time or something? */
-	bzero(usr->padding_1, sizeof(usr->padding_1)); /* 0 - padding 24 bytes */
+	memcpy(&(usr->expiry), expiry, sizeof(usr->expiry));	/* expiry time or something? */
+	bzero(usr->padding_1, sizeof(usr->padding_1));	/* 0 - padding 24 bytes */
+
+	make_uni_hdr(&(usr->hdr_mach_acct), len_mach_acct);	/* unicode header for machine account */
+	usr->padding_2 = 0;	/* 0 - padding 4 bytes */
 
-	make_uni_hdr(&(usr->hdr_mach_acct), len_mach_acct);  /* unicode header for machine account */
-	usr->padding_2 = 0;               /* 0 - padding 4 bytes */
+	usr->ptr_1 = 1;		/* pointer */
+	bzero(usr->padding_3, sizeof(usr->padding_3));	/* 0 - padding 32 bytes */
+	usr->padding_4 = 0;	/* 0 - padding 4 bytes */
 
-	usr->ptr_1        = 1;            /* pointer */
-	bzero(usr->padding_3, sizeof(usr->padding_3)); /* 0 - padding 32 bytes */
-	usr->padding_4    = 0;            /* 0 - padding 4 bytes */
+	usr->ptr_2 = 1;		/* pointer */
+	usr->padding_5 = 0;	/* 0 - padding 4 bytes */
 
-	usr->ptr_2        = 1;            /* pointer */
-	usr->padding_5    = 0;            /* 0 - padding 4 bytes */
+	usr->ptr_3 = 1;		/* pointer */
+	bzero(usr->padding_6, sizeof(usr->padding_6));	/* 0 - padding 32 bytes */
 
-	usr->ptr_3        = 1;          /* pointer */
-	bzero(usr->padding_6, sizeof(usr->padding_6)); /* 0 - padding 32 bytes */
+	usr->rid_user = rid_user;
+	usr->rid_group = rid_group;
 
-	usr->rid_user     = rid_user; 
-	usr->rid_group    = rid_group;
+	usr->acct_ctrl = acct_ctrl;
+	usr->unknown_3 = 0x0000;
 
-	usr->acct_ctrl    = acct_ctrl;
-	usr->unknown_3    = 0x0000;
+	usr->unknown_4 = 0x003f;	/* 0x003f      - 16 bit unknown */
+	usr->unknown_5 = 0x003c;	/* 0x003c      - 16 bit unknown */
 
-	usr->unknown_4    = 0x003f;       /* 0x003f      - 16 bit unknown */
-	usr->unknown_5    = 0x003c;       /* 0x003c      - 16 bit unknown */
+	bzero(usr->padding_7, sizeof(usr->padding_7));	/* 0 - padding 16 bytes */
+	usr->padding_8 = 0;	/* 0 - padding 4 bytes */
 
-	bzero(usr->padding_7, sizeof(usr->padding_7)); /* 0 - padding 16 bytes */
-	usr->padding_8    = 0;            /* 0 - padding 4 bytes */
-	
-	make_unistr2(&(usr->uni_mach_acct), mach_acct, len_mach_acct);  /* unicode string for machine account */
+	make_unistr2(&(usr->uni_mach_acct), mach_acct, len_mach_acct);	/* unicode string for machine account */
 
 	return True;
 }
@@ -4750,48 +5133,56 @@ BOOL make_sam_user_info11(SAM_USER_INFO_11 *usr,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL sam_io_user_info11(char *desc,  SAM_USER_INFO_11 *usr, prs_struct *ps, int depth)
+BOOL sam_io_user_info11(char *desc, SAM_USER_INFO_11 * usr, prs_struct * ps,
+			int depth)
 {
-	if (usr == NULL) return False;
+	if (usr == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_unknown_11");
 	depth++;
 
 	prs_align(ps);
 
-	prs_uint8s (False, "padding_0", ps, depth, usr->padding_0, sizeof(usr->padding_0)); 
+	prs_uint8s(False, "padding_0", ps, depth, usr->padding_0,
+		   sizeof(usr->padding_0));
+
+	smb_io_time("time", &(usr->expiry), ps, depth);
 
-	smb_io_time("time", &(usr->expiry), ps, depth); 
+	prs_uint8s(False, "padding_1", ps, depth, usr->padding_1,
+		   sizeof(usr->padding_1));
 
-	prs_uint8s (False, "padding_1", ps, depth, usr->padding_1, sizeof(usr->padding_1));
+	smb_io_unihdr("unihdr", &(usr->hdr_mach_acct), ps, depth);
+	prs_uint32("padding_2", ps, depth, &(usr->padding_2));
 
-	smb_io_unihdr ("unihdr", &(usr->hdr_mach_acct), ps, depth); 
-	prs_uint32(        "padding_2", ps, depth, &(usr->padding_2));
+	prs_uint32("ptr_1    ", ps, depth, &(usr->ptr_1));
+	prs_uint8s(False, "padding_3", ps, depth, usr->padding_3,
+		   sizeof(usr->padding_3));
+	prs_uint32("padding_4", ps, depth, &(usr->padding_4));
 
-	prs_uint32(        "ptr_1    ", ps, depth, &(usr->ptr_1    ));
-	prs_uint8s (False, "padding_3", ps, depth, usr->padding_3, sizeof(usr->padding_3));
-	prs_uint32(        "padding_4", ps, depth, &(usr->padding_4));
+	prs_uint32("ptr_2    ", ps, depth, &(usr->ptr_2));
+	prs_uint32("padding_5", ps, depth, &(usr->padding_5));
 
-	prs_uint32(        "ptr_2    ", ps, depth, &(usr->ptr_2    ));
-	prs_uint32(        "padding_5", ps, depth, &(usr->padding_5));
+	prs_uint32("ptr_3    ", ps, depth, &(usr->ptr_3));
+	prs_uint8s(False, "padding_6", ps, depth, usr->padding_6,
+		   sizeof(usr->padding_6));
 
-	prs_uint32(        "ptr_3    ", ps, depth, &(usr->ptr_3    ));
-	prs_uint8s (False, "padding_6", ps, depth, usr->padding_6, sizeof(usr->padding_6));
+	prs_uint32("rid_user ", ps, depth, &(usr->rid_user));
+	prs_uint32("rid_group", ps, depth, &(usr->rid_group));
+	prs_uint16("acct_ctrl", ps, depth, &(usr->acct_ctrl));
+	prs_uint16("unknown_3", ps, depth, &(usr->unknown_3));
+	prs_uint16("unknown_4", ps, depth, &(usr->unknown_4));
+	prs_uint16("unknown_5", ps, depth, &(usr->unknown_5));
 
-	prs_uint32(        "rid_user ", ps, depth, &(usr->rid_user ));
-	prs_uint32(        "rid_group", ps, depth, &(usr->rid_group));
-	prs_uint16(        "acct_ctrl", ps, depth, &(usr->acct_ctrl));
-	prs_uint16(        "unknown_3", ps, depth, &(usr->unknown_3));
-	prs_uint16(        "unknown_4", ps, depth, &(usr->unknown_4));
-	prs_uint16(        "unknown_5", ps, depth, &(usr->unknown_5));
+	prs_uint8s(False, "padding_7", ps, depth, usr->padding_7,
+		   sizeof(usr->padding_7));
+	prs_uint32("padding_8", ps, depth, &(usr->padding_8));
 
-	prs_uint8s (False, "padding_7", ps, depth, usr->padding_7, sizeof(usr->padding_7));
-	prs_uint32(        "padding_8", ps, depth, &(usr->padding_8));
-	
-	smb_io_unistr2("unistr2", &(usr->uni_mach_acct), True, ps, depth); 
+	smb_io_unistr2("unistr2", &(usr->uni_mach_acct), True, ps, depth);
 	prs_align(ps);
 
-	prs_uint8s (False, "padding_9", ps, depth, usr->padding_9, sizeof(usr->padding_9));
+	prs_uint8s(False, "padding_9", ps, depth, usr->padding_9,
+		   sizeof(usr->padding_9));
 
 	return True;
 }
@@ -4804,10 +5195,10 @@ BOOL sam_io_user_info11(char *desc,  SAM_USER_INFO_11 *usr, prs_struct *ps, int
  unknown_6 = 0x0000 04ec 
 
  *************************************************************************/
-BOOL make_sam_user_info24(SAM_USER_INFO_24 *usr,
-	const char newpass[516], uint16 passlen)
+BOOL make_sam_user_info24(SAM_USER_INFO_24 * usr,
+			  const char newpass[516], uint16 passlen)
 {
-	DEBUG(10,("make_sam_user_info24: passlen: %d\n", passlen));
+	DEBUG(10, ("make_sam_user_info24: passlen: %d\n", passlen));
 	memcpy(usr->pass, newpass, sizeof(usr->pass));
 	usr->unk_0 = passlen;
 
@@ -4817,17 +5208,20 @@ BOOL make_sam_user_info24(SAM_USER_INFO_24 *usr,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_user_info24(char *desc, SAM_USER_INFO_24 *usr, prs_struct *ps, int depth)
+static BOOL sam_io_user_info24(char *desc, SAM_USER_INFO_24 * usr,
+			       prs_struct * ps, int depth)
 {
-	if (usr == NULL) return False;
+	if (usr == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_user_info24");
 	depth++;
 
 	prs_align(ps);
-	
-	prs_uint8s (False, "password", ps, depth, usr->pass, sizeof(usr->pass));
-	prs_uint16("unk_0", ps, depth, &(usr->unk_0));      /* unknown */
+
+	prs_uint8s(False, "password", ps, depth, usr->pass,
+		   sizeof(usr->pass));
+	prs_uint16("unk_0", ps, depth, &(usr->unk_0));	/* unknown */
 	prs_align(ps);
 
 	return True;
@@ -4842,95 +5236,88 @@ static BOOL sam_io_user_info24(char *desc, SAM_USER_INFO_24 *usr, prs_struct *ps
  unknown_6 = 0x0000 04ec 
 
  *************************************************************************/
-BOOL make_sam_user_info23W(SAM_USER_INFO_23 *usr,
-
-	const NTTIME *logon_time, /* all zeros */
-	const NTTIME *logoff_time, /* all zeros */
-	const NTTIME *kickoff_time, /* all zeros */
-	const NTTIME *pass_last_set_time, /* all zeros */
-	const NTTIME *pass_can_change_time, /* all zeros */
-	const NTTIME *pass_must_change_time, /* all zeros */
-
-	const UNISTR2 *user_name, 
-	const UNISTR2 *full_name,
-	const UNISTR2 *home_dir,
-	const UNISTR2 *dir_drive,
-	const UNISTR2 *log_scr,
-	const UNISTR2 *prof_path,
-	const UNISTR2 *desc,
-	const UNISTR2 *wkstas,
-	const UNISTR2 *unk_str,
-	const UNISTR2 *mung_dial,
-
-	uint32 user_rid, /* 0x0000 0000 */
-	uint32 group_rid,
-	uint16 acb_info, 
-
-	uint32 unknown_3,
-	uint16 logon_divs,
-	LOGON_HRS *hrs,
-	uint32 unknown_5,
-	char newpass[516],
-	uint32 unknown_6)
-{
-	int len_user_name    = user_name != NULL ? user_name->uni_str_len : 0;
-	int len_full_name    = full_name != NULL ? full_name->uni_str_len : 0;
-	int len_home_dir     = home_dir  != NULL ? home_dir ->uni_str_len : 0;
-	int len_dir_drive    = dir_drive != NULL ? dir_drive->uni_str_len : 0;
-	int len_logon_script = log_scr   != NULL ? log_scr  ->uni_str_len : 0;
+BOOL make_sam_user_info23W(SAM_USER_INFO_23 * usr, const NTTIME * logon_time,	/* all zeros */
+			   const NTTIME * logoff_time,	/* all zeros */
+			   const NTTIME * kickoff_time,	/* all zeros */
+			   const NTTIME * pass_last_set_time,	/* all zeros */
+			   const NTTIME * pass_can_change_time,	/* all zeros */
+			   const NTTIME * pass_must_change_time,	/* all zeros */
+			   const UNISTR2 * user_name,
+			   const UNISTR2 * full_name,
+			   const UNISTR2 * home_dir,
+			   const UNISTR2 * dir_drive,
+			   const UNISTR2 * log_scr,
+			   const UNISTR2 * prof_path,
+			   const UNISTR2 * desc,
+			   const UNISTR2 * wkstas,
+			   const UNISTR2 * unk_str,
+			   const UNISTR2 * mung_dial, uint32 user_rid,	/* 0x0000 0000 */
+			   uint32 group_rid,
+			   uint16 acb_info,
+			   uint32 unknown_3,
+			   uint16 logon_divs,
+			   LOGON_HRS * hrs,
+			   uint32 unknown_5,
+			   char newpass[516], uint32 unknown_6)
+{
+	int len_user_name = user_name != NULL ? user_name->uni_str_len : 0;
+	int len_full_name = full_name != NULL ? full_name->uni_str_len : 0;
+	int len_home_dir = home_dir != NULL ? home_dir->uni_str_len : 0;
+	int len_dir_drive = dir_drive != NULL ? dir_drive->uni_str_len : 0;
+	int len_logon_script = log_scr != NULL ? log_scr->uni_str_len : 0;
 	int len_profile_path = prof_path != NULL ? prof_path->uni_str_len : 0;
-	int len_description  = desc      != NULL ? desc     ->uni_str_len : 0;
-	int len_workstations = wkstas    != NULL ? wkstas   ->uni_str_len : 0;
-	int len_unknown_str  = unk_str   != NULL ? unk_str  ->uni_str_len : 0;
-	int len_munged_dial  = mung_dial != NULL ? mung_dial->uni_str_len : 0;
-
-	usr->logon_time            = *logon_time; /* all zeros */
-	usr->logoff_time           = *logoff_time; /* all zeros */
-	usr->kickoff_time          = *kickoff_time; /* all zeros */
-	usr->pass_last_set_time    = *pass_last_set_time; /* all zeros */
-	usr->pass_can_change_time  = *pass_can_change_time; /* all zeros */
-	usr->pass_must_change_time = *pass_must_change_time; /* all zeros */
-
-	make_uni_hdr(&(usr->hdr_user_name   ), len_user_name   ); /* NULL */
-	make_uni_hdr(&(usr->hdr_full_name   ), len_full_name   );
-	make_uni_hdr(&(usr->hdr_home_dir    ), len_home_dir    );
-	make_uni_hdr(&(usr->hdr_dir_drive   ), len_dir_drive   );
+	int len_description = desc != NULL ? desc->uni_str_len : 0;
+	int len_workstations = wkstas != NULL ? wkstas->uni_str_len : 0;
+	int len_unknown_str = unk_str != NULL ? unk_str->uni_str_len : 0;
+	int len_munged_dial = mung_dial != NULL ? mung_dial->uni_str_len : 0;
+
+	usr->logon_time = *logon_time;	/* all zeros */
+	usr->logoff_time = *logoff_time;	/* all zeros */
+	usr->kickoff_time = *kickoff_time;	/* all zeros */
+	usr->pass_last_set_time = *pass_last_set_time;	/* all zeros */
+	usr->pass_can_change_time = *pass_can_change_time;	/* all zeros */
+	usr->pass_must_change_time = *pass_must_change_time;	/* all zeros */
+
+	make_uni_hdr(&(usr->hdr_user_name), len_user_name);	/* NULL */
+	make_uni_hdr(&(usr->hdr_full_name), len_full_name);
+	make_uni_hdr(&(usr->hdr_home_dir), len_home_dir);
+	make_uni_hdr(&(usr->hdr_dir_drive), len_dir_drive);
 	make_uni_hdr(&(usr->hdr_logon_script), len_logon_script);
 	make_uni_hdr(&(usr->hdr_profile_path), len_profile_path);
-	make_uni_hdr(&(usr->hdr_acct_desc   ), len_description );
+	make_uni_hdr(&(usr->hdr_acct_desc), len_description);
 	make_uni_hdr(&(usr->hdr_workstations), len_workstations);
-	make_uni_hdr(&(usr->hdr_unknown_str ), len_unknown_str );
-	make_uni_hdr(&(usr->hdr_munged_dial ), len_munged_dial );
+	make_uni_hdr(&(usr->hdr_unknown_str), len_unknown_str);
+	make_uni_hdr(&(usr->hdr_munged_dial), len_munged_dial);
 
 	bzero(usr->nt_pwd, sizeof(usr->nt_pwd));
 	bzero(usr->lm_pwd, sizeof(usr->lm_pwd));
 
-	usr->user_rid  = user_rid; /* 0x0000 0000 */
+	usr->user_rid = user_rid;	/* 0x0000 0000 */
 	usr->group_rid = group_rid;
 	usr->acb_info = acb_info;
-	usr->unknown_3 = unknown_3; /* 09f8 27fa */
+	usr->unknown_3 = unknown_3;	/* 09f8 27fa */
 
-	usr->logon_divs = logon_divs; /* should be 168 (hours/week) */
+	usr->logon_divs = logon_divs;	/* should be 168 (hours/week) */
 	usr->ptr_logon_hrs = hrs ? 1 : 0;
 
 	bzero(usr->padding1, sizeof(usr->padding1));
 
-	usr->unknown_5 = unknown_5; /* 0x0001 0000 */
+	usr->unknown_5 = unknown_5;	/* 0x0001 0000 */
 
 	memcpy(usr->pass, newpass, sizeof(usr->pass));
 
-	copy_unistr2(&(usr->uni_user_name   ), user_name);
-	copy_unistr2(&(usr->uni_full_name   ), full_name);
-	copy_unistr2(&(usr->uni_home_dir    ), home_dir );
-	copy_unistr2(&(usr->uni_dir_drive   ), dir_drive);
-	copy_unistr2(&(usr->uni_logon_script), log_scr  );
+	copy_unistr2(&(usr->uni_user_name), user_name);
+	copy_unistr2(&(usr->uni_full_name), full_name);
+	copy_unistr2(&(usr->uni_home_dir), home_dir);
+	copy_unistr2(&(usr->uni_dir_drive), dir_drive);
+	copy_unistr2(&(usr->uni_logon_script), log_scr);
 	copy_unistr2(&(usr->uni_profile_path), prof_path);
-	copy_unistr2(&(usr->uni_acct_desc   ), desc     );
-	copy_unistr2(&(usr->uni_workstations), wkstas   );
-	copy_unistr2(&(usr->uni_unknown_str ), unk_str  );
-	copy_unistr2(&(usr->uni_munged_dial ), mung_dial);
+	copy_unistr2(&(usr->uni_acct_desc), desc);
+	copy_unistr2(&(usr->uni_workstations), wkstas);
+	copy_unistr2(&(usr->uni_unknown_str), unk_str);
+	copy_unistr2(&(usr->uni_munged_dial), mung_dial);
 
-	usr->unknown_6 = unknown_6; /* 0x0000 04ec */
+	usr->unknown_6 = unknown_6;	/* 0x0000 04ec */
 	usr->padding4 = 0;
 
 	if (hrs)
@@ -4953,95 +5340,81 @@ BOOL make_sam_user_info23W(SAM_USER_INFO_23 *usr,
  unknown_6 = 0x0000 04ec 
 
  *************************************************************************/
-BOOL make_sam_user_info23A(SAM_USER_INFO_23 *usr,
-
-	NTTIME *logon_time, /* all zeros */
-	NTTIME *logoff_time, /* all zeros */
-	NTTIME *kickoff_time, /* all zeros */
-	NTTIME *pass_last_set_time, /* all zeros */
-	NTTIME *pass_can_change_time, /* all zeros */
-	NTTIME *pass_must_change_time, /* all zeros */
-
-	char *user_name, /* NULL */
-	char *full_name,
-	char *home_dir,
-	char *dir_drive,
-	char *log_scr,
-	char *prof_path,
-	char *desc,
-	char *wkstas,
-	char *unk_str,
-	char *mung_dial,
-
-	uint32 user_rid, /* 0x0000 0000 */
-	uint32 group_rid,
-	uint16 acb_info, 
-
-	uint32 unknown_3,
-	uint16 logon_divs,
-	LOGON_HRS *hrs,
-	uint32 unknown_5,
-	char newpass[516],
-	uint32 unknown_6)
-{
-	int len_user_name    = user_name != NULL ? strlen(user_name) : 0;
-	int len_full_name    = full_name != NULL ? strlen(full_name) : 0;
-	int len_home_dir     = home_dir  != NULL ? strlen(home_dir ) : 0;
-	int len_dir_drive    = dir_drive != NULL ? strlen(dir_drive) : 0;
-	int len_logon_script = log_scr   != NULL ? strlen(log_scr  ) : 0;
+BOOL make_sam_user_info23A(SAM_USER_INFO_23 * usr, NTTIME * logon_time,	/* all zeros */
+			   NTTIME * logoff_time,	/* all zeros */
+			   NTTIME * kickoff_time,	/* all zeros */
+			   NTTIME * pass_last_set_time,	/* all zeros */
+			   NTTIME * pass_can_change_time,	/* all zeros */
+			   NTTIME * pass_must_change_time,	/* all zeros */
+			   char *user_name,	/* NULL */
+			   char *full_name,
+			   char *home_dir, char *dir_drive, char *log_scr, char *prof_path, char *desc, char *wkstas, char *unk_str, char *mung_dial, uint32 user_rid,	/* 0x0000 0000 */
+			   uint32 group_rid,
+			   uint16 acb_info,
+			   uint32 unknown_3,
+			   uint16 logon_divs,
+			   LOGON_HRS * hrs,
+			   uint32 unknown_5,
+			   char newpass[516], uint32 unknown_6)
+{
+	int len_user_name = user_name != NULL ? strlen(user_name) : 0;
+	int len_full_name = full_name != NULL ? strlen(full_name) : 0;
+	int len_home_dir = home_dir != NULL ? strlen(home_dir) : 0;
+	int len_dir_drive = dir_drive != NULL ? strlen(dir_drive) : 0;
+	int len_logon_script = log_scr != NULL ? strlen(log_scr) : 0;
 	int len_profile_path = prof_path != NULL ? strlen(prof_path) : 0;
-	int len_description  = desc      != NULL ? strlen(desc     ) : 0;
-	int len_workstations = wkstas    != NULL ? strlen(wkstas   ) : 0;
-	int len_unknown_str  = unk_str   != NULL ? strlen(unk_str  ) : 0;
-	int len_munged_dial  = mung_dial != NULL ? strlen(mung_dial) : 0;
-
-	usr->logon_time            = *logon_time; /* all zeros */
-	usr->logoff_time           = *logoff_time; /* all zeros */
-	usr->kickoff_time          = *kickoff_time; /* all zeros */
-	usr->pass_last_set_time    = *pass_last_set_time; /* all zeros */
-	usr->pass_can_change_time  = *pass_can_change_time; /* all zeros */
-	usr->pass_must_change_time = *pass_must_change_time; /* all zeros */
-
-	make_uni_hdr(&(usr->hdr_user_name   ), len_user_name   ); /* NULL */
-	make_uni_hdr(&(usr->hdr_full_name   ), len_full_name   );
-	make_uni_hdr(&(usr->hdr_home_dir    ), len_home_dir    );
-	make_uni_hdr(&(usr->hdr_dir_drive   ), len_dir_drive   );
+	int len_description = desc != NULL ? strlen(desc) : 0;
+	int len_workstations = wkstas != NULL ? strlen(wkstas) : 0;
+	int len_unknown_str = unk_str != NULL ? strlen(unk_str) : 0;
+	int len_munged_dial = mung_dial != NULL ? strlen(mung_dial) : 0;
+
+	usr->logon_time = *logon_time;	/* all zeros */
+	usr->logoff_time = *logoff_time;	/* all zeros */
+	usr->kickoff_time = *kickoff_time;	/* all zeros */
+	usr->pass_last_set_time = *pass_last_set_time;	/* all zeros */
+	usr->pass_can_change_time = *pass_can_change_time;	/* all zeros */
+	usr->pass_must_change_time = *pass_must_change_time;	/* all zeros */
+
+	make_uni_hdr(&(usr->hdr_user_name), len_user_name);	/* NULL */
+	make_uni_hdr(&(usr->hdr_full_name), len_full_name);
+	make_uni_hdr(&(usr->hdr_home_dir), len_home_dir);
+	make_uni_hdr(&(usr->hdr_dir_drive), len_dir_drive);
 	make_uni_hdr(&(usr->hdr_logon_script), len_logon_script);
 	make_uni_hdr(&(usr->hdr_profile_path), len_profile_path);
-	make_uni_hdr(&(usr->hdr_acct_desc   ), len_description );
+	make_uni_hdr(&(usr->hdr_acct_desc), len_description);
 	make_uni_hdr(&(usr->hdr_workstations), len_workstations);
-	make_uni_hdr(&(usr->hdr_unknown_str ), len_unknown_str );
-	make_uni_hdr(&(usr->hdr_munged_dial ), len_munged_dial );
+	make_uni_hdr(&(usr->hdr_unknown_str), len_unknown_str);
+	make_uni_hdr(&(usr->hdr_munged_dial), len_munged_dial);
 
 	bzero(usr->nt_pwd, sizeof(usr->nt_pwd));
 	bzero(usr->lm_pwd, sizeof(usr->lm_pwd));
 
-	usr->user_rid  = user_rid; /* 0x0000 0000 */
+	usr->user_rid = user_rid;	/* 0x0000 0000 */
 	usr->group_rid = group_rid;
 	usr->acb_info = acb_info;
-	usr->unknown_3 = unknown_3; /* 09f8 27fa */
+	usr->unknown_3 = unknown_3;	/* 09f8 27fa */
 
-	usr->logon_divs = logon_divs; /* should be 168 (hours/week) */
+	usr->logon_divs = logon_divs;	/* should be 168 (hours/week) */
 	usr->ptr_logon_hrs = hrs ? 1 : 0;
 
 	bzero(usr->padding1, sizeof(usr->padding1));
 
-	usr->unknown_5 = unknown_5; /* 0x0001 0000 */
+	usr->unknown_5 = unknown_5;	/* 0x0001 0000 */
 
 	memcpy(usr->pass, newpass, sizeof(usr->pass));
 
-	make_unistr2(&(usr->uni_user_name   ), user_name   , len_user_name   ); /* NULL */
-	make_unistr2(&(usr->uni_full_name   ), full_name   , len_full_name   );
-	make_unistr2(&(usr->uni_home_dir    ), home_dir    , len_home_dir    );
-	make_unistr2(&(usr->uni_dir_drive   ), dir_drive   , len_dir_drive   );
+	make_unistr2(&(usr->uni_user_name), user_name, len_user_name);	/* NULL */
+	make_unistr2(&(usr->uni_full_name), full_name, len_full_name);
+	make_unistr2(&(usr->uni_home_dir), home_dir, len_home_dir);
+	make_unistr2(&(usr->uni_dir_drive), dir_drive, len_dir_drive);
 	make_unistr2(&(usr->uni_logon_script), log_scr, len_logon_script);
 	make_unistr2(&(usr->uni_profile_path), prof_path, len_profile_path);
-	make_unistr2(&(usr->uni_acct_desc ), desc , len_description );
+	make_unistr2(&(usr->uni_acct_desc), desc, len_description);
 	make_unistr2(&(usr->uni_workstations), wkstas, len_workstations);
-	make_unistr2(&(usr->uni_unknown_str ), unk_str , len_unknown_str );
-	make_unistr2(&(usr->uni_munged_dial ), mung_dial , len_munged_dial );
+	make_unistr2(&(usr->uni_unknown_str), unk_str, len_unknown_str);
+	make_unistr2(&(usr->uni_munged_dial), mung_dial, len_munged_dial);
 
-	usr->unknown_6 = unknown_6; /* 0x0000 04ec */
+	usr->unknown_6 = unknown_6;	/* 0x0000 04ec */
 	usr->padding4 = 0;
 
 	if (hrs)
@@ -5059,79 +5432,98 @@ BOOL make_sam_user_info23A(SAM_USER_INFO_23 *usr,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-static BOOL sam_io_user_info23(char *desc,  SAM_USER_INFO_23 *usr, prs_struct *ps, int depth)
+static BOOL sam_io_user_info23(char *desc, SAM_USER_INFO_23 * usr,
+			       prs_struct * ps, int depth)
 {
-	if (usr == NULL) return False;
+	if (usr == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_user_info23");
 	depth++;
 
 	prs_align(ps);
-	
-	smb_io_time("logon_time           ", &(usr->logon_time)           , ps, depth);
-	smb_io_time("logoff_time          ", &(usr->logoff_time)          , ps, depth); 
-	smb_io_time("kickoff_time         ", &(usr->kickoff_time)         , ps, depth); 
-	smb_io_time("pass_last_set_time   ", &(usr->pass_last_set_time)   , ps, depth); 
-	smb_io_time("pass_can_change_time ", &(usr->pass_can_change_time) , ps, depth); 
-	smb_io_time("pass_must_change_time", &(usr->pass_must_change_time), ps, depth); 
 
-	smb_io_unihdr("hdr_user_name   ", &(usr->hdr_user_name)   , ps, depth); /* username unicode string header */
-	smb_io_unihdr("hdr_full_name   ", &(usr->hdr_full_name)   , ps, depth); /* user's full name unicode string header */
-	smb_io_unihdr("hdr_home_dir    ", &(usr->hdr_home_dir)    , ps, depth); /* home directory unicode string header */
-	smb_io_unihdr("hdr_dir_drive   ", &(usr->hdr_dir_drive)   , ps, depth); /* home directory drive */
-	smb_io_unihdr("hdr_logon_script", &(usr->hdr_logon_script), ps, depth); /* logon script unicode string header */
-	smb_io_unihdr("hdr_profile_path", &(usr->hdr_profile_path), ps, depth); /* profile path unicode string header */
-	smb_io_unihdr("hdr_acct_desc   ", &(usr->hdr_acct_desc  ) , ps, depth); /* account desc */
-	smb_io_unihdr("hdr_workstations", &(usr->hdr_workstations), ps, depth); /* wkstas user can log on from */
-	smb_io_unihdr("hdr_unknown_str ", &(usr->hdr_unknown_str ), ps, depth); /* unknown string */
-	smb_io_unihdr("hdr_munged_dial ", &(usr->hdr_munged_dial ), ps, depth); /* wkstas user can log on from */
+	smb_io_time("logon_time           ", &(usr->logon_time), ps, depth);
+	smb_io_time("logoff_time          ", &(usr->logoff_time), ps, depth);
+	smb_io_time("kickoff_time         ", &(usr->kickoff_time), ps, depth);
+	smb_io_time("pass_last_set_time   ", &(usr->pass_last_set_time), ps,
+		    depth);
+	smb_io_time("pass_can_change_time ", &(usr->pass_can_change_time), ps,
+		    depth);
+	smb_io_time("pass_must_change_time", &(usr->pass_must_change_time),
+		    ps, depth);
+
+	smb_io_unihdr("hdr_user_name   ", &(usr->hdr_user_name), ps, depth);	/* username unicode string header */
+	smb_io_unihdr("hdr_full_name   ", &(usr->hdr_full_name), ps, depth);	/* user's full name unicode string header */
+	smb_io_unihdr("hdr_home_dir    ", &(usr->hdr_home_dir), ps, depth);	/* home directory unicode string header */
+	smb_io_unihdr("hdr_dir_drive   ", &(usr->hdr_dir_drive), ps, depth);	/* home directory drive */
+	smb_io_unihdr("hdr_logon_script", &(usr->hdr_logon_script), ps, depth);	/* logon script unicode string header */
+	smb_io_unihdr("hdr_profile_path", &(usr->hdr_profile_path), ps, depth);	/* profile path unicode string header */
+	smb_io_unihdr("hdr_acct_desc   ", &(usr->hdr_acct_desc), ps, depth);	/* account desc */
+	smb_io_unihdr("hdr_workstations", &(usr->hdr_workstations), ps, depth);	/* wkstas user can log on from */
+	smb_io_unihdr("hdr_unknown_str ", &(usr->hdr_unknown_str), ps, depth);	/* unknown string */
+	smb_io_unihdr("hdr_munged_dial ", &(usr->hdr_munged_dial), ps, depth);	/* wkstas user can log on from */
 
-	prs_uint8s (False, "lm_pwd        ", ps, depth, usr->lm_pwd   , sizeof(usr->lm_pwd   ));
-	prs_uint8s (False, "nt_pwd        ", ps, depth, usr->nt_pwd   , sizeof(usr->nt_pwd   ));
+	prs_uint8s(False, "lm_pwd        ", ps, depth, usr->lm_pwd,
+		   sizeof(usr->lm_pwd));
+	prs_uint8s(False, "nt_pwd        ", ps, depth, usr->nt_pwd,
+		   sizeof(usr->nt_pwd));
 
-	prs_uint32("user_rid      ", ps, depth, &(usr->user_rid     ));       /* User ID */
-	prs_uint32("group_rid     ", ps, depth, &(usr->group_rid    ));      /* Group ID */
-	prs_uint16("acb_info      ", ps, depth, &(usr->acb_info     ));      /* Group ID */
+	prs_uint32("user_rid      ", ps, depth, &(usr->user_rid));	/* User ID */
+	prs_uint32("group_rid     ", ps, depth, &(usr->group_rid));	/* Group ID */
+	prs_uint16("acb_info      ", ps, depth, &(usr->acb_info));	/* Group ID */
 	prs_align(ps);
 
-	prs_uint32("unknown_3     ", ps, depth, &(usr->unknown_3    ));
-	prs_uint16("logon_divs    ", ps, depth, &(usr->logon_divs   ));     /* logon divisions per week */
+	prs_uint32("unknown_3     ", ps, depth, &(usr->unknown_3));
+	prs_uint16("logon_divs    ", ps, depth, &(usr->logon_divs));	/* logon divisions per week */
 	prs_align(ps);
 	prs_uint32("ptr_logon_hrs ", ps, depth, &(usr->ptr_logon_hrs));
-	prs_uint8s (False, "padding1      ", ps, depth, usr->padding1, sizeof(usr->padding1));
-	prs_uint32("unknown_5     ", ps, depth, &(usr->unknown_5    ));
+	prs_uint8s(False, "padding1      ", ps, depth, usr->padding1,
+		   sizeof(usr->padding1));
+	prs_uint32("unknown_5     ", ps, depth, &(usr->unknown_5));
 
-	prs_uint8s (False, "password      ", ps, depth, usr->pass, sizeof(usr->pass));
+	prs_uint8s(False, "password      ", ps, depth, usr->pass,
+		   sizeof(usr->pass));
 
 	/* here begins pointed-to data */
 
-	smb_io_unistr2("uni_user_name   ", &(usr->uni_user_name)   , usr->hdr_user_name   .buffer, ps, depth); /* username unicode string */
+	smb_io_unistr2("uni_user_name   ", &(usr->uni_user_name),
+		       usr->hdr_user_name.buffer, ps, depth);	/* username unicode string */
 	prs_align(ps);
-	smb_io_unistr2("uni_full_name   ", &(usr->uni_full_name)   , usr->hdr_full_name   .buffer, ps, depth); /* user's full name unicode string */
+	smb_io_unistr2("uni_full_name   ", &(usr->uni_full_name),
+		       usr->hdr_full_name.buffer, ps, depth);	/* user's full name unicode string */
 	prs_align(ps);
-	smb_io_unistr2("uni_home_dir    ", &(usr->uni_home_dir)    , usr->hdr_home_dir    .buffer, ps, depth); /* home directory unicode string */
+	smb_io_unistr2("uni_home_dir    ", &(usr->uni_home_dir),
+		       usr->hdr_home_dir.buffer, ps, depth);	/* home directory unicode string */
 	prs_align(ps);
-	smb_io_unistr2("uni_dir_drive   ", &(usr->uni_dir_drive)   , usr->hdr_dir_drive   .buffer, ps, depth); /* home directory drive unicode string */
+	smb_io_unistr2("uni_dir_drive   ", &(usr->uni_dir_drive),
+		       usr->hdr_dir_drive.buffer, ps, depth);	/* home directory drive unicode string */
 	prs_align(ps);
-	smb_io_unistr2("uni_logon_script", &(usr->uni_logon_script), usr->hdr_logon_script.buffer, ps, depth); /* logon script unicode string */
+	smb_io_unistr2("uni_logon_script", &(usr->uni_logon_script),
+		       usr->hdr_logon_script.buffer, ps, depth);	/* logon script unicode string */
 	prs_align(ps);
-	smb_io_unistr2("uni_profile_path", &(usr->uni_profile_path), usr->hdr_profile_path.buffer, ps, depth); /* profile path unicode string */
+	smb_io_unistr2("uni_profile_path", &(usr->uni_profile_path),
+		       usr->hdr_profile_path.buffer, ps, depth);	/* profile path unicode string */
 	prs_align(ps);
-	smb_io_unistr2("uni_acct_desc   ", &(usr->uni_acct_desc   ), usr->hdr_acct_desc   .buffer, ps, depth); /* user desc unicode string */
+	smb_io_unistr2("uni_acct_desc   ", &(usr->uni_acct_desc),
+		       usr->hdr_acct_desc.buffer, ps, depth);	/* user desc unicode string */
 	prs_align(ps);
-	smb_io_unistr2("uni_workstations", &(usr->uni_workstations), usr->hdr_workstations.buffer, ps, depth); /* worksations user can log on from */
+	smb_io_unistr2("uni_workstations", &(usr->uni_workstations),
+		       usr->hdr_workstations.buffer, ps, depth);	/* worksations user can log on from */
 	prs_align(ps);
-	smb_io_unistr2("uni_unknown_str ", &(usr->uni_unknown_str ), usr->hdr_unknown_str .buffer, ps, depth); /* unknown string */
+	smb_io_unistr2("uni_unknown_str ", &(usr->uni_unknown_str),
+		       usr->hdr_unknown_str.buffer, ps, depth);	/* unknown string */
 	prs_align(ps);
-	smb_io_unistr2("uni_munged_dial ", &(usr->uni_munged_dial ), usr->hdr_munged_dial .buffer, ps, depth); /* worksations user can log on from */
+	smb_io_unistr2("uni_munged_dial ", &(usr->uni_munged_dial),
+		       usr->hdr_munged_dial.buffer, ps, depth);	/* worksations user can log on from */
 	prs_align(ps);
 
-	prs_uint32("unknown_6     ", ps, depth, &(usr->unknown_6  ));
-	prs_uint32("padding4      ", ps, depth, &(usr->padding4   ));
+	prs_uint32("unknown_6     ", ps, depth, &(usr->unknown_6));
+	prs_uint32("padding4      ", ps, depth, &(usr->padding4));
 
 	if (usr->ptr_logon_hrs)
 	{
-		sam_io_logon_hrs("logon_hrs", &(usr->logon_hrs)   , ps, depth);
+		sam_io_logon_hrs("logon_hrs", &(usr->logon_hrs), ps, depth);
 		prs_align(ps);
 	}
 
@@ -5147,67 +5539,61 @@ static BOOL sam_io_user_info23(char *desc,  SAM_USER_INFO_23 *usr, prs_struct *p
  unknown_6 = 0x0000 04ec 
 
  *************************************************************************/
-BOOL make_sam_user_info21W(SAM_USER_INFO_21 *usr,
-
-	const NTTIME *logon_time,
-	const NTTIME *logoff_time,
-	const NTTIME *kickoff_time,
-	const NTTIME *pass_last_set_time,
-	const NTTIME *pass_can_change_time,
-	const NTTIME *pass_must_change_time,
-
-	const UNISTR2 *user_name, 
-	const UNISTR2 *full_name,
-	const UNISTR2 *home_dir,
-	const UNISTR2 *dir_drive,
-	const UNISTR2 *log_scr,
-	const UNISTR2 *prof_path,
-	const UNISTR2 *desc,
-	const UNISTR2 *wkstas,
-	const UNISTR2 *unk_str,
-	const UNISTR2 *mung_dial,
-
-	const uchar lm_pwd[16],
-	const uchar nt_pwd[16],
-
-	uint32 user_rid,
-	uint32 group_rid,
-	uint16 acb_info, 
-
-	uint32 unknown_3,
-	uint16 logon_divs,
-	const LOGON_HRS *hrs,
-	uint32 unknown_5,
-	uint32 unknown_6)
-{
-	int len_user_name    = user_name != NULL ? user_name->uni_str_len : 0;
-	int len_full_name    = full_name != NULL ? full_name->uni_str_len : 0;
-	int len_home_dir     = home_dir  != NULL ? home_dir ->uni_str_len : 0;
-	int len_dir_drive    = dir_drive != NULL ? dir_drive->uni_str_len : 0;
-	int len_logon_script = log_scr   != NULL ? log_scr  ->uni_str_len : 0;
+BOOL make_sam_user_info21W(SAM_USER_INFO_21 * usr,
+			   const NTTIME * logon_time,
+			   const NTTIME * logoff_time,
+			   const NTTIME * kickoff_time,
+			   const NTTIME * pass_last_set_time,
+			   const NTTIME * pass_can_change_time,
+			   const NTTIME * pass_must_change_time,
+			   const UNISTR2 * user_name,
+			   const UNISTR2 * full_name,
+			   const UNISTR2 * home_dir,
+			   const UNISTR2 * dir_drive,
+			   const UNISTR2 * log_scr,
+			   const UNISTR2 * prof_path,
+			   const UNISTR2 * desc,
+			   const UNISTR2 * wkstas,
+			   const UNISTR2 * unk_str,
+			   const UNISTR2 * mung_dial,
+			   const uchar lm_pwd[16],
+			   const uchar nt_pwd[16],
+			   uint32 user_rid,
+			   uint32 group_rid,
+			   uint16 acb_info,
+			   uint32 unknown_3,
+			   uint16 logon_divs,
+			   const LOGON_HRS * hrs,
+			   uint32 unknown_5, uint32 unknown_6)
+{
+	int len_user_name = user_name != NULL ? user_name->uni_str_len : 0;
+	int len_full_name = full_name != NULL ? full_name->uni_str_len : 0;
+	int len_home_dir = home_dir != NULL ? home_dir->uni_str_len : 0;
+	int len_dir_drive = dir_drive != NULL ? dir_drive->uni_str_len : 0;
+	int len_logon_script = log_scr != NULL ? log_scr->uni_str_len : 0;
 	int len_profile_path = prof_path != NULL ? prof_path->uni_str_len : 0;
-	int len_description  = desc      != NULL ? desc     ->uni_str_len : 0;
-	int len_workstations = wkstas    != NULL ? wkstas   ->uni_str_len : 0;
-	int len_unknown_str  = unk_str   != NULL ? unk_str  ->uni_str_len : 0;
-	int len_munged_dial  = mung_dial != NULL ? mung_dial->uni_str_len : 0;
-
-	usr->logon_time            = *logon_time;
-	usr->logoff_time           = *logoff_time;
-	usr->kickoff_time          = *kickoff_time;
-	usr->pass_last_set_time    = *pass_last_set_time;
-	usr->pass_can_change_time  = *pass_can_change_time;
+	int len_description = desc != NULL ? desc->uni_str_len : 0;
+	int len_workstations = wkstas != NULL ? wkstas->uni_str_len : 0;
+	int len_unknown_str = unk_str != NULL ? unk_str->uni_str_len : 0;
+	int len_munged_dial = mung_dial != NULL ? mung_dial->uni_str_len : 0;
+
+	usr->logon_time = *logon_time;
+	usr->logoff_time = *logoff_time;
+	usr->kickoff_time = *kickoff_time;
+	usr->pass_last_set_time = *pass_last_set_time;
+	usr->pass_can_change_time = *pass_can_change_time;
 	usr->pass_must_change_time = *pass_must_change_time;
 
-	make_uni_hdr(&(usr->hdr_user_name   ), len_user_name   );
-	make_uni_hdr(&(usr->hdr_full_name   ), len_full_name   );
-	make_uni_hdr(&(usr->hdr_home_dir    ), len_home_dir    );
-	make_uni_hdr(&(usr->hdr_dir_drive   ), len_dir_drive   );
+	make_uni_hdr(&(usr->hdr_user_name), len_user_name);
+	make_uni_hdr(&(usr->hdr_full_name), len_full_name);
+	make_uni_hdr(&(usr->hdr_home_dir), len_home_dir);
+	make_uni_hdr(&(usr->hdr_dir_drive), len_dir_drive);
 	make_uni_hdr(&(usr->hdr_logon_script), len_logon_script);
 	make_uni_hdr(&(usr->hdr_profile_path), len_profile_path);
-	make_uni_hdr(&(usr->hdr_acct_desc   ), len_description );
+	make_uni_hdr(&(usr->hdr_acct_desc), len_description);
 	make_uni_hdr(&(usr->hdr_workstations), len_workstations);
-	make_uni_hdr(&(usr->hdr_unknown_str ), len_unknown_str );
-	make_uni_hdr(&(usr->hdr_munged_dial ), len_munged_dial );
+	make_uni_hdr(&(usr->hdr_unknown_str), len_unknown_str);
+	make_uni_hdr(&(usr->hdr_munged_dial), len_munged_dial);
 
 	if (lm_pwd == NULL)
 	{
@@ -5226,29 +5612,29 @@ BOOL make_sam_user_info21W(SAM_USER_INFO_21 *usr,
 		memcpy(usr->nt_pwd, nt_pwd, sizeof(usr->nt_pwd));
 	}
 
-	usr->user_rid  = user_rid;
+	usr->user_rid = user_rid;
 	usr->group_rid = group_rid;
 	usr->acb_info = acb_info;
-	usr->unknown_3 = unknown_3; /* 0x00ff ffff */
+	usr->unknown_3 = unknown_3;	/* 0x00ff ffff */
 
-	usr->logon_divs = logon_divs; /* should be 168 (hours/week) */
+	usr->logon_divs = logon_divs;	/* should be 168 (hours/week) */
 	usr->ptr_logon_hrs = hrs ? 1 : 0;
-	usr->unknown_5 = unknown_5; /* 0x0002 0000 */
+	usr->unknown_5 = unknown_5;	/* 0x0002 0000 */
 
 	bzero(usr->padding1, sizeof(usr->padding1));
 
-	copy_unistr2(&(usr->uni_user_name   ), user_name);
-	copy_unistr2(&(usr->uni_full_name   ), full_name);
-	copy_unistr2(&(usr->uni_home_dir    ), home_dir );
-	copy_unistr2(&(usr->uni_dir_drive   ), dir_drive);
-	copy_unistr2(&(usr->uni_logon_script), log_scr  );
+	copy_unistr2(&(usr->uni_user_name), user_name);
+	copy_unistr2(&(usr->uni_full_name), full_name);
+	copy_unistr2(&(usr->uni_home_dir), home_dir);
+	copy_unistr2(&(usr->uni_dir_drive), dir_drive);
+	copy_unistr2(&(usr->uni_logon_script), log_scr);
 	copy_unistr2(&(usr->uni_profile_path), prof_path);
-	copy_unistr2(&(usr->uni_acct_desc   ), desc     );
-	copy_unistr2(&(usr->uni_workstations), wkstas   );
-	copy_unistr2(&(usr->uni_unknown_str ), unk_str  );
-	copy_unistr2(&(usr->uni_munged_dial ), mung_dial);
+	copy_unistr2(&(usr->uni_acct_desc), desc);
+	copy_unistr2(&(usr->uni_workstations), wkstas);
+	copy_unistr2(&(usr->uni_unknown_str), unk_str);
+	copy_unistr2(&(usr->uni_munged_dial), mung_dial);
 
-	usr->unknown_6 = unknown_6; /* 0x0000 04ec */
+	usr->unknown_6 = unknown_6;	/* 0x0000 04ec */
 	usr->padding4 = 0;
 
 	if (hrs)
@@ -5271,91 +5657,86 @@ BOOL make_sam_user_info21W(SAM_USER_INFO_21 *usr,
  unknown_6 = 0x0000 04ec 
 
  *************************************************************************/
-BOOL make_sam_user_info21A(SAM_USER_INFO_21 *usr,
-
-	NTTIME *logon_time,
-	NTTIME *logoff_time,
-	NTTIME *kickoff_time,
-	NTTIME *pass_last_set_time,
-	NTTIME *pass_can_change_time,
-	NTTIME *pass_must_change_time,
-
-	char *user_name,
-	char *full_name,
-	char *home_dir,
-	char *dir_drive,
-	char *log_scr,
-	char *prof_path,
-	char *desc,
-	char *wkstas,
-	char *unk_str,
-	char *mung_dial,
-
-	uint32 user_rid,
-	uint32 group_rid,
-	uint16 acb_info, 
-
-	uint32 unknown_3,
-	uint16 logon_divs,
-	LOGON_HRS *hrs,
-	uint32 unknown_5,
-	uint32 unknown_6)
-{
-	int len_user_name    = user_name != NULL ? strlen(user_name) : 0;
-	int len_full_name    = full_name != NULL ? strlen(full_name) : 0;
-	int len_home_dir     = home_dir  != NULL ? strlen(home_dir ) : 0;
-	int len_dir_drive    = dir_drive != NULL ? strlen(dir_drive) : 0;
-	int len_logon_script = log_scr   != NULL ? strlen(log_scr  ) : 0;
+BOOL make_sam_user_info21A(SAM_USER_INFO_21 * usr,
+			   NTTIME * logon_time,
+			   NTTIME * logoff_time,
+			   NTTIME * kickoff_time,
+			   NTTIME * pass_last_set_time,
+			   NTTIME * pass_can_change_time,
+			   NTTIME * pass_must_change_time,
+			   char *user_name,
+			   char *full_name,
+			   char *home_dir,
+			   char *dir_drive,
+			   char *log_scr,
+			   char *prof_path,
+			   char *desc,
+			   char *wkstas,
+			   char *unk_str,
+			   char *mung_dial,
+			   uint32 user_rid,
+			   uint32 group_rid,
+			   uint16 acb_info,
+			   uint32 unknown_3,
+			   uint16 logon_divs,
+			   LOGON_HRS * hrs,
+			   uint32 unknown_5, uint32 unknown_6)
+{
+	int len_user_name = user_name != NULL ? strlen(user_name) : 0;
+	int len_full_name = full_name != NULL ? strlen(full_name) : 0;
+	int len_home_dir = home_dir != NULL ? strlen(home_dir) : 0;
+	int len_dir_drive = dir_drive != NULL ? strlen(dir_drive) : 0;
+	int len_logon_script = log_scr != NULL ? strlen(log_scr) : 0;
 	int len_profile_path = prof_path != NULL ? strlen(prof_path) : 0;
-	int len_description  = desc      != NULL ? strlen(desc     ) : 0;
-	int len_workstations = wkstas    != NULL ? strlen(wkstas   ) : 0;
-	int len_unknown_str  = unk_str   != NULL ? strlen(unk_str  ) : 0;
-	int len_munged_dial  = mung_dial != NULL ? strlen(mung_dial) : 0;
-
-	usr->logon_time            = *logon_time;
-	usr->logoff_time           = *logoff_time;
-	usr->kickoff_time          = *kickoff_time;
-	usr->pass_last_set_time    = *pass_last_set_time;
-	usr->pass_can_change_time  = *pass_can_change_time;
+	int len_description = desc != NULL ? strlen(desc) : 0;
+	int len_workstations = wkstas != NULL ? strlen(wkstas) : 0;
+	int len_unknown_str = unk_str != NULL ? strlen(unk_str) : 0;
+	int len_munged_dial = mung_dial != NULL ? strlen(mung_dial) : 0;
+
+	usr->logon_time = *logon_time;
+	usr->logoff_time = *logoff_time;
+	usr->kickoff_time = *kickoff_time;
+	usr->pass_last_set_time = *pass_last_set_time;
+	usr->pass_can_change_time = *pass_can_change_time;
 	usr->pass_must_change_time = *pass_must_change_time;
 
-	make_uni_hdr(&(usr->hdr_user_name   ), len_user_name   );
-	make_uni_hdr(&(usr->hdr_full_name   ), len_full_name   );
-	make_uni_hdr(&(usr->hdr_home_dir    ), len_home_dir    );
-	make_uni_hdr(&(usr->hdr_dir_drive   ), len_dir_drive   );
+	make_uni_hdr(&(usr->hdr_user_name), len_user_name);
+	make_uni_hdr(&(usr->hdr_full_name), len_full_name);
+	make_uni_hdr(&(usr->hdr_home_dir), len_home_dir);
+	make_uni_hdr(&(usr->hdr_dir_drive), len_dir_drive);
 	make_uni_hdr(&(usr->hdr_logon_script), len_logon_script);
 	make_uni_hdr(&(usr->hdr_profile_path), len_profile_path);
-	make_uni_hdr(&(usr->hdr_acct_desc   ), len_description );
+	make_uni_hdr(&(usr->hdr_acct_desc), len_description);
 	make_uni_hdr(&(usr->hdr_workstations), len_workstations);
-	make_uni_hdr(&(usr->hdr_unknown_str ), len_unknown_str );
-	make_uni_hdr(&(usr->hdr_munged_dial ), len_munged_dial );
+	make_uni_hdr(&(usr->hdr_unknown_str), len_unknown_str);
+	make_uni_hdr(&(usr->hdr_munged_dial), len_munged_dial);
 
 	bzero(usr->nt_pwd, sizeof(usr->nt_pwd));
 	bzero(usr->lm_pwd, sizeof(usr->lm_pwd));
 
-	usr->user_rid  = user_rid;
+	usr->user_rid = user_rid;
 	usr->group_rid = group_rid;
 	usr->acb_info = acb_info;
-	usr->unknown_3 = unknown_3; /* 0x00ff ffff */
+	usr->unknown_3 = unknown_3;	/* 0x00ff ffff */
 
-	usr->logon_divs = logon_divs; /* should be 168 (hours/week) */
+	usr->logon_divs = logon_divs;	/* should be 168 (hours/week) */
 	usr->ptr_logon_hrs = hrs ? 1 : 0;
-	usr->unknown_5 = unknown_5; /* 0x0002 0000 */
+	usr->unknown_5 = unknown_5;	/* 0x0002 0000 */
 
 	bzero(usr->padding1, sizeof(usr->padding1));
 
-	make_unistr2(&(usr->uni_user_name   ), user_name   , len_user_name   );
-	make_unistr2(&(usr->uni_full_name   ), full_name   , len_full_name   );
-	make_unistr2(&(usr->uni_home_dir    ), home_dir    , len_home_dir    );
-	make_unistr2(&(usr->uni_dir_drive   ), dir_drive   , len_dir_drive   );
+	make_unistr2(&(usr->uni_user_name), user_name, len_user_name);
+	make_unistr2(&(usr->uni_full_name), full_name, len_full_name);
+	make_unistr2(&(usr->uni_home_dir), home_dir, len_home_dir);
+	make_unistr2(&(usr->uni_dir_drive), dir_drive, len_dir_drive);
 	make_unistr2(&(usr->uni_logon_script), log_scr, len_logon_script);
 	make_unistr2(&(usr->uni_profile_path), prof_path, len_profile_path);
-	make_unistr2(&(usr->uni_acct_desc ), desc , len_description );
+	make_unistr2(&(usr->uni_acct_desc), desc, len_description);
 	make_unistr2(&(usr->uni_workstations), wkstas, len_workstations);
-	make_unistr2(&(usr->uni_unknown_str ), unk_str , len_unknown_str );
-	make_unistr2(&(usr->uni_munged_dial ), mung_dial , len_munged_dial );
+	make_unistr2(&(usr->uni_unknown_str), unk_str, len_unknown_str);
+	make_unistr2(&(usr->uni_munged_dial), mung_dial, len_munged_dial);
 
-	usr->unknown_6 = unknown_6; /* 0x0000 04ec */
+	usr->unknown_6 = unknown_6;	/* 0x0000 04ec */
 	usr->padding4 = 0;
 
 	if (hrs)
@@ -5374,78 +5755,96 @@ BOOL make_sam_user_info21A(SAM_USER_INFO_21 *usr,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL sam_io_user_info21(char *desc,  SAM_USER_INFO_21 *usr, prs_struct *ps, int depth)
+BOOL sam_io_user_info21(char *desc, SAM_USER_INFO_21 * usr, prs_struct * ps,
+			int depth)
 {
-	if (usr == NULL) return False;
+	if (usr == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "sam_io_user_info21");
 	depth++;
 
 	prs_align(ps);
-	
-	smb_io_time("logon_time           ", &(usr->logon_time)           , ps, depth);
-	smb_io_time("logoff_time          ", &(usr->logoff_time)          , ps, depth); 
-	smb_io_time("kickoff_time         ", &(usr->kickoff_time)         , ps, depth); 
-	smb_io_time("pass_last_set_time   ", &(usr->pass_last_set_time)   , ps, depth); 
-	smb_io_time("pass_can_change_time ", &(usr->pass_can_change_time) , ps, depth); 
-	smb_io_time("pass_must_change_time", &(usr->pass_must_change_time), ps, depth); 
 
-	smb_io_unihdr("hdr_user_name   ", &(usr->hdr_user_name)   , ps, depth); /* username unicode string header */
-	smb_io_unihdr("hdr_full_name   ", &(usr->hdr_full_name)   , ps, depth); /* user's full name unicode string header */
-	smb_io_unihdr("hdr_home_dir    ", &(usr->hdr_home_dir)    , ps, depth); /* home directory unicode string header */
-	smb_io_unihdr("hdr_dir_drive   ", &(usr->hdr_dir_drive)   , ps, depth); /* home directory drive */
-	smb_io_unihdr("hdr_logon_script", &(usr->hdr_logon_script), ps, depth); /* logon script unicode string header */
-	smb_io_unihdr("hdr_profile_path", &(usr->hdr_profile_path), ps, depth); /* profile path unicode string header */
-	smb_io_unihdr("hdr_acct_desc   ", &(usr->hdr_acct_desc  ) , ps, depth); /* account desc */
-	smb_io_unihdr("hdr_workstations", &(usr->hdr_workstations), ps, depth); /* wkstas user can log on from */
-	smb_io_unihdr("hdr_unknown_str ", &(usr->hdr_unknown_str ), ps, depth); /* unknown string */
-	smb_io_unihdr("hdr_munged_dial ", &(usr->hdr_munged_dial ), ps, depth); /* wkstas user can log on from */
+	smb_io_time("logon_time           ", &(usr->logon_time), ps, depth);
+	smb_io_time("logoff_time          ", &(usr->logoff_time), ps, depth);
+	smb_io_time("kickoff_time         ", &(usr->kickoff_time), ps, depth);
+	smb_io_time("pass_last_set_time   ", &(usr->pass_last_set_time), ps,
+		    depth);
+	smb_io_time("pass_can_change_time ", &(usr->pass_can_change_time), ps,
+		    depth);
+	smb_io_time("pass_must_change_time", &(usr->pass_must_change_time),
+		    ps, depth);
+
+	smb_io_unihdr("hdr_user_name   ", &(usr->hdr_user_name), ps, depth);	/* username unicode string header */
+	smb_io_unihdr("hdr_full_name   ", &(usr->hdr_full_name), ps, depth);	/* user's full name unicode string header */
+	smb_io_unihdr("hdr_home_dir    ", &(usr->hdr_home_dir), ps, depth);	/* home directory unicode string header */
+	smb_io_unihdr("hdr_dir_drive   ", &(usr->hdr_dir_drive), ps, depth);	/* home directory drive */
+	smb_io_unihdr("hdr_logon_script", &(usr->hdr_logon_script), ps, depth);	/* logon script unicode string header */
+	smb_io_unihdr("hdr_profile_path", &(usr->hdr_profile_path), ps, depth);	/* profile path unicode string header */
+	smb_io_unihdr("hdr_acct_desc   ", &(usr->hdr_acct_desc), ps, depth);	/* account desc */
+	smb_io_unihdr("hdr_workstations", &(usr->hdr_workstations), ps, depth);	/* wkstas user can log on from */
+	smb_io_unihdr("hdr_unknown_str ", &(usr->hdr_unknown_str), ps, depth);	/* unknown string */
+	smb_io_unihdr("hdr_munged_dial ", &(usr->hdr_munged_dial), ps, depth);	/* wkstas user can log on from */
 
-	prs_uint8s (False, "lm_pwd        ", ps, depth, usr->lm_pwd   , sizeof(usr->lm_pwd   ));
-	prs_uint8s (False, "nt_pwd        ", ps, depth, usr->nt_pwd   , sizeof(usr->nt_pwd   ));
+	prs_uint8s(False, "lm_pwd        ", ps, depth, usr->lm_pwd,
+		   sizeof(usr->lm_pwd));
+	prs_uint8s(False, "nt_pwd        ", ps, depth, usr->nt_pwd,
+		   sizeof(usr->nt_pwd));
 
-	prs_uint32("user_rid      ", ps, depth, &(usr->user_rid     ));       /* User ID */
-	prs_uint32("group_rid     ", ps, depth, &(usr->group_rid    ));      /* Group ID */
-	prs_uint16("acb_info      ", ps, depth, &(usr->acb_info     ));      /* Group ID */
+	prs_uint32("user_rid      ", ps, depth, &(usr->user_rid));	/* User ID */
+	prs_uint32("group_rid     ", ps, depth, &(usr->group_rid));	/* Group ID */
+	prs_uint16("acb_info      ", ps, depth, &(usr->acb_info));	/* Group ID */
 	prs_align(ps);
 
-	prs_uint32("unknown_3     ", ps, depth, &(usr->unknown_3    ));
-	prs_uint16("logon_divs    ", ps, depth, &(usr->logon_divs   ));     /* logon divisions per week */
+	prs_uint32("unknown_3     ", ps, depth, &(usr->unknown_3));
+	prs_uint16("logon_divs    ", ps, depth, &(usr->logon_divs));	/* logon divisions per week */
 	prs_align(ps);
 	prs_uint32("ptr_logon_hrs ", ps, depth, &(usr->ptr_logon_hrs));
-	prs_uint32("unknown_5     ", ps, depth, &(usr->unknown_5    ));
+	prs_uint32("unknown_5     ", ps, depth, &(usr->unknown_5));
 
-	prs_uint8s (False, "padding1      ", ps, depth, usr->padding1, sizeof(usr->padding1));
+	prs_uint8s(False, "padding1      ", ps, depth, usr->padding1,
+		   sizeof(usr->padding1));
 
 	/* here begins pointed-to data */
 
-	smb_io_unistr2("uni_user_name   ", &(usr->uni_user_name)   , usr->hdr_user_name   .buffer, ps, depth); /* username unicode string */
+	smb_io_unistr2("uni_user_name   ", &(usr->uni_user_name),
+		       usr->hdr_user_name.buffer, ps, depth);	/* username unicode string */
 	prs_align(ps);
-	smb_io_unistr2("uni_full_name   ", &(usr->uni_full_name)   , usr->hdr_full_name   .buffer, ps, depth); /* user's full name unicode string */
+	smb_io_unistr2("uni_full_name   ", &(usr->uni_full_name),
+		       usr->hdr_full_name.buffer, ps, depth);	/* user's full name unicode string */
 	prs_align(ps);
-	smb_io_unistr2("uni_home_dir    ", &(usr->uni_home_dir)    , usr->hdr_home_dir    .buffer, ps, depth); /* home directory unicode string */
+	smb_io_unistr2("uni_home_dir    ", &(usr->uni_home_dir),
+		       usr->hdr_home_dir.buffer, ps, depth);	/* home directory unicode string */
 	prs_align(ps);
-	smb_io_unistr2("uni_dir_drive   ", &(usr->uni_dir_drive)   , usr->hdr_dir_drive   .buffer, ps, depth); /* home directory drive unicode string */
+	smb_io_unistr2("uni_dir_drive   ", &(usr->uni_dir_drive),
+		       usr->hdr_dir_drive.buffer, ps, depth);	/* home directory drive unicode string */
 	prs_align(ps);
-	smb_io_unistr2("uni_logon_script", &(usr->uni_logon_script), usr->hdr_logon_script.buffer, ps, depth); /* logon script unicode string */
+	smb_io_unistr2("uni_logon_script", &(usr->uni_logon_script),
+		       usr->hdr_logon_script.buffer, ps, depth);	/* logon script unicode string */
 	prs_align(ps);
-	smb_io_unistr2("uni_profile_path", &(usr->uni_profile_path), usr->hdr_profile_path.buffer, ps, depth); /* profile path unicode string */
+	smb_io_unistr2("uni_profile_path", &(usr->uni_profile_path),
+		       usr->hdr_profile_path.buffer, ps, depth);	/* profile path unicode string */
 	prs_align(ps);
-	smb_io_unistr2("uni_acct_desc   ", &(usr->uni_acct_desc   ), usr->hdr_acct_desc   .buffer, ps, depth); /* user desc unicode string */
+	smb_io_unistr2("uni_acct_desc   ", &(usr->uni_acct_desc),
+		       usr->hdr_acct_desc.buffer, ps, depth);	/* user desc unicode string */
 	prs_align(ps);
-	smb_io_unistr2("uni_workstations", &(usr->uni_workstations), usr->hdr_workstations.buffer, ps, depth); /* worksations user can log on from */
+	smb_io_unistr2("uni_workstations", &(usr->uni_workstations),
+		       usr->hdr_workstations.buffer, ps, depth);	/* worksations user can log on from */
 	prs_align(ps);
-	smb_io_unistr2("uni_unknown_str ", &(usr->uni_unknown_str ), usr->hdr_unknown_str .buffer, ps, depth); /* unknown string */
+	smb_io_unistr2("uni_unknown_str ", &(usr->uni_unknown_str),
+		       usr->hdr_unknown_str.buffer, ps, depth);	/* unknown string */
 	prs_align(ps);
-	smb_io_unistr2("uni_munged_dial ", &(usr->uni_munged_dial ), usr->hdr_munged_dial .buffer, ps, depth); /* worksations user can log on from */
+	smb_io_unistr2("uni_munged_dial ", &(usr->uni_munged_dial),
+		       usr->hdr_munged_dial.buffer, ps, depth);	/* worksations user can log on from */
 	prs_align(ps);
 
-	prs_uint32("unknown_6     ", ps, depth, &(usr->unknown_6  ));
-	prs_uint32("padding4      ", ps, depth, &(usr->padding4   ));
+	prs_uint32("unknown_6     ", ps, depth, &(usr->unknown_6));
+	prs_uint32("padding4      ", ps, depth, &(usr->padding4));
 
 	if (usr->ptr_logon_hrs)
 	{
-		sam_io_logon_hrs("logon_hrs", &(usr->logon_hrs)   , ps, depth);
+		sam_io_logon_hrs("logon_hrs", &(usr->logon_hrs), ps, depth);
 		prs_align(ps);
 	}
 
@@ -5455,28 +5854,32 @@ BOOL sam_io_user_info21(char *desc,  SAM_USER_INFO_21 *usr, prs_struct *ps, int
 /*******************************************************************
 makes a SAM_USERINFO_CTR structure.
 ********************************************************************/
-uint32 make_samr_userinfo_ctr_usr21(SAM_USERINFO_CTR *ctr,
-				uint16 switch_value,
-				const SAM_USER_INFO_21 *usr)
+uint32 make_samr_userinfo_ctr_usr21(SAM_USERINFO_CTR * ctr,
+				    uint16 switch_value,
+				    const SAM_USER_INFO_21 * usr)
 {
-	if (ctr == NULL || usr == NULL) return NT_STATUS_INVALID_PARAMETER;
+	if (ctr == NULL || usr == NULL)
+		return NT_STATUS_INVALID_PARAMETER;
 
-	DEBUG(5,("make_samr_userinfo_ctr\n"));
+	DEBUG(5, ("make_samr_userinfo_ctr\n"));
 
-	ctr->switch_value  = switch_value;
+	ctr->switch_value = switch_value;
 	ctr->info.id = NULL;
 
 	switch (switch_value)
 	{
 		case 0x10:
 		{
-			ctr->info.id = (SAM_USER_INFO_10*)Realloc(NULL,
-					 sizeof(*ctr->info.id10));
+			ctr->info.id = (SAM_USER_INFO_10 *) Realloc(NULL,
+								    sizeof
+								    (*ctr->
+								     info.
+								     id10));
 			if (ctr->info.id == NULL)
 			{
 				return NT_STATUS_NO_MEMORY;
 			}
-			make_sam_user_info10(ctr->info.id10, usr->acb_info); 
+			make_sam_user_info10(ctr->info.id10, usr->acb_info);
 			break;
 		}
 #if 0
@@ -5484,40 +5887,46 @@ uint32 make_samr_userinfo_ctr_usr21(SAM_USERINFO_CTR *ctr,
 		case 0x11:
 		{
 			NTTIME expire;
-			info = (void*)&id11;
-			
-			expire.low  = 0xffffffff;
+			info = (void *)&id11;
+
+			expire.low = 0xffffffff;
 			expire.high = 0x7fffffff;
 
-			ctr->info.id = (SAM_USER_INFO_11*)Realloc(NULL,
-					 sizeof(*ctr->info.id11));
+			ctr->info.id = (SAM_USER_INFO_11 *) Realloc(NULL,
+								    sizeof
+								    (*ctr->
+								     info.
+								     id11));
 			make_sam_user_info11(ctr->info.id11, &expire,
-					     "BROOKFIELDS$", /* name */
-					     0x03ef, /* user rid */
-					     0x201, /* group rid */
-					     0x0080); /* acb info */
+					     "BROOKFIELDS$",	/* name */
+					     0x03ef,	/* user rid */
+					     0x201,	/* group rid */
+					     0x0080);	/* acb info */
 
 			break;
 		}
 #endif
 		case 0x12:
 		{
-			ctr->info.id = (SAM_USER_INFO_12*)Realloc(NULL,
-					 sizeof(*ctr->info.id12));
+			ctr->info.id = (SAM_USER_INFO_12 *) Realloc(NULL,
+								    sizeof
+								    (*ctr->
+								     info.
+								     id12));
 			if (ctr->info.id == NULL)
 			{
 				return NT_STATUS_NO_MEMORY;
 			}
 			make_sam_user_info12(ctr->info.id12,
-			                     usr->acb_info,
-			                     usr->lm_pwd, usr->nt_pwd); 
+					     usr->acb_info,
+					     usr->lm_pwd, usr->nt_pwd);
 			break;
 		}
 		case 21:
 		{
 			SAM_USER_INFO_21 *cusr;
-			cusr = (SAM_USER_INFO_21*)Realloc(NULL,
-					 sizeof(*cusr));
+			cusr = (SAM_USER_INFO_21 *) Realloc(NULL,
+							    sizeof(*cusr));
 			ctr->info.id = cusr;
 			if (ctr->info.id == NULL)
 			{
@@ -5530,7 +5939,8 @@ uint32 make_samr_userinfo_ctr_usr21(SAM_USERINFO_CTR *ctr,
 		}
 		default:
 		{
-			DEBUG(4,("make_samr_userinfo_ctr: unsupported info\n"));
+			DEBUG(4,
+			      ("make_samr_userinfo_ctr: unsupported info\n"));
 			return NT_STATUS_INVALID_INFO_CLASS;
 		}
 	}
@@ -5541,14 +5951,15 @@ uint32 make_samr_userinfo_ctr_usr21(SAM_USERINFO_CTR *ctr,
 /*******************************************************************
 makes a SAM_USERINFO_CTR structure.
 ********************************************************************/
-BOOL make_samr_userinfo_ctr(SAM_USERINFO_CTR *ctr, const uchar *sess_key,
-				uint16 switch_value, void *info)
+BOOL make_samr_userinfo_ctr(SAM_USERINFO_CTR * ctr, const uchar * sess_key,
+			    uint16 switch_value, void *info)
 {
-	if (ctr == NULL) return False;
+	if (ctr == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_userinfo_ctr\n"));
+	DEBUG(5, ("make_samr_userinfo_ctr\n"));
 
-	ctr->switch_value  = switch_value;
+	ctr->switch_value = switch_value;
 	ctr->info.id = info;
 
 	switch (switch_value)
@@ -5569,7 +5980,8 @@ BOOL make_samr_userinfo_ctr(SAM_USERINFO_CTR *ctr, const uchar *sess_key,
 		}
 		default:
 		{
-			DEBUG(4,("make_samr_userinfo_ctr: unsupported switch level\n"));
+			DEBUG(4,
+			      ("make_samr_userinfo_ctr: unsupported switch level\n"));
 			return False;
 		}
 	}
@@ -5580,9 +5992,11 @@ BOOL make_samr_userinfo_ctr(SAM_USERINFO_CTR *ctr, const uchar *sess_key,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_userinfo_ctr(char *desc,  SAM_USERINFO_CTR *ctr, prs_struct *ps, int depth)
+BOOL samr_io_userinfo_ctr(char *desc, SAM_USERINFO_CTR * ctr, prs_struct * ps,
+			  int depth)
 {
-	if (ctr == NULL) return False;
+	if (ctr == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_userinfo_ctr");
 	depth++;
@@ -5597,16 +6011,22 @@ BOOL samr_io_userinfo_ctr(char *desc,  SAM_USERINFO_CTR *ctr, prs_struct *ps, in
 			if (ps->io)
 			{
 				/* reading */
-				ctr->info.id = (SAM_USER_INFO_10*)Realloc(NULL,
-						 sizeof(*ctr->info.id10));
+				ctr->info.id =
+					(SAM_USER_INFO_10 *) Realloc(NULL,
+								     sizeof
+								     (*ctr->
+								      info.
+								      id10));
 			}
 			if (ctr->info.id10 != NULL)
 			{
-				sam_io_user_info10("", ctr->info.id10, ps, depth);
+				sam_io_user_info10("", ctr->info.id10, ps,
+						   depth);
 			}
 			else
 			{
-				DEBUG(2,("samr_io_userinfo_ctr: info pointer not initialised\n"));
+				DEBUG(2,
+				      ("samr_io_userinfo_ctr: info pointer not initialised\n"));
 				return False;
 			}
 			break;
@@ -5616,16 +6036,22 @@ BOOL samr_io_userinfo_ctr(char *desc,  SAM_USERINFO_CTR *ctr, prs_struct *ps, in
 			if (ps->io)
 			{
 				/* reading */
-				ctr->info.id = (SAM_USER_INFO_11*)Realloc(NULL,
-						 sizeof(*ctr->info.id11));
+				ctr->info.id =
+					(SAM_USER_INFO_11 *) Realloc(NULL,
+								     sizeof
+								     (*ctr->
+								      info.
+								      id11));
 			}
 			if (ctr->info.id11 != NULL)
 			{
-				sam_io_user_info11("", ctr->info.id11, ps, depth);
+				sam_io_user_info11("", ctr->info.id11, ps,
+						   depth);
 			}
 			else
 			{
-				DEBUG(2,("samr_io_userinfo_ctr: info pointer not initialised\n"));
+				DEBUG(2,
+				      ("samr_io_userinfo_ctr: info pointer not initialised\n"));
 				return False;
 			}
 			break;
@@ -5635,16 +6061,22 @@ BOOL samr_io_userinfo_ctr(char *desc,  SAM_USERINFO_CTR *ctr, prs_struct *ps, in
 			if (ps->io)
 			{
 				/* reading */
-				ctr->info.id = (SAM_USER_INFO_12*)Realloc(NULL,
-						 sizeof(*ctr->info.id12));
+				ctr->info.id =
+					(SAM_USER_INFO_12 *) Realloc(NULL,
+								     sizeof
+								     (*ctr->
+								      info.
+								      id12));
 			}
 			if (ctr->info.id12 != NULL)
 			{
-				sam_io_user_info12("", ctr->info.id12, ps, depth);
+				sam_io_user_info12("", ctr->info.id12, ps,
+						   depth);
 			}
 			else
 			{
-				DEBUG(2,("samr_io_userinfo_ctr: info pointer not initialised\n"));
+				DEBUG(2,
+				      ("samr_io_userinfo_ctr: info pointer not initialised\n"));
 				return False;
 			}
 			break;
@@ -5654,16 +6086,22 @@ BOOL samr_io_userinfo_ctr(char *desc,  SAM_USERINFO_CTR *ctr, prs_struct *ps, in
 			if (ps->io)
 			{
 				/* reading */
-				ctr->info.id = (SAM_USER_INFO_21*)Realloc(NULL,
-						 sizeof(*ctr->info.id21));
+				ctr->info.id =
+					(SAM_USER_INFO_21 *) Realloc(NULL,
+								     sizeof
+								     (*ctr->
+								      info.
+								      id21));
 			}
 			if (ctr->info.id21 != NULL)
 			{
-				sam_io_user_info21("", ctr->info.id21, ps, depth);
+				sam_io_user_info21("", ctr->info.id21, ps,
+						   depth);
 			}
 			else
 			{
-				DEBUG(2,("samr_io_userinfo_ctr: info pointer not initialised\n"));
+				DEBUG(2,
+				      ("samr_io_userinfo_ctr: info pointer not initialised\n"));
 				return False;
 			}
 			break;
@@ -5673,16 +6111,22 @@ BOOL samr_io_userinfo_ctr(char *desc,  SAM_USERINFO_CTR *ctr, prs_struct *ps, in
 			if (ps->io)
 			{
 				/* reading */
-				ctr->info.id = (SAM_USER_INFO_23*)Realloc(NULL,
-						 sizeof(*ctr->info.id23));
+				ctr->info.id =
+					(SAM_USER_INFO_23 *) Realloc(NULL,
+								     sizeof
+								     (*ctr->
+								      info.
+								      id23));
 			}
 			if (ctr->info.id23 != NULL)
 			{
-				sam_io_user_info23("", ctr->info.id23, ps, depth);
+				sam_io_user_info23("", ctr->info.id23, ps,
+						   depth);
 			}
 			else
 			{
-				DEBUG(2,("samr_io_userinfo_ctr: info pointer not initialised\n"));
+				DEBUG(2,
+				      ("samr_io_userinfo_ctr: info pointer not initialised\n"));
 				return False;
 			}
 			break;
@@ -5692,26 +6136,33 @@ BOOL samr_io_userinfo_ctr(char *desc,  SAM_USERINFO_CTR *ctr, prs_struct *ps, in
 			if (ps->io)
 			{
 				/* reading */
-				ctr->info.id = (SAM_USER_INFO_24*)Realloc(NULL,
-						 sizeof(*ctr->info.id24));
+				ctr->info.id =
+					(SAM_USER_INFO_24 *) Realloc(NULL,
+								     sizeof
+								     (*ctr->
+								      info.
+								      id24));
 			}
 			if (ctr->info.id24 != NULL)
 			{
-				sam_io_user_info24("", ctr->info.id24, ps, depth);
+				sam_io_user_info24("", ctr->info.id24, ps,
+						   depth);
 			}
 			else
 			{
-				DEBUG(2,("samr_io_userinfo_ctr: info pointer not initialised\n"));
+				DEBUG(2,
+				      ("samr_io_userinfo_ctr: info pointer not initialised\n"));
 				return False;
 			}
 			break;
 		}
 		default:
 		{
-			DEBUG(2,("samr_io_userinfo_ctr: unknown switch level\n"));
+			DEBUG(2,
+			      ("samr_io_userinfo_ctr: unknown switch level\n"));
 			break;
 		}
-			
+
 	}
 
 	prs_align(ps);
@@ -5722,7 +6173,7 @@ BOOL samr_io_userinfo_ctr(char *desc,  SAM_USERINFO_CTR *ctr, prs_struct *ps, in
 /*******************************************************************
 frees a structure.
 ********************************************************************/
-void free_samr_userinfo_ctr(SAM_USERINFO_CTR *ctr)
+void free_samr_userinfo_ctr(SAM_USERINFO_CTR * ctr)
 {
 	if (ctr->info.id == NULL)
 	{
@@ -5735,13 +6186,13 @@ void free_samr_userinfo_ctr(SAM_USERINFO_CTR *ctr)
 /*******************************************************************
 makes a SAMR_R_QUERY_USERINFO structure.
 ********************************************************************/
-BOOL make_samr_r_query_userinfo(SAMR_R_QUERY_USERINFO *r_u,
-				SAM_USERINFO_CTR *ctr, uint32 status)
-				
+BOOL make_samr_r_query_userinfo(SAMR_R_QUERY_USERINFO * r_u,
+				SAM_USERINFO_CTR * ctr, uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_query_userinfo\n"));
+	DEBUG(5, ("make_samr_r_query_userinfo\n"));
 
 	r_u->ptr = 0;
 	r_u->ctr = NULL;
@@ -5752,7 +6203,7 @@ BOOL make_samr_r_query_userinfo(SAMR_R_QUERY_USERINFO *r_u,
 		r_u->ctr = ctr;
 	}
 
-	r_u->status = status;         /* return status */
+	r_u->status = status;	/* return status */
 
 	return True;
 }
@@ -5760,9 +6211,11 @@ BOOL make_samr_r_query_userinfo(SAMR_R_QUERY_USERINFO *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_query_userinfo(char *desc,  SAMR_R_QUERY_USERINFO *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_query_userinfo(char *desc, SAMR_R_QUERY_USERINFO * r_u,
+			      prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_query_userinfo");
 	depth++;
@@ -5792,21 +6245,23 @@ BOOL samr_io_r_query_userinfo(char *desc,  SAMR_R_QUERY_USERINFO *r_u, prs_struc
 /*******************************************************************
 makes a SAMR_Q_SET_USERINFO structure.
 ********************************************************************/
-BOOL make_samr_q_set_userinfo(SAMR_Q_SET_USERINFO *q_u,
-				POLICY_HND *hnd,
-				uint16 switch_value, void *info)
+BOOL make_samr_q_set_userinfo(SAMR_Q_SET_USERINFO * q_u,
+			      POLICY_HND * hnd,
+			      uint16 switch_value, void *info)
 {
 	uchar sess_key[16];
-	if (q_u == NULL || hnd == NULL) return False;
+	if (q_u == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_set_userinfo\n"));
+	DEBUG(5, ("make_samr_q_set_userinfo\n"));
 
 	memcpy(&(q_u->pol), hnd, sizeof(q_u->pol));
 	q_u->switch_value = switch_value;
 
 	if (!cli_get_usr_sesskey(hnd, sess_key))
 	{
-		DEBUG(0,("make_samr_set_userinfo: could not obtain session key\n"));
+		DEBUG(0,
+		      ("make_samr_set_userinfo: could not obtain session key\n"));
 		return False;
 	}
 	if (!make_samr_userinfo_ctr(q_u->ctr, sess_key, switch_value, info))
@@ -5821,16 +6276,18 @@ BOOL make_samr_q_set_userinfo(SAMR_Q_SET_USERINFO *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_set_userinfo(char *desc, SAMR_Q_SET_USERINFO *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_set_userinfo(char *desc, SAMR_Q_SET_USERINFO * q_u,
+			    prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_set_userinfo");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint16("switch_value", ps, depth, &(q_u->switch_value));
@@ -5848,7 +6305,7 @@ BOOL samr_io_q_set_userinfo(char *desc, SAMR_Q_SET_USERINFO *q_u, prs_struct *ps
 /*******************************************************************
 frees a structure.
 ********************************************************************/
-void free_samr_q_set_userinfo(SAMR_Q_SET_USERINFO *q_u)
+void free_samr_q_set_userinfo(SAMR_Q_SET_USERINFO * q_u)
 {
 	free_samr_userinfo_ctr(q_u->ctr);
 }
@@ -5856,14 +6313,14 @@ void free_samr_q_set_userinfo(SAMR_Q_SET_USERINFO *q_u)
 /*******************************************************************
 makes a SAMR_R_SET_USERINFO structure.
 ********************************************************************/
-BOOL make_samr_r_set_userinfo(SAMR_R_SET_USERINFO *r_u, uint32 status)
-				
+BOOL make_samr_r_set_userinfo(SAMR_R_SET_USERINFO * r_u, uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_set_userinfo\n"));
+	DEBUG(5, ("make_samr_r_set_userinfo\n"));
 
-	r_u->status = status;         /* return status */
+	r_u->status = status;	/* return status */
 
 	return True;
 }
@@ -5871,9 +6328,11 @@ BOOL make_samr_r_set_userinfo(SAMR_R_SET_USERINFO *r_u, uint32 status)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_set_userinfo(char *desc,  SAMR_R_SET_USERINFO *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_set_userinfo(char *desc, SAMR_R_SET_USERINFO * r_u,
+			    prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_set_userinfo");
 	depth++;
@@ -5889,19 +6348,19 @@ BOOL samr_io_r_set_userinfo(char *desc,  SAMR_R_SET_USERINFO *r_u, prs_struct *p
 /*******************************************************************
 makes a SAMR_Q_SET_USERINFO2 structure.
 ********************************************************************/
-BOOL make_samr_q_set_userinfo2(SAMR_Q_SET_USERINFO2 *q_u,
-				POLICY_HND *hnd,
-				uint16 switch_value, 
-				SAM_USERINFO_CTR *ctr)
+BOOL make_samr_q_set_userinfo2(SAMR_Q_SET_USERINFO2 * q_u,
+			       POLICY_HND * hnd,
+			       uint16 switch_value, SAM_USERINFO_CTR * ctr)
 {
 	uint8 usr_sess_key[16];
 
-	if (q_u == NULL || hnd == NULL) return False;
+	if (q_u == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_set_userinfo2\n"));
+	DEBUG(5, ("make_samr_q_set_userinfo2\n"));
 
 	memcpy(&(q_u->pol), hnd, sizeof(q_u->pol));
-	q_u->switch_value  = switch_value;
+	q_u->switch_value = switch_value;
 	q_u->ctr = ctr;
 
 	if (q_u->ctr != NULL)
@@ -5911,7 +6370,8 @@ BOOL make_samr_q_set_userinfo2(SAMR_Q_SET_USERINFO2 *q_u,
 
 	if (!cli_get_usr_sesskey(hnd, usr_sess_key))
 	{
-		DEBUG(0,("make_samr_set_userinfo: could not obtain session key\n"));
+		DEBUG(0,
+		      ("make_samr_set_userinfo: could not obtain session key\n"));
 		return False;
 	}
 
@@ -5935,19 +6395,21 @@ BOOL make_samr_q_set_userinfo2(SAMR_Q_SET_USERINFO2 *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_set_userinfo2(char *desc, SAMR_Q_SET_USERINFO2 *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_set_userinfo2(char *desc, SAMR_Q_SET_USERINFO2 * q_u,
+			     prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_set_userinfo2");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth); 
+	smb_io_pol_hnd("pol", &(q_u->pol), ps, depth);
 	prs_align(ps);
 
-	prs_uint16("switch_value ", ps, depth, &(q_u->switch_value )); 
+	prs_uint16("switch_value ", ps, depth, &(q_u->switch_value));
 	samr_io_userinfo_ctr("ctr", q_u->ctr, ps, depth);
 
 	if (!ps->io)
@@ -5962,7 +6424,7 @@ BOOL samr_io_q_set_userinfo2(char *desc, SAMR_Q_SET_USERINFO2 *q_u, prs_struct *
 /*******************************************************************
 frees a structure.
 ********************************************************************/
-void free_samr_q_set_userinfo2(SAMR_Q_SET_USERINFO2 *q_u)
+void free_samr_q_set_userinfo2(SAMR_Q_SET_USERINFO2 * q_u)
 {
 	free_samr_userinfo_ctr(q_u->ctr);
 }
@@ -5970,14 +6432,14 @@ void free_samr_q_set_userinfo2(SAMR_Q_SET_USERINFO2 *q_u)
 /*******************************************************************
 makes a SAMR_R_SET_USERINFO2 structure.
 ********************************************************************/
-BOOL make_samr_r_set_userinfo2(SAMR_R_SET_USERINFO2 *r_u,
-				uint32 status)
+BOOL make_samr_r_set_userinfo2(SAMR_R_SET_USERINFO2 * r_u, uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_r_set_userinfo2\n"));
+	DEBUG(5, ("make_samr_r_set_userinfo2\n"));
 
-	r_u->status = status;         /* return status */
+	r_u->status = status;	/* return status */
 
 	return True;
 }
@@ -5985,9 +6447,11 @@ BOOL make_samr_r_set_userinfo2(SAMR_R_SET_USERINFO2 *r_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_set_userinfo2(char *desc,  SAMR_R_SET_USERINFO2 *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_set_userinfo2(char *desc, SAMR_R_SET_USERINFO2 * r_u,
+			     prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_set_userinfo2");
 	depth++;
@@ -6002,21 +6466,22 @@ BOOL samr_io_r_set_userinfo2(char *desc,  SAMR_R_SET_USERINFO2 *r_u, prs_struct
 /*******************************************************************
 makes a SAMR_Q_CONNECT structure.
 ********************************************************************/
-BOOL make_samr_q_connect(SAMR_Q_CONNECT *q_u,
-				const char *srv_name, uint32 access_mask)
+BOOL make_samr_q_connect(SAMR_Q_CONNECT * q_u,
+			 const char *srv_name, uint32 access_mask)
 {
 	int len_srv_name = strlen(srv_name);
 
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_connect\n"));
+	DEBUG(5, ("make_samr_q_connect\n"));
 
 	/* make PDC server name \\server */
-	q_u->ptr_srv_name = len_srv_name > 0 ? 1 : 0; 
-	make_unistr2(&(q_u->uni_srv_name), srv_name, len_srv_name+1);  
+	q_u->ptr_srv_name = len_srv_name > 0 ? 1 : 0;
+	make_unistr2(&(q_u->uni_srv_name), srv_name, len_srv_name + 1);
 
 	/* example values: 0x0000 0002 */
-	q_u->access_mask = access_mask; 
+	q_u->access_mask = access_mask;
 
 	return True;
 }
@@ -6025,9 +6490,11 @@ BOOL make_samr_q_connect(SAMR_Q_CONNECT *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_connect(char *desc,  SAMR_Q_CONNECT *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_connect(char *desc, SAMR_Q_CONNECT * q_u, prs_struct * ps,
+		       int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_connect");
 	depth++;
@@ -6035,7 +6502,8 @@ BOOL samr_io_q_connect(char *desc,  SAMR_Q_CONNECT *q_u, prs_struct *ps, int dep
 	prs_align(ps);
 
 	prs_uint32("ptr_srv_name", ps, depth, &(q_u->ptr_srv_name));
-	smb_io_unistr2("", &(q_u->uni_srv_name), q_u->ptr_srv_name, ps, depth); 
+	smb_io_unistr2("", &(q_u->uni_srv_name), q_u->ptr_srv_name, ps,
+		       depth);
 
 	prs_align(ps);
 
@@ -6047,16 +6515,18 @@ BOOL samr_io_q_connect(char *desc,  SAMR_Q_CONNECT *q_u, prs_struct *ps, int dep
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_connect(char *desc,  SAMR_R_CONNECT *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_connect(char *desc, SAMR_R_CONNECT * r_u, prs_struct * ps,
+		       int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_connect");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("connect_pol", &(r_u->connect_pol), ps, depth); 
+	smb_io_pol_hnd("connect_pol", &(r_u->connect_pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("status", ps, depth, &(r_u->status));
@@ -6067,14 +6537,15 @@ BOOL samr_io_r_connect(char *desc,  SAMR_R_CONNECT *r_u, prs_struct *ps, int dep
 /*******************************************************************
 makes a SAMR_Q_CONNECT_ANON structure.
 ********************************************************************/
-BOOL make_samr_q_connect_anon(SAMR_Q_CONNECT_ANON *q_u)
+BOOL make_samr_q_connect_anon(SAMR_Q_CONNECT_ANON * q_u)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_connect_anon\n"));
+	DEBUG(5, ("make_samr_q_connect_anon\n"));
 
-	q_u->ptr       = 1;
-	q_u->unknown_0 = 0x5c; /* server name (?!!) */
+	q_u->ptr = 1;
+	q_u->unknown_0 = 0x5c;	/* server name (?!!) */
 	q_u->unknown_1 = 0x01;
 	q_u->access_mask = 0x20;
 
@@ -6085,16 +6556,18 @@ BOOL make_samr_q_connect_anon(SAMR_Q_CONNECT_ANON *q_u)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_connect_anon(char *desc,  SAMR_Q_CONNECT_ANON *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_connect_anon(char *desc, SAMR_Q_CONNECT_ANON * q_u,
+			    prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_connect_anon");
 	depth++;
 
 	prs_align(ps);
 
-	prs_uint32("ptr      ", ps, depth, &(q_u->ptr      ));
+	prs_uint32("ptr      ", ps, depth, &(q_u->ptr));
 	prs_uint16("unknown_0", ps, depth, &(q_u->unknown_0));
 	prs_uint16("unknown_1", ps, depth, &(q_u->unknown_1));
 	prs_uint32("access_mask", ps, depth, &(q_u->access_mask));
@@ -6105,16 +6578,18 @@ BOOL samr_io_q_connect_anon(char *desc,  SAMR_Q_CONNECT_ANON *q_u, prs_struct *p
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_connect_anon(char *desc,  SAMR_R_CONNECT_ANON *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_connect_anon(char *desc, SAMR_R_CONNECT_ANON * r_u,
+			    prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_connect_anon");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("connect_pol", &(r_u->connect_pol), ps, depth); 
+	smb_io_pol_hnd("connect_pol", &(r_u->connect_pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("status", ps, depth, &(r_u->status));
@@ -6125,17 +6600,19 @@ BOOL samr_io_r_connect_anon(char *desc,  SAMR_R_CONNECT_ANON *r_u, prs_struct *p
 /*******************************************************************
 makes a SAMR_Q_GET_DOM_PWINFO structure.
 ********************************************************************/
-BOOL make_samr_q_get_dom_pwinfo(SAMR_Q_GET_DOM_PWINFO *q_u, const char *srv_name)
+BOOL make_samr_q_get_dom_pwinfo(SAMR_Q_GET_DOM_PWINFO * q_u,
+				const char *srv_name)
 {
 	int len_srv_name = strlen(srv_name);
 
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_get_dom_pwinfo\n"));
+	DEBUG(5, ("make_samr_q_get_dom_pwinfo\n"));
 
 	q_u->ptr = 1;
 	make_uni_hdr(&(q_u->hdr_srv_name), len_srv_name);
-	make_unistr2(&(q_u->uni_srv_name), srv_name, len_srv_name);  
+	make_unistr2(&(q_u->uni_srv_name), srv_name, len_srv_name);
 
 
 	return True;
@@ -6144,9 +6621,11 @@ BOOL make_samr_q_get_dom_pwinfo(SAMR_Q_GET_DOM_PWINFO *q_u, const char *srv_name
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_get_dom_pwinfo(char *desc,  SAMR_Q_GET_DOM_PWINFO *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_get_dom_pwinfo(char *desc, SAMR_Q_GET_DOM_PWINFO * q_u,
+			      prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_get_dom_pwinfo");
 	depth++;
@@ -6156,8 +6635,9 @@ BOOL samr_io_q_get_dom_pwinfo(char *desc,  SAMR_Q_GET_DOM_PWINFO *q_u, prs_struc
 	prs_uint32("ptr", ps, depth, &(q_u->ptr));
 	if (q_u->ptr != 0)
 	{
-		smb_io_unihdr ("", &(q_u->hdr_srv_name), ps, depth); 
-		smb_io_unistr2("", &(q_u->uni_srv_name), q_u->hdr_srv_name.buffer, ps, depth); 
+		smb_io_unihdr("", &(q_u->hdr_srv_name), ps, depth);
+		smb_io_unistr2("", &(q_u->uni_srv_name),
+			       q_u->hdr_srv_name.buffer, ps, depth);
 		prs_align(ps);
 	}
 
@@ -6168,9 +6648,11 @@ BOOL samr_io_q_get_dom_pwinfo(char *desc,  SAMR_Q_GET_DOM_PWINFO *q_u, prs_struc
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_get_dom_pwinfo(char *desc,  SAMR_R_GET_DOM_PWINFO *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_get_dom_pwinfo(char *desc, SAMR_R_GET_DOM_PWINFO * r_u,
+			      prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_get_dom_pwinfo");
 	depth++;
@@ -6191,11 +6673,12 @@ BOOL samr_io_r_get_dom_pwinfo(char *desc,  SAMR_R_GET_DOM_PWINFO *r_u, prs_struc
 /*******************************************************************
 make a SAMR_ENC_PASSWD structure.
 ********************************************************************/
-BOOL make_enc_passwd(SAMR_ENC_PASSWD *pwd, const char pass[512])
+BOOL make_enc_passwd(SAMR_ENC_PASSWD * pwd, const char pass[512])
 {
 	ZERO_STRUCTP(pwd);
 
-	if (pwd == NULL) return False;
+	if (pwd == NULL)
+		return False;
 
 	if (pass == NULL)
 	{
@@ -6203,7 +6686,7 @@ BOOL make_enc_passwd(SAMR_ENC_PASSWD *pwd, const char pass[512])
 		return True;
 	}
 	pwd->ptr = 1;
-	memcpy(pwd->pass, pass, sizeof(pwd->pass)); 
+	memcpy(pwd->pass, pass, sizeof(pwd->pass));
 
 	return True;
 }
@@ -6211,9 +6694,11 @@ BOOL make_enc_passwd(SAMR_ENC_PASSWD *pwd, const char pass[512])
 /*******************************************************************
 reads or writes a SAMR_ENC_PASSWD structure.
 ********************************************************************/
-BOOL samr_io_enc_passwd(char *desc, SAMR_ENC_PASSWD *pwd, prs_struct *ps, int depth)
+BOOL samr_io_enc_passwd(char *desc, SAMR_ENC_PASSWD * pwd, prs_struct * ps,
+			int depth)
 {
-	if (pwd == NULL) return False;
+	if (pwd == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_enc_passwd");
 	depth++;
@@ -6223,7 +6708,8 @@ BOOL samr_io_enc_passwd(char *desc, SAMR_ENC_PASSWD *pwd, prs_struct *ps, int de
 	prs_uint32("ptr", ps, depth, &(pwd->ptr));
 	if (pwd->ptr != 0)
 	{
-		prs_uint8s(False, "pwd", ps, depth, pwd->pass, sizeof(pwd->pass)); 
+		prs_uint8s(False, "pwd", ps, depth, pwd->pass,
+			   sizeof(pwd->pass));
 	}
 
 	return True;
@@ -6232,11 +6718,12 @@ BOOL samr_io_enc_passwd(char *desc, SAMR_ENC_PASSWD *pwd, prs_struct *ps, int de
 /*******************************************************************
 makes a SAMR_ENC_HASH structure.
 ********************************************************************/
-BOOL make_enc_hash(SAMR_ENC_HASH *hsh, const uchar hash[16])
+BOOL make_enc_hash(SAMR_ENC_HASH * hsh, const uchar hash[16])
 {
 	ZERO_STRUCTP(hsh);
 
-	if (hsh == NULL) return False;
+	if (hsh == NULL)
+		return False;
 
 	if (hash == NULL)
 	{
@@ -6253,9 +6740,11 @@ BOOL make_enc_hash(SAMR_ENC_HASH *hsh, const uchar hash[16])
 /*******************************************************************
 reads or writes a SAMR_ENC_HASH structure.
 ********************************************************************/
-BOOL samr_io_enc_hash(char *desc, SAMR_ENC_HASH *hsh, prs_struct *ps, int depth)
+BOOL samr_io_enc_hash(char *desc, SAMR_ENC_HASH * hsh, prs_struct * ps,
+		      int depth)
 {
-	if (hsh == NULL) return False;
+	if (hsh == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_enc_hash");
 	depth++;
@@ -6265,7 +6754,8 @@ BOOL samr_io_enc_hash(char *desc, SAMR_ENC_HASH *hsh, prs_struct *ps, int depth)
 	prs_uint32("ptr ", ps, depth, &(hsh->ptr));
 	if (hsh->ptr != 0)
 	{
-		prs_uint8s(False, "hash", ps, depth, hsh->hash, sizeof(hsh->hash)); 
+		prs_uint8s(False, "hash", ps, depth, hsh->hash,
+			   sizeof(hsh->hash));
 	}
 
 	return True;
@@ -6274,7 +6764,7 @@ BOOL samr_io_enc_hash(char *desc, SAMR_ENC_HASH *hsh, prs_struct *ps, int depth)
 /*******************************************************************
 makes a SAMR_R_GET_DOM_PWINFO structure.
 ********************************************************************/
-BOOL make_samr_q_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u,
+BOOL make_samr_q_chgpasswd_user(SAMR_Q_CHGPASSWD_USER * q_u,
 				const char *dest_host, const char *user_name,
 				const char nt_newpass[516],
 				const uchar nt_oldhash[16],
@@ -6284,23 +6774,24 @@ BOOL make_samr_q_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u,
 	int len_dest_host = strlen(dest_host);
 	int len_user_name = strlen(user_name);
 
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
-	DEBUG(5,("make_samr_q_chgpasswd_user\n"));
+	DEBUG(5, ("make_samr_q_chgpasswd_user\n"));
 
 	q_u->ptr_0 = 1;
 	make_uni_hdr(&(q_u->hdr_dest_host), len_dest_host);
-	make_unistr2(&(q_u->uni_dest_host), dest_host, len_dest_host);  
+	make_unistr2(&(q_u->uni_dest_host), dest_host, len_dest_host);
 	make_uni_hdr(&(q_u->hdr_user_name), len_user_name);
-	make_unistr2(&(q_u->uni_user_name), user_name, len_user_name);  
+	make_unistr2(&(q_u->uni_user_name), user_name, len_user_name);
 
 	make_enc_passwd(&(q_u->nt_newpass), nt_newpass);
-	make_enc_hash  (&(q_u->nt_oldhash), nt_oldhash);
+	make_enc_hash(&(q_u->nt_oldhash), nt_oldhash);
 
 	q_u->unknown = 0x01;
 
 	make_enc_passwd(&(q_u->lm_newpass), lm_newpass);
-	make_enc_hash  (&(q_u->lm_oldhash), lm_oldhash);
+	make_enc_hash(&(q_u->lm_oldhash), lm_oldhash);
 
 	return True;
 }
@@ -6308,9 +6799,11 @@ BOOL make_samr_q_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_q_chgpasswd_user(char *desc, SAMR_Q_CHGPASSWD_USER *q_u, prs_struct *ps, int depth)
+BOOL samr_io_q_chgpasswd_user(char *desc, SAMR_Q_CHGPASSWD_USER * q_u,
+			      prs_struct * ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_q_chgpasswd_user");
 	depth++;
@@ -6319,21 +6812,23 @@ BOOL samr_io_q_chgpasswd_user(char *desc, SAMR_Q_CHGPASSWD_USER *q_u, prs_struct
 
 	prs_uint32("ptr_0", ps, depth, &(q_u->ptr_0));
 
-	smb_io_unihdr ("", &(q_u->hdr_dest_host), ps, depth); 
-	smb_io_unistr2("", &(q_u->uni_dest_host), q_u->hdr_dest_host.buffer, ps, depth); 
+	smb_io_unihdr("", &(q_u->hdr_dest_host), ps, depth);
+	smb_io_unistr2("", &(q_u->uni_dest_host), q_u->hdr_dest_host.buffer,
+		       ps, depth);
 	prs_align(ps);
 
-	smb_io_unihdr ("", &(q_u->hdr_user_name), ps, depth); 
-	smb_io_unistr2("", &(q_u->uni_user_name), q_u->hdr_user_name.buffer, ps, depth); 
+	smb_io_unihdr("", &(q_u->hdr_user_name), ps, depth);
+	smb_io_unistr2("", &(q_u->uni_user_name), q_u->hdr_user_name.buffer,
+		       ps, depth);
 	prs_align(ps);
 
-	samr_io_enc_passwd("nt_newpass", &(q_u->nt_newpass), ps, depth); 
-	samr_io_enc_hash  ("nt_oldhash", &(q_u->nt_oldhash), ps, depth); 
+	samr_io_enc_passwd("nt_newpass", &(q_u->nt_newpass), ps, depth);
+	samr_io_enc_hash("nt_oldhash", &(q_u->nt_oldhash), ps, depth);
 
 	prs_uint32("unknown", ps, depth, &(q_u->unknown));
 
-	samr_io_enc_passwd("lm_newpass", &(q_u->lm_newpass), ps, depth); 
-	samr_io_enc_hash  ("lm_oldhash", &(q_u->lm_oldhash), ps, depth); 
+	samr_io_enc_passwd("lm_newpass", &(q_u->lm_newpass), ps, depth);
+	samr_io_enc_hash("lm_oldhash", &(q_u->lm_oldhash), ps, depth);
 
 	return True;
 }
@@ -6341,11 +6836,12 @@ BOOL samr_io_q_chgpasswd_user(char *desc, SAMR_Q_CHGPASSWD_USER *q_u, prs_struct
 /*******************************************************************
 makes a SAMR_R_CHGPASSWD_USER structure.
 ********************************************************************/
-BOOL make_samr_r_chgpasswd_user(SAMR_R_CHGPASSWD_USER *r_u, uint32 status)
+BOOL make_samr_r_chgpasswd_user(SAMR_R_CHGPASSWD_USER * r_u, uint32 status)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
-	DEBUG(5,("make_r_chgpasswd_user\n"));
+	DEBUG(5, ("make_r_chgpasswd_user\n"));
 
 	r_u->status = status;
 
@@ -6355,9 +6851,11 @@ BOOL make_samr_r_chgpasswd_user(SAMR_R_CHGPASSWD_USER *r_u, uint32 status)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL samr_io_r_chgpasswd_user(char *desc, SAMR_R_CHGPASSWD_USER *r_u, prs_struct *ps, int depth)
+BOOL samr_io_r_chgpasswd_user(char *desc, SAMR_R_CHGPASSWD_USER * r_u,
+			      prs_struct * ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "samr_io_r_chgpasswd_user");
 	depth++;
@@ -6368,5 +6866,3 @@ BOOL samr_io_r_chgpasswd_user(char *desc, SAMR_R_CHGPASSWD_USER *r_u, prs_struct
 
 	return True;
 }
-
-