merge of smbd and related files, from cvs main.

1 files changed, 303 insertions, 205 deletions

diff --git a/source/rpc_parse/parse_svc.c b/source/rpc_parse/parse_svc.c
index 755dba86a82..6d6271840e2 100644
--- a/source/rpc_parse/parse_svc.c
+++ b/source/rpc_parse/parse_svc.c
@@ -31,14 +31,14 @@ extern int DEBUGLEVEL;
 /*******************************************************************
  make_svc_q_open_sc_man
  ********************************************************************/
-BOOL make_svc_q_open_sc_man(SVC_Q_OPEN_SC_MAN *q_u,
-				    const char *server, const char *database,
-				    uint32 des_access)
+BOOL make_svc_q_open_sc_man(SVC_Q_OPEN_SC_MAN * q_u,
+			    const char *server, const char *database,
+			    uint32 des_access)
 {
-	DEBUG(5,("make_svc_q_open_sc_man\n"));
+	DEBUG(5, ("make_svc_q_open_sc_man\n"));
 
 	make_buf_unistr2(&(q_u->uni_srv_name), &(q_u->ptr_srv_name), server);
-	make_buf_unistr2(&(q_u->uni_db_name ), &(q_u->ptr_db_name), database);
+	make_buf_unistr2(&(q_u->uni_db_name), &(q_u->ptr_db_name), database);
 	q_u->des_access = des_access;
 
 	return True;
@@ -47,9 +47,11 @@ BOOL make_svc_q_open_sc_man(SVC_Q_OPEN_SC_MAN *q_u,
 /*******************************************************************
 reads or writes a SVC_Q_OPEN_SC_MAN structure.
 ********************************************************************/
-BOOL svc_io_q_open_sc_man(char *desc, SVC_Q_OPEN_SC_MAN *q_u, prs_struct *ps, int depth)
+BOOL svc_io_q_open_sc_man(char *desc, SVC_Q_OPEN_SC_MAN * q_u, prs_struct *ps,
+			  int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_q_open_sc_man");
 	depth++;
@@ -57,11 +59,12 @@ BOOL svc_io_q_open_sc_man(char *desc, SVC_Q_OPEN_SC_MAN *q_u, prs_struct *ps, in
 	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);
 
 	prs_uint32("ptr_db_name", ps, depth, &(q_u->ptr_db_name));
-	smb_io_unistr2("", &(q_u->uni_db_name), q_u->ptr_db_name, ps, depth); 
+	smb_io_unistr2("", &(q_u->uni_db_name), q_u->ptr_db_name, ps, depth);
 	prs_align(ps);
 
 	prs_uint32("des_access", ps, depth, &(q_u->des_access));
@@ -73,9 +76,11 @@ BOOL svc_io_q_open_sc_man(char *desc, SVC_Q_OPEN_SC_MAN *q_u, prs_struct *ps, in
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_r_open_sc_man(char *desc,  SVC_R_OPEN_SC_MAN *r_u, prs_struct *ps, int depth)
+BOOL svc_io_r_open_sc_man(char *desc, SVC_R_OPEN_SC_MAN * r_u, prs_struct *ps,
+			  int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_r_open_sc_man");
 	depth++;
@@ -92,15 +97,14 @@ BOOL svc_io_r_open_sc_man(char *desc,  SVC_R_OPEN_SC_MAN *r_u, prs_struct *ps, i
 /*******************************************************************
  make_svc_q_open_service
  ********************************************************************/
-BOOL make_svc_q_open_service(SVC_Q_OPEN_SERVICE *q_u,
-				     POLICY_HND *hnd,
-				     const char *server,
-				     uint32 des_access)
+BOOL make_svc_q_open_service(SVC_Q_OPEN_SERVICE * q_u,
+			     POLICY_HND *hnd,
+			     const char *server, uint32 des_access)
 {
-	DEBUG(5,("make_svc_q_open_service\n"));
+	DEBUG(5, ("make_svc_q_open_service\n"));
 
-	memcpy(&(q_u->scman_pol), hnd, sizeof(q_u->scman_pol));
-	make_unistr2(&(q_u->uni_svc_name), server, strlen(server)+1);
+	q_u->scman_pol = *hnd;
+	make_unistr2(&(q_u->uni_svc_name), server, strlen(server) + 1);
 	q_u->des_access = des_access;
 
 
@@ -110,9 +114,11 @@ BOOL make_svc_q_open_service(SVC_Q_OPEN_SERVICE *q_u,
 /*******************************************************************
 reads or writes a SVC_Q_OPEN_SERVICE structure.
 ********************************************************************/
-BOOL svc_io_q_open_service(char *desc, SVC_Q_OPEN_SERVICE *q_u, prs_struct *ps, int depth)
+BOOL svc_io_q_open_service(char *desc, SVC_Q_OPEN_SERVICE * q_u,
+			   prs_struct *ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_q_open_service");
 	depth++;
@@ -122,7 +128,7 @@ BOOL svc_io_q_open_service(char *desc, SVC_Q_OPEN_SERVICE *q_u, prs_struct *ps,
 	smb_io_pol_hnd("", &(q_u->scman_pol), ps, depth);
 	prs_align(ps);
 
-	smb_io_unistr2("", &(q_u->uni_svc_name), 1, ps, depth); 
+	smb_io_unistr2("", &(q_u->uni_svc_name), 1, ps, depth);
 	prs_align(ps);
 
 	prs_uint32("des_access", ps, depth, &(q_u->des_access));
@@ -134,9 +140,11 @@ BOOL svc_io_q_open_service(char *desc, SVC_Q_OPEN_SERVICE *q_u, prs_struct *ps,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_r_open_service(char *desc,  SVC_R_OPEN_SERVICE *r_u, prs_struct *ps, int depth)
+BOOL svc_io_r_open_service(char *desc, SVC_R_OPEN_SERVICE * r_u,
+			   prs_struct *ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_r_open_service");
 	depth++;
@@ -153,14 +161,15 @@ BOOL svc_io_r_open_service(char *desc,  SVC_R_OPEN_SERVICE *r_u, prs_struct *ps,
 /*******************************************************************
 makes an SVC_Q_STOP_SERVICE structure.
 ********************************************************************/
-BOOL make_svc_q_stop_service(SVC_Q_STOP_SERVICE *q_c, POLICY_HND *hnd,
-				uint32 unk)
+BOOL make_svc_q_stop_service(SVC_Q_STOP_SERVICE * q_c, POLICY_HND *hnd,
+			     uint32 unk)
 {
-	if (q_c == NULL || hnd == NULL) return False;
+	if (q_c == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_svc_q_stop_service\n"));
+	DEBUG(5, ("make_svc_q_stop_service\n"));
 
-	memcpy(&(q_c->pol), hnd, sizeof(q_c->pol));
+	q_c->pol = *hnd;
 	q_c->unknown = unk;
 
 	return True;
@@ -169,9 +178,11 @@ BOOL make_svc_q_stop_service(SVC_Q_STOP_SERVICE *q_c, POLICY_HND *hnd,
 /*******************************************************************
 reads or writes a SVC_Q_STOP_SERVICE structure.
 ********************************************************************/
-BOOL svc_io_q_stop_service(char *desc, SVC_Q_STOP_SERVICE *q_s, prs_struct *ps, int depth)
+BOOL svc_io_q_stop_service(char *desc, SVC_Q_STOP_SERVICE * q_s,
+			   prs_struct *ps, int depth)
 {
-	if (q_s == NULL) return False;
+	if (q_s == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_q_stop_service");
 	depth++;
@@ -188,9 +199,11 @@ BOOL svc_io_q_stop_service(char *desc, SVC_Q_STOP_SERVICE *q_s, prs_struct *ps,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_r_stop_service(char *desc,  SVC_R_STOP_SERVICE *r_s, prs_struct *ps, int depth)
+BOOL svc_io_r_stop_service(char *desc, SVC_R_STOP_SERVICE * r_s,
+			   prs_struct *ps, int depth)
 {
-	if (r_s == NULL) return False;
+	if (r_s == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_r_stop_service");
 	depth++;
@@ -210,24 +223,24 @@ BOOL svc_io_r_stop_service(char *desc,  SVC_R_STOP_SERVICE *r_s, prs_struct *ps,
 /*******************************************************************
 makes an SVC_Q_START_SERVICE structure.
 ********************************************************************/
-BOOL make_svc_q_start_service(SVC_Q_START_SERVICE *q_c, POLICY_HND *hnd,
-				uint32 argc,
-				char **argv)
+BOOL make_svc_q_start_service(SVC_Q_START_SERVICE * q_c, POLICY_HND *hnd,
+			      uint32 argc, char **argv)
 {
 	uint32 i;
 
-	if (q_c == NULL || hnd == NULL) return False;
+	if (q_c == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_svc_q_start_service\n"));
+	DEBUG(5, ("make_svc_q_start_service\n"));
 
-	memcpy(&(q_c->pol), hnd, sizeof(q_c->pol));
+	q_c->pol = *hnd;
 	q_c->argc = argc;
 	q_c->ptr_args = 1;
 	q_c->argc2 = argc;
 
 	for (i = 0; i < argc; i++)
 	{
-		size_t len_argv = argv[i] != NULL ? strlen(argv[i])+1 : 0;
+		size_t len_argv = argv[i] != NULL ? strlen(argv[i]) + 1 : 0;
 		q_c->ptr_argv[i] = argv[i] != NULL ? 1 : 0;
 		make_unistr2(&(q_c->argv[i]), argv[i], len_argv);
 	}
@@ -238,9 +251,11 @@ BOOL make_svc_q_start_service(SVC_Q_START_SERVICE *q_c, POLICY_HND *hnd,
 /*******************************************************************
 reads or writes a SVC_Q_START_SERVICE structure.
 ********************************************************************/
-BOOL svc_io_q_start_service(char *desc, SVC_Q_START_SERVICE *q_s, prs_struct *ps, int depth)
+BOOL svc_io_q_start_service(char *desc, SVC_Q_START_SERVICE * q_s,
+			    prs_struct *ps, int depth)
 {
-	if (q_s == NULL) return False;
+	if (q_s == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_q_start_service");
 	depth++;
@@ -249,7 +264,7 @@ BOOL svc_io_q_start_service(char *desc, SVC_Q_START_SERVICE *q_s, prs_struct *ps
 	smb_io_pol_hnd("", &(q_s->pol), ps, depth);
 
 	prs_align(ps);
-	prs_uint32("argc    ", ps, depth, &(q_s->argc    ));
+	prs_uint32("argc    ", ps, depth, &(q_s->argc));
 	prs_uint32("ptr_args", ps, depth, &(q_s->ptr_args));
 
 	if (q_s->ptr_args != 0)
@@ -265,11 +280,12 @@ BOOL svc_io_q_start_service(char *desc, SVC_Q_START_SERVICE *q_s, prs_struct *ps
 
 		for (i = 0; i < q_s->argc2; i++)
 		{
-			prs_uint32("", ps, depth, &(q_s->ptr_argv[i])); 
+			prs_uint32("", ps, depth, &(q_s->ptr_argv[i]));
 		}
 		for (i = 0; i < q_s->argc2; i++)
 		{
-			smb_io_unistr2("", &(q_s->argv[i]), q_s->ptr_argv[i], ps, depth); 
+			smb_io_unistr2("", &(q_s->argv[i]), q_s->ptr_argv[i],
+				       ps, depth);
 			prs_align(ps);
 		}
 	}
@@ -280,9 +296,11 @@ BOOL svc_io_q_start_service(char *desc, SVC_Q_START_SERVICE *q_s, prs_struct *ps
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_r_start_service(char *desc,  SVC_R_START_SERVICE *r_s, prs_struct *ps, int depth)
+BOOL svc_io_r_start_service(char *desc, SVC_R_START_SERVICE * r_s,
+			    prs_struct *ps, int depth)
 {
-	if (r_s == NULL) return False;
+	if (r_s == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_r_start_service");
 	depth++;
@@ -295,25 +313,30 @@ BOOL svc_io_r_start_service(char *desc,  SVC_R_START_SERVICE *r_s, prs_struct *p
 /*******************************************************************
  make_svc_query_svc_cfg
  ********************************************************************/
-BOOL make_svc_query_svc_cfg(QUERY_SERVICE_CONFIG *q_u,
-				uint32 service_type, uint32 start_type,
-				uint32 error_control,
-				char* bin_path_name, char* load_order_grp, 
-				uint32 tag_id,
-				char* dependencies, char* service_start_name,
-				char* disp_name)
+BOOL make_svc_query_svc_cfg(QUERY_SERVICE_CONFIG * q_u,
+			    uint32 service_type, uint32 start_type,
+			    uint32 error_control,
+			    char *bin_path_name, char *load_order_grp,
+			    uint32 tag_id,
+			    char *dependencies, char *service_start_name,
+			    char *disp_name)
 {
-	DEBUG(5,("make_svc_query_svc_cfg\n"));
+	DEBUG(5, ("make_svc_query_svc_cfg\n"));
 
 	q_u->service_type = service_type;
 	q_u->start_type = start_type;
 	q_u->error_control = error_control;
-	make_buf_unistr2(&(q_u->uni_bin_path_name     ), &(q_u->ptr_bin_path_name     ), bin_path_name     );
-	make_buf_unistr2(&(q_u->uni_load_order_grp    ), &(q_u->ptr_load_order_grp    ), load_order_grp    );
+	make_buf_unistr2(&(q_u->uni_bin_path_name), &(q_u->ptr_bin_path_name),
+			 bin_path_name);
+	make_buf_unistr2(&(q_u->uni_load_order_grp),
+			 &(q_u->ptr_load_order_grp), load_order_grp);
 	q_u->tag_id = tag_id;
-	make_buf_unistr2(&(q_u->uni_dependencies      ), &(q_u->ptr_dependencies      ), dependencies      );
-	make_buf_unistr2(&(q_u->uni_service_start_name), &(q_u->ptr_service_start_name), service_start_name);
-	make_buf_unistr2(&(q_u->uni_display_name      ), &(q_u->ptr_display_name      ), disp_name         );
+	make_buf_unistr2(&(q_u->uni_dependencies), &(q_u->ptr_dependencies),
+			 dependencies);
+	make_buf_unistr2(&(q_u->uni_service_start_name),
+			 &(q_u->ptr_service_start_name), service_start_name);
+	make_buf_unistr2(&(q_u->uni_display_name), &(q_u->ptr_display_name),
+			 disp_name);
 
 	return True;
 }
@@ -321,34 +344,48 @@ BOOL make_svc_query_svc_cfg(QUERY_SERVICE_CONFIG *q_u,
 /*******************************************************************
 reads or writes a QUERY_SERVICE_CONFIG structure.
 ********************************************************************/
-BOOL svc_io_query_svc_cfg(char *desc, QUERY_SERVICE_CONFIG *q_u, prs_struct *ps, int depth)
+BOOL svc_io_query_svc_cfg(char *desc, QUERY_SERVICE_CONFIG * q_u,
+			  prs_struct *ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_query_svc_cfg");
 	depth++;
 
 	prs_align(ps);
 
-	prs_uint32("service_type          ", ps, depth, &(q_u->service_type          ));
-	prs_uint32("start_type            ", ps, depth, &(q_u->start_type            ));
-	prs_uint32("error_control         ", ps, depth, &(q_u->error_control         ));
-	prs_uint32("ptr_bin_path_name     ", ps, depth, &(q_u->ptr_bin_path_name     ));
-	prs_uint32("ptr_load_order_grp    ", ps, depth, &(q_u->ptr_load_order_grp    ));
-	prs_uint32("tag_id                ", ps, depth, &(q_u->tag_id                ));
-	prs_uint32("ptr_dependencies      ", ps, depth, &(q_u->ptr_dependencies      ));
-	prs_uint32("ptr_service_start_name", ps, depth, &(q_u->ptr_service_start_name));
-	prs_uint32("ptr_display_name      ", ps, depth, &(q_u->ptr_display_name      ));
+	prs_uint32("service_type          ", ps, depth, &(q_u->service_type));
+	prs_uint32("start_type            ", ps, depth, &(q_u->start_type));
+	prs_uint32("error_control         ", ps, depth,
+		   &(q_u->error_control));
+	prs_uint32("ptr_bin_path_name     ", ps, depth,
+		   &(q_u->ptr_bin_path_name));
+	prs_uint32("ptr_load_order_grp    ", ps, depth,
+		   &(q_u->ptr_load_order_grp));
+	prs_uint32("tag_id                ", ps, depth, &(q_u->tag_id));
+	prs_uint32("ptr_dependencies      ", ps, depth,
+		   &(q_u->ptr_dependencies));
+	prs_uint32("ptr_service_start_name", ps, depth,
+		   &(q_u->ptr_service_start_name));
+	prs_uint32("ptr_display_name      ", ps, depth,
+		   &(q_u->ptr_display_name));
 
-	smb_io_unistr2("uni_bin_path_name     ", &(q_u->uni_bin_path_name     ), q_u->ptr_bin_path_name     , ps, depth); 
+	smb_io_unistr2("uni_bin_path_name     ", &(q_u->uni_bin_path_name),
+		       q_u->ptr_bin_path_name, ps, depth);
 	prs_align(ps);
-	smb_io_unistr2("uni_load_order_grp    ", &(q_u->uni_load_order_grp    ), q_u->ptr_load_order_grp    , ps, depth); 
+	smb_io_unistr2("uni_load_order_grp    ", &(q_u->uni_load_order_grp),
+		       q_u->ptr_load_order_grp, ps, depth);
 	prs_align(ps);
-	smb_io_unistr2("uni_dependencies      ", &(q_u->uni_dependencies      ), q_u->ptr_dependencies      , ps, depth); 
+	smb_io_unistr2("uni_dependencies      ", &(q_u->uni_dependencies),
+		       q_u->ptr_dependencies, ps, depth);
 	prs_align(ps);
-	smb_io_unistr2("uni_service_start_name", &(q_u->uni_service_start_name), q_u->ptr_service_start_name, ps, depth); 
+	smb_io_unistr2("uni_service_start_name",
+		       &(q_u->uni_service_start_name),
+		       q_u->ptr_service_start_name, ps, depth);
 	prs_align(ps);
-	smb_io_unistr2("uni_display_name      ", &(q_u->uni_display_name      ), q_u->ptr_display_name      , ps, depth); 
+	smb_io_unistr2("uni_display_name      ", &(q_u->uni_display_name),
+		       q_u->ptr_display_name, ps, depth);
 	prs_align(ps);
 
 	return True;
@@ -357,15 +394,17 @@ BOOL svc_io_query_svc_cfg(char *desc, QUERY_SERVICE_CONFIG *q_u, prs_struct *ps,
 /*******************************************************************
 makes an SVC_Q_ENUM_SVCS_STATUS structure.
 ********************************************************************/
-BOOL make_svc_q_enum_svcs_status(SVC_Q_ENUM_SVCS_STATUS *q_c, POLICY_HND *hnd,
-				uint32 service_type, uint32 service_state,
-				uint32 buf_size, uint32 resume_hnd )
+BOOL make_svc_q_enum_svcs_status(SVC_Q_ENUM_SVCS_STATUS * q_c,
+				 POLICY_HND *hnd, uint32 service_type,
+				 uint32 service_state, uint32 buf_size,
+				 uint32 resume_hnd)
 {
-	if (q_c == NULL || hnd == NULL) return False;
+	if (q_c == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_svc_q_enum_svcs_status\n"));
+	DEBUG(5, ("make_svc_q_enum_svcs_status\n"));
 
-	memcpy(&(q_c->pol), hnd, sizeof(q_c->pol));
+	q_c->pol = *hnd;
 	q_c->service_type = service_type;
 	q_c->service_state = service_state;
 	q_c->buf_size = buf_size;
@@ -377,22 +416,24 @@ BOOL make_svc_q_enum_svcs_status(SVC_Q_ENUM_SVCS_STATUS *q_c, POLICY_HND *hnd,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_q_enum_svcs_status(char *desc,  SVC_Q_ENUM_SVCS_STATUS *q_u, prs_struct *ps, int depth)
+BOOL svc_io_q_enum_svcs_status(char *desc, SVC_Q_ENUM_SVCS_STATUS * q_u,
+			       prs_struct *ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_q_enum_svcs_status");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("", &(q_u->pol), ps, depth); 
+	smb_io_pol_hnd("", &(q_u->pol), ps, depth);
 	prs_align(ps);
 
-	prs_uint32("service_type ", ps, depth, &(q_u->service_type ));
+	prs_uint32("service_type ", ps, depth, &(q_u->service_type));
 	prs_uint32("service_state", ps, depth, &(q_u->service_state));
-	prs_uint32("buf_size     ", ps, depth, &(q_u->buf_size     ));
-	smb_io_enum_hnd("resume_hnd", &(q_u->resume_hnd), ps, depth); 
+	prs_uint32("buf_size     ", ps, depth, &(q_u->buf_size));
+	smb_io_enum_hnd("resume_hnd", &(q_u->resume_hnd), ps, depth);
 
 	return True;
 }
@@ -400,19 +441,20 @@ BOOL svc_io_q_enum_svcs_status(char *desc,  SVC_Q_ENUM_SVCS_STATUS *q_u, prs_str
 /*******************************************************************
 makes an SVC_R_ENUM_SVCS_STATUS structure.
 ********************************************************************/
-BOOL make_svc_r_enum_svcs_status(SVC_R_ENUM_SVCS_STATUS *r_c, 
-				ENUM_SRVC_STATUS *svcs, uint32 more_buf_size,
-				uint32 num_svcs, ENUM_HND *resume_hnd,
-				uint32 dos_status)
+BOOL make_svc_r_enum_svcs_status(SVC_R_ENUM_SVCS_STATUS * r_c,
+				 ENUM_SRVC_STATUS * svcs,
+				 uint32 more_buf_size, uint32 num_svcs,
+				 ENUM_HND * resume_hnd, uint32 dos_status)
 {
-	if (r_c == NULL) return False;
+	if (r_c == NULL)
+		return False;
 
-	DEBUG(5,("make_svc_r_enum_svcs_status\n"));
+	DEBUG(5, ("make_svc_r_enum_svcs_status\n"));
 
-	r_c->svcs          = svcs;
+	r_c->svcs = svcs;
 	r_c->more_buf_size = more_buf_size;
-	r_c->num_svcs      = num_svcs;
-	memcpy(&(r_c->resume_hnd), resume_hnd, sizeof(ENUM_HND));
+	r_c->num_svcs = num_svcs;
+	r_c->resume_hnd = *resume_hnd;
 	r_c->dos_status = dos_status;
 
 	return True;
@@ -426,16 +468,18 @@ not COMMUNICATE and get some CONSISTENCY TO THEIR DATA STRUCTURES!
 ARGH!
 
 ********************************************************************/
-BOOL svc_io_r_enum_svcs_status(char *desc, SVC_R_ENUM_SVCS_STATUS *svc, prs_struct *ps, int depth)
+BOOL svc_io_r_enum_svcs_status(char *desc, SVC_R_ENUM_SVCS_STATUS * svc,
+			       prs_struct *ps, int depth)
 {
 	uint32 i;
-	if (svc == NULL) return False;
+	if (svc == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_r_enum_svcs_status");
 	depth++;
 
 	prs_align(ps);
-	
+
 	/*
 	 * format is actually as laid out in SVC_R_ENUM_SVCS_STATUS.
 	 * the reason for all the jumping about, which is horrible
@@ -462,23 +506,27 @@ BOOL svc_io_r_enum_svcs_status(char *desc, SVC_R_ENUM_SVCS_STATUS *svc, prs_stru
 
 		prs_uint32("more_buf_size", ps, depth, &(svc->more_buf_size));
 		prs_uint32("num_svcs", ps, depth, &(svc->num_svcs));
-		smb_io_enum_hnd("resume_hnd", &(svc->resume_hnd), ps, depth); 
+		smb_io_enum_hnd("resume_hnd", &(svc->resume_hnd), ps, depth);
 		prs_uint32("dos_status", ps, depth, &(svc->dos_status));
 
 		new_offset = ps->offset;
 		ps->offset = buf_offset;
 
-		svc->svcs = (ENUM_SRVC_STATUS*)Realloc(NULL,
-		            svc->num_svcs * sizeof(ENUM_SRVC_STATUS));
+		svc->svcs = (ENUM_SRVC_STATUS *) Realloc(NULL,
+							 svc->num_svcs *
+							 sizeof
+							 (ENUM_SRVC_STATUS));
 
 		if (svc->svcs == NULL)
 		{
-			DEBUG(0,("svc_io_r_enum_svcs_status: Realloc failed\n"));
+			DEBUG(0,
+			      ("svc_io_r_enum_svcs_status: Realloc failed\n"));
 			ps->offset = 0x7fffffff;
 			return False;
 		}
 
-		memset(svc->svcs, 0,  svc->num_svcs * sizeof(ENUM_SRVC_STATUS));
+		memset(svc->svcs, 0,
+		       svc->num_svcs * sizeof(ENUM_SRVC_STATUS));
 
 		for (i = 0; i < svc->num_svcs; i++)
 		{
@@ -489,17 +537,20 @@ BOOL svc_io_r_enum_svcs_status(char *desc, SVC_R_ENUM_SVCS_STATUS *svc, prs_stru
 
 			prs_uint32("srvc_offset", ps, depth, &srvc_offset);
 			prs_uint32("disp_offset", ps, depth, &disp_offset);
-			svc_io_svc_status("status", &svc->svcs[i].status, ps, depth); 
+			svc_io_svc_status("status", &svc->svcs[i].status, ps,
+					  depth);
 
 			old_offset = ps->offset;
 
 			ps->offset = buf_offset + srvc_offset;
-			slprintf(name, sizeof(name)-1, "srvc[%02d]", i);
-			smb_io_unistr(name, &svc->svcs[i].uni_srvc_name, ps, depth);
+			slprintf(name, sizeof(name) - 1, "srvc[%02d]", i);
+			smb_io_unistr(name, &svc->svcs[i].uni_srvc_name, ps,
+				      depth);
 
 			ps->offset = buf_offset + disp_offset;
-			slprintf(name, sizeof(name)-1, "disp[%02d]", i);
-			smb_io_unistr(name, &svc->svcs[i].uni_disp_name, ps, depth);
+			slprintf(name, sizeof(name) - 1, "disp[%02d]", i);
+			smb_io_unistr(name, &svc->svcs[i].uni_disp_name, ps,
+				      depth);
 
 			ps->offset = old_offset;
 		}
@@ -514,7 +565,8 @@ BOOL svc_io_r_enum_svcs_status(char *desc, SVC_R_ENUM_SVCS_STATUS *svc, prs_stru
 		uint32 old_buf_offset;
 		uint32 srvc_offset = 9 * sizeof(uint32) * svc->num_svcs;
 
-		prs_uint32_pre("buf_size", ps, depth, &svc->buf_size, &buf_offset);
+		prs_uint32_pre("buf_size", ps, depth, &svc->buf_size,
+			       &buf_offset);
 		old_buf_offset = ps->offset;
 
 		srvc_offset += old_buf_offset;
@@ -537,11 +589,12 @@ BOOL svc_io_r_enum_svcs_status(char *desc, SVC_R_ENUM_SVCS_STATUS *svc, prs_stru
 			prs_uint32("srvc_offset", ps, depth, &srvc_offset);
 			srvc_offset += old_buf_offset;
 
-			slprintf(name, sizeof(name)-1, "srvc[%02d]", i);
+			slprintf(name, sizeof(name) - 1, "srvc[%02d]", i);
 
 			old_offset = ps->offset;
 			ps->offset = srvc_offset;
-			smb_io_unistr(name, &svc->svcs[i].uni_srvc_name, ps, depth);
+			smb_io_unistr(name, &svc->svcs[i].uni_srvc_name, ps,
+				      depth);
 			srvc_offset = ps->offset;
 			ps->offset = old_offset;
 
@@ -553,11 +606,12 @@ BOOL svc_io_r_enum_svcs_status(char *desc, SVC_R_ENUM_SVCS_STATUS *svc, prs_stru
 			prs_uint32("disp_offset", ps, depth, &srvc_offset);
 			srvc_offset += old_buf_offset;
 
-			slprintf(name, sizeof(name)-1, "disp[%02d]", i);
+			slprintf(name, sizeof(name) - 1, "disp[%02d]", i);
 
 			old_offset = ps->offset;
 			ps->offset = srvc_offset;
-			smb_io_unistr(name, &svc->svcs[i].uni_disp_name, ps, depth);
+			smb_io_unistr(name, &svc->svcs[i].uni_disp_name, ps,
+				      depth);
 			srvc_offset = ps->offset;
 			ps->offset = old_offset;
 
@@ -565,10 +619,13 @@ BOOL svc_io_r_enum_svcs_status(char *desc, SVC_R_ENUM_SVCS_STATUS *svc, prs_stru
 			 * store status info
 			 */
 
-			svc_io_svc_status("status", &svc->svcs[i].status, ps, depth); 
+			svc_io_svc_status("status", &svc->svcs[i].status, ps,
+					  depth);
 		}
 
-		prs_uint32_post("buf_size", ps, depth, &svc->buf_size, buf_offset, srvc_offset - buf_offset - sizeof(uint32));
+		prs_uint32_post("buf_size", ps, depth, &svc->buf_size,
+				buf_offset,
+				srvc_offset - buf_offset - sizeof(uint32));
 
 		ps->offset = srvc_offset;
 
@@ -576,7 +633,7 @@ BOOL svc_io_r_enum_svcs_status(char *desc, SVC_R_ENUM_SVCS_STATUS *svc, prs_stru
 
 		prs_uint32("more_buf_size", ps, depth, &(svc->more_buf_size));
 		prs_uint32("num_svcs", ps, depth, &(svc->num_svcs));
-		smb_io_enum_hnd("resume_hnd", &(svc->resume_hnd), ps, depth); 
+		smb_io_enum_hnd("resume_hnd", &(svc->resume_hnd), ps, depth);
 		prs_uint32("dos_status", ps, depth, &(svc->dos_status));
 	}
 
@@ -586,9 +643,11 @@ BOOL svc_io_r_enum_svcs_status(char *desc, SVC_R_ENUM_SVCS_STATUS *svc, prs_stru
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_svc_status(char *desc,  SVC_STATUS *svc, prs_struct *ps, int depth)
+BOOL svc_io_svc_status(char *desc, SVC_STATUS * svc, prs_struct *ps,
+		       int depth)
 {
-	if (svc == NULL) return False;
+	if (svc == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_svc_status");
 	depth++;
@@ -599,7 +658,8 @@ BOOL svc_io_svc_status(char *desc,  SVC_STATUS *svc, prs_struct *ps, int depth)
 	prs_uint32("current_state", ps, depth, &(svc->current_state));
 	prs_uint32("controls_accepted", ps, depth, &(svc->controls_accepted));
 	prs_uint32("win32_exit_code", ps, depth, &(svc->win32_exit_code));
-	prs_uint32("svc_specific_exit_code", ps, depth, &(svc->svc_specific_exit_code));
+	prs_uint32("svc_specific_exit_code", ps, depth,
+		   &(svc->svc_specific_exit_code));
 	prs_uint32("check_point", ps, depth, &(svc->check_point));
 	prs_uint32("wait_hint", ps, depth, &(svc->wait_hint));
 
@@ -609,14 +669,15 @@ BOOL svc_io_svc_status(char *desc,  SVC_STATUS *svc, prs_struct *ps, int depth)
 /*******************************************************************
 makes an SVC_Q_QUERY_SVC_CONFIG structure.
 ********************************************************************/
-BOOL make_svc_q_query_svc_config(SVC_Q_QUERY_SVC_CONFIG *q_c, POLICY_HND *hnd,
-				uint32 buf_size)
+BOOL make_svc_q_query_svc_config(SVC_Q_QUERY_SVC_CONFIG * q_c,
+				 POLICY_HND *hnd, uint32 buf_size)
 {
-	if (q_c == NULL || hnd == NULL) return False;
+	if (q_c == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_svc_q_query_svc_config\n"));
+	DEBUG(5, ("make_svc_q_query_svc_config\n"));
 
-	memcpy(&(q_c->pol), hnd, sizeof(q_c->pol));
+	q_c->pol = *hnd;
 	q_c->buf_size = buf_size;
 
 	return True;
@@ -625,16 +686,18 @@ BOOL make_svc_q_query_svc_config(SVC_Q_QUERY_SVC_CONFIG *q_c, POLICY_HND *hnd,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_q_query_svc_config(char *desc,  SVC_Q_QUERY_SVC_CONFIG *q_u, prs_struct *ps, int depth)
+BOOL svc_io_q_query_svc_config(char *desc, SVC_Q_QUERY_SVC_CONFIG * q_u,
+			       prs_struct *ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_q_query_svc_config");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("", &(q_u->pol), ps, depth); 
+	smb_io_pol_hnd("", &(q_u->pol), ps, depth);
 	prs_align(ps);
 	prs_uint32("buf_size", ps, depth, &(q_u->buf_size));
 
@@ -644,15 +707,15 @@ BOOL svc_io_q_query_svc_config(char *desc,  SVC_Q_QUERY_SVC_CONFIG *q_u, prs_str
 /*******************************************************************
 makes an SVC_R_QUERY_SVC_CONFIG structure.
 ********************************************************************/
-BOOL make_svc_r_query_svc_config(SVC_R_QUERY_SVC_CONFIG *r_c, 
-				QUERY_SERVICE_CONFIG *cfg,
-				uint32 buf_size)
+BOOL make_svc_r_query_svc_config(SVC_R_QUERY_SVC_CONFIG * r_c,
+				 QUERY_SERVICE_CONFIG * cfg, uint32 buf_size)
 {
-	if (r_c == NULL) return False;
+	if (r_c == NULL)
+		return False;
 
-	DEBUG(5,("make_svc_r_query_svc_config\n"));
+	DEBUG(5, ("make_svc_r_query_svc_config\n"));
 
-	r_c->cfg      = cfg;
+	r_c->cfg = cfg;
 	r_c->buf_size = buf_size;
 
 	return True;
@@ -661,18 +724,20 @@ BOOL make_svc_r_query_svc_config(SVC_R_QUERY_SVC_CONFIG *r_c,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_r_query_svc_config(char *desc,  SVC_R_QUERY_SVC_CONFIG *r_u, prs_struct *ps, int depth)
+BOOL svc_io_r_query_svc_config(char *desc, SVC_R_QUERY_SVC_CONFIG * r_u,
+			       prs_struct *ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_r_query_svc_config");
 	depth++;
 
 	prs_align(ps);
 
-	svc_io_query_svc_cfg("cfg", r_u->cfg, ps, depth); 
+	svc_io_query_svc_cfg("cfg", r_u->cfg, ps, depth);
 	prs_uint32("buf_size", ps, depth, &(r_u->buf_size));
-	prs_uint32("status  ", ps, depth, &(r_u->status  ));
+	prs_uint32("status  ", ps, depth, &(r_u->status));
 
 	return True;
 }
@@ -680,19 +745,21 @@ BOOL svc_io_r_query_svc_config(char *desc,  SVC_R_QUERY_SVC_CONFIG *r_u, prs_str
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_q_query_disp_name(char *desc, SVC_Q_QUERY_DISP_NAME *q_u, prs_struct *ps, int depth)
+BOOL svc_io_q_query_disp_name(char *desc, SVC_Q_QUERY_DISP_NAME * q_u,
+			      prs_struct *ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_q_query_disp_name");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("", &(q_u->scman_pol), ps, depth); 
+	smb_io_pol_hnd("", &(q_u->scman_pol), ps, depth);
 	prs_align(ps);
 
-	smb_io_unistr2("uni_svc_name", &(q_u->uni_svc_name), 1, ps, depth); 
+	smb_io_unistr2("uni_svc_name", &(q_u->uni_svc_name), 1, ps, depth);
 	prs_align(ps);
 
 	prs_uint32("buf_size", ps, depth, &(q_u->buf_size));
@@ -703,20 +770,22 @@ BOOL svc_io_q_query_disp_name(char *desc, SVC_Q_QUERY_DISP_NAME *q_u, prs_struct
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_r_query_disp_name(char *desc, SVC_R_QUERY_DISP_NAME *r_u, prs_struct *ps, int depth)
+BOOL svc_io_r_query_disp_name(char *desc, SVC_R_QUERY_DISP_NAME * r_u,
+			      prs_struct *ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_r_query_disp_name");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_unistr2("uni_disp_name", &(r_u->uni_disp_name), 1, ps, depth); 
+	smb_io_unistr2("uni_disp_name", &(r_u->uni_disp_name), 1, ps, depth);
 	prs_align(ps);
 
 	prs_uint32("buf_size", ps, depth, &(r_u->buf_size));
-	prs_uint32("status  ", ps, depth, &(r_u->status  ));
+	prs_uint32("status  ", ps, depth, &(r_u->status));
 
 	return True;
 }
@@ -724,13 +793,14 @@ BOOL svc_io_r_query_disp_name(char *desc, SVC_R_QUERY_DISP_NAME *r_u, prs_struct
 /*******************************************************************
 makes an SVC_Q_CLOSE structure.
 ********************************************************************/
-BOOL make_svc_q_close(SVC_Q_CLOSE *q_c, POLICY_HND *hnd)
+BOOL make_svc_q_close(SVC_Q_CLOSE * q_c, POLICY_HND *hnd)
 {
-	if (q_c == NULL || hnd == NULL) return False;
+	if (q_c == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_svc_q_close\n"));
+	DEBUG(5, ("make_svc_q_close\n"));
 
-	memcpy(&(q_c->pol), hnd, sizeof(q_c->pol));
+	q_c->pol = *hnd;
 
 	return True;
 }
@@ -738,16 +808,17 @@ BOOL make_svc_q_close(SVC_Q_CLOSE *q_c, POLICY_HND *hnd)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_q_close(char *desc,  SVC_Q_CLOSE *q_u, prs_struct *ps, int depth)
+BOOL svc_io_q_close(char *desc, SVC_Q_CLOSE * q_u, prs_struct *ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_q_close");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("", &(q_u->pol), ps, depth); 
+	smb_io_pol_hnd("", &(q_u->pol), ps, depth);
 	prs_align(ps);
 
 	return True;
@@ -756,16 +827,17 @@ BOOL svc_io_q_close(char *desc,  SVC_Q_CLOSE *q_u, prs_struct *ps, int depth)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_r_close(char *desc,  SVC_R_CLOSE *r_u, prs_struct *ps, int depth)
+BOOL svc_io_r_close(char *desc, SVC_R_CLOSE * r_u, prs_struct *ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_r_close");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("", &(r_u->pol), ps, depth); 
+	smb_io_pol_hnd("", &(r_u->pol), ps, depth);
 	prs_align(ps);
 
 	prs_uint32("status", ps, depth, &(r_u->status));
@@ -776,33 +848,39 @@ BOOL svc_io_r_close(char *desc,  SVC_R_CLOSE *r_u, prs_struct *ps, int depth)
 /*******************************************************************
 makes an SVC_Q_CHANGE_SVC_CONFIG structure.
 ********************************************************************/
-BOOL make_svc_q_change_svc_config(SVC_Q_CHANGE_SVC_CONFIG *q_u, POLICY_HND *hnd,
-				uint32 service_type, uint32 start_type,
-				uint32 unknown_0,
-				uint32 error_control,
-				char* bin_path_name, char* load_order_grp, 
-				uint32 tag_id,
-				char* dependencies, char* service_start_name,
-				char* password,
-				char* disp_name)
+BOOL make_svc_q_change_svc_config(SVC_Q_CHANGE_SVC_CONFIG * q_u,
+				  POLICY_HND *hnd, uint32 service_type,
+				  uint32 start_type, uint32 unknown_0,
+				  uint32 error_control, char *bin_path_name,
+				  char *load_order_grp, uint32 tag_id,
+				  char *dependencies,
+				  char *service_start_name, char *password,
+				  char *disp_name)
 {
-	if (q_u == NULL || hnd == NULL) return False;
+	if (q_u == NULL || hnd == NULL)
+		return False;
 
-	DEBUG(5,("make_svc_q_change_svc_config\n"));
+	DEBUG(5, ("make_svc_q_change_svc_config\n"));
 
-	memcpy(&(q_u->pol), hnd, sizeof(q_u->pol));
+	q_u->pol = *hnd;
 
 	q_u->service_type = service_type;
 	q_u->start_type = start_type;
 	q_u->unknown_0 = unknown_0;
 	q_u->error_control = error_control;
-	make_buf_unistr2(&(q_u->uni_bin_path_name     ), &(q_u->ptr_bin_path_name     ), bin_path_name     );
-	make_buf_unistr2(&(q_u->uni_load_order_grp    ), &(q_u->ptr_load_order_grp    ), load_order_grp    );
+	make_buf_unistr2(&(q_u->uni_bin_path_name), &(q_u->ptr_bin_path_name),
+			 bin_path_name);
+	make_buf_unistr2(&(q_u->uni_load_order_grp),
+			 &(q_u->ptr_load_order_grp), load_order_grp);
 	q_u->tag_id = tag_id;
-	make_buf_unistr2(&(q_u->uni_dependencies      ), &(q_u->ptr_dependencies      ), dependencies      );
-	make_buf_unistr2(&(q_u->uni_service_start_name), &(q_u->ptr_service_start_name), service_start_name);
-	make_buf_string2(&(q_u->str_password          ), &(q_u->ptr_password          ), password          );
-	make_buf_unistr2(&(q_u->uni_display_name      ), &(q_u->ptr_display_name      ), disp_name         );
+	make_buf_unistr2(&(q_u->uni_dependencies), &(q_u->ptr_dependencies),
+			 dependencies);
+	make_buf_unistr2(&(q_u->uni_service_start_name),
+			 &(q_u->ptr_service_start_name), service_start_name);
+	make_buf_string2(&(q_u->str_password), &(q_u->ptr_password),
+			 password);
+	make_buf_unistr2(&(q_u->uni_display_name), &(q_u->ptr_display_name),
+			 disp_name);
 
 	return True;
 }
@@ -810,43 +888,58 @@ BOOL make_svc_q_change_svc_config(SVC_Q_CHANGE_SVC_CONFIG *q_u, POLICY_HND *hnd,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_q_change_svc_config(char *desc,  SVC_Q_CHANGE_SVC_CONFIG *q_u, prs_struct *ps, int depth)
+BOOL svc_io_q_change_svc_config(char *desc, SVC_Q_CHANGE_SVC_CONFIG * q_u,
+				prs_struct *ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_q_change_svc_config");
 	depth++;
 
 	prs_align(ps);
 
-	smb_io_pol_hnd("", &(q_u->pol), ps, depth); 
+	smb_io_pol_hnd("", &(q_u->pol), ps, depth);
 	prs_align(ps);
 
-	prs_uint32("service_type          ", ps, depth, &(q_u->service_type          ));
-	prs_uint32("start_type            ", ps, depth, &(q_u->start_type            ));
-	prs_uint32("unknown_0             ", ps, depth, &(q_u->unknown_0             ));
-	prs_uint32("error_control         ", ps, depth, &(q_u->error_control         ));
-	prs_uint32("ptr_bin_path_name     ", ps, depth, &(q_u->ptr_bin_path_name     ));
-	smb_io_unistr2("uni_bin_path_name     ", &(q_u->uni_bin_path_name     ), q_u->ptr_bin_path_name     , ps, depth); 
+	prs_uint32("service_type          ", ps, depth, &(q_u->service_type));
+	prs_uint32("start_type            ", ps, depth, &(q_u->start_type));
+	prs_uint32("unknown_0             ", ps, depth, &(q_u->unknown_0));
+	prs_uint32("error_control         ", ps, depth,
+		   &(q_u->error_control));
+	prs_uint32("ptr_bin_path_name     ", ps, depth,
+		   &(q_u->ptr_bin_path_name));
+	smb_io_unistr2("uni_bin_path_name     ", &(q_u->uni_bin_path_name),
+		       q_u->ptr_bin_path_name, ps, depth);
 	prs_align(ps);
 
-	prs_uint32("ptr_load_order_grp    ", ps, depth, &(q_u->ptr_load_order_grp    ));
-	smb_io_unistr2("uni_load_order_grp    ", &(q_u->uni_load_order_grp    ), q_u->ptr_load_order_grp    , ps, depth); 
+	prs_uint32("ptr_load_order_grp    ", ps, depth,
+		   &(q_u->ptr_load_order_grp));
+	smb_io_unistr2("uni_load_order_grp    ", &(q_u->uni_load_order_grp),
+		       q_u->ptr_load_order_grp, ps, depth);
 	prs_align(ps);
-	prs_uint32("tag_id                ", ps, depth, &(q_u->tag_id                ));
-	prs_uint32("ptr_dependencies      ", ps, depth, &(q_u->ptr_dependencies      ));
-	smb_io_unistr2("uni_dependencies      ", &(q_u->uni_dependencies      ), q_u->ptr_dependencies      , ps, depth); 
+	prs_uint32("tag_id                ", ps, depth, &(q_u->tag_id));
+	prs_uint32("ptr_dependencies      ", ps, depth,
+		   &(q_u->ptr_dependencies));
+	smb_io_unistr2("uni_dependencies      ", &(q_u->uni_dependencies),
+		       q_u->ptr_dependencies, ps, depth);
 	prs_align(ps);
-	prs_uint32("ptr_service_start_name", ps, depth, &(q_u->ptr_service_start_name));
-	smb_io_unistr2("uni_service_start_name", &(q_u->uni_service_start_name), q_u->ptr_service_start_name, ps, depth); 
+	prs_uint32("ptr_service_start_name", ps, depth,
+		   &(q_u->ptr_service_start_name));
+	smb_io_unistr2("uni_service_start_name",
+		       &(q_u->uni_service_start_name),
+		       q_u->ptr_service_start_name, ps, depth);
 	prs_align(ps);
-	prs_uint32("ptr_password          ", ps, depth, &(q_u->ptr_password          ));
+	prs_uint32("ptr_password          ", ps, depth, &(q_u->ptr_password));
 
-	smb_io_string2("str_password          ", &(q_u->str_password          ), q_u->ptr_display_name      , ps, depth); 
+	smb_io_string2("str_password          ", &(q_u->str_password),
+		       q_u->ptr_display_name, ps, depth);
 	prs_align(ps);
 
-	prs_uint32("ptr_display_name      ", ps, depth, &(q_u->ptr_display_name      ));
-	smb_io_unistr2("uni_display_name      ", &(q_u->uni_display_name      ), q_u->ptr_display_name      , ps, depth); 
+	prs_uint32("ptr_display_name      ", ps, depth,
+		   &(q_u->ptr_display_name));
+	smb_io_unistr2("uni_display_name      ", &(q_u->uni_display_name),
+		       q_u->ptr_display_name, ps, depth);
 	prs_align(ps);
 
 	return True;
@@ -855,12 +948,13 @@ BOOL svc_io_q_change_svc_config(char *desc,  SVC_Q_CHANGE_SVC_CONFIG *q_u, prs_s
 /*******************************************************************
 makes an SVC_R_CHANGE_SVC_CONFIG structure.
 ********************************************************************/
-BOOL make_svc_r_change_svc_config(SVC_R_CHANGE_SVC_CONFIG *r_c, 
-				uint32 unknown_0, uint32 status)
+BOOL make_svc_r_change_svc_config(SVC_R_CHANGE_SVC_CONFIG * r_c,
+				  uint32 unknown_0, uint32 status)
 {
-	if (r_c == NULL) return False;
+	if (r_c == NULL)
+		return False;
 
-	DEBUG(5,("make_svc_r_change_svc_config\n"));
+	DEBUG(5, ("make_svc_r_change_svc_config\n"));
 
 	r_c->unknown_0 = unknown_0;
 	r_c->status = status;
@@ -871,9 +965,11 @@ BOOL make_svc_r_change_svc_config(SVC_R_CHANGE_SVC_CONFIG *r_c,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_r_change_svc_config(char *desc,  SVC_R_CHANGE_SVC_CONFIG *r_u, prs_struct *ps, int depth)
+BOOL svc_io_r_change_svc_config(char *desc, SVC_R_CHANGE_SVC_CONFIG * r_u,
+				prs_struct *ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_r_change_svc_config");
 	depth++;
@@ -881,7 +977,7 @@ BOOL svc_io_r_change_svc_config(char *desc,  SVC_R_CHANGE_SVC_CONFIG *r_u, prs_s
 	prs_align(ps);
 
 	prs_uint32("unknown_0", ps, depth, &(r_u->unknown_0));
-	prs_uint32("status   ", ps, depth, &(r_u->status   ));
+	prs_uint32("status   ", ps, depth, &(r_u->status));
 
 	return True;
 }
@@ -889,10 +985,11 @@ BOOL svc_io_r_change_svc_config(char *desc,  SVC_R_CHANGE_SVC_CONFIG *r_u, prs_s
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_q_unknown_3(char *desc, SVC_Q_UNKNOWN_3 *q_u,
+BOOL svc_io_q_unknown_3(char *desc, SVC_Q_UNKNOWN_3 * q_u,
 			prs_struct *ps, int depth)
 {
-	if (q_u == NULL) return False;
+	if (q_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_q_unknown_3");
 	depth++;
@@ -905,10 +1002,11 @@ BOOL svc_io_q_unknown_3(char *desc, SVC_Q_UNKNOWN_3 *q_u,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-BOOL svc_io_r_unknown_3(char *desc, SVC_R_UNKNOWN_3 *r_u,
+BOOL svc_io_r_unknown_3(char *desc, SVC_R_UNKNOWN_3 * r_u,
 			prs_struct *ps, int depth)
 {
-	if (r_u == NULL) return False;
+	if (r_u == NULL)
+		return False;
 
 	prs_debug(ps, depth, desc, "svc_io_r_unknown_3");
 	depth++;