r4972: Fix a warning and some debugging-outputs.

Guenther
(This used to be commit 1eabfa050b661168b42892c2d841c7891e59cf5f)

5 files changed, 8 insertions, 8 deletions

diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index 4d2fb23002..2633cc92c3 100644
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.c
@@ -241,7 +241,7 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context,
 	unbecome_root();
 
 	if (ret == False) {
-		DEBUG(3,("check_sam_security: Couldn't find user '%s' in passdb file.\n", user_info->internal_username.str));
+		DEBUG(3,("check_sam_security: Couldn't find user '%s' in passdb.\n", user_info->internal_username.str));
 		pdb_free_sam(&sampass);
 		return NT_STATUS_NO_SUCH_USER;
 	}
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 612e69a813..122bde1be5 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -3123,7 +3123,7 @@ NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SE
 	
 	can_add_machines = user_has_privileges( p->pipe_user.nt_user_token, &se_machineop );
 	
-	DEBUG(5, ("_samr_create_user: %s is%s a member of the Domain Admins group\n",
+	DEBUG(5, ("_samr_set_userinfo: %s is%s a member of the Domain Admins group\n",
 		p->pipe_user_name, can_add_machines ? "" : " not"));
 
 	/* ================ BEGIN SeMachineAccountPrivilege BLOCK ================ */
diff --git a/source3/utils/net_help.c b/source3/utils/net_help.c
index 328e134459..60206429b7 100644
--- a/source3/utils/net_help.c
+++ b/source3/utils/net_help.c
@@ -132,7 +132,7 @@ int net_help_share(int argc, const char **argv)
 	"[misc. options] [targets]"
 	"\n\tshows a list of all shares together with all users allowed to"
 	"\n\taccess them. This needs the output of 'net usersidlist' on"
-	"\n\tstdin or in <filename>.\n"
+	"\n\tstdin or in <filename>.\n\n"
 	 "net [<method>] share MIGRATE FILES <sharename> [misc. options] [targets]"
 	 "\n\tMigrates files from remote to local server\n\n"
 	 "net [<method>] share MIGRATE SHARES <sharename> [misc. options] [targets]"
diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index f7ebd94f34..7abb31ab3d 100644
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -288,7 +288,7 @@ static int net_idmap_delete(int argc, const char **argv)
 
 int net_help_idmap(int argc, const char **argv)
 {
-	d_printf("net idmap dump filename"\
+	d_printf("net idmap dump <tdbfile>"\
 		 "\n  Dump current id mapping\n");
 
 	d_printf("net idmap restore"\
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 430649d81b..76b53d6113 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -404,7 +404,7 @@ rpc_info_internals(const DOM_SID *domain_sid, const char *domain_name,
 		TALLOC_CTX *ctx = talloc_init("rpc_info_internals");
 		d_printf("Domain Name: %s\n", unistr2_tdup(ctx, &ctr.info.inf2.uni_domain));
 		d_printf("Domain SID: %s\n", sid_str);
-		d_printf("Sequence number: %u\n", ctr.info.inf2.seq_num);
+		d_printf("Sequence number: %u\n", ctr.info.inf2.seq_num.low);
 		d_printf("Num users: %u\n", ctr.info.inf2.num_domain_usrs);
 		d_printf("Num domain groups: %u\n", ctr.info.inf2.num_domain_grps);
 		d_printf("Num local groups: %u\n", ctr.info.inf2.num_local_grps);
@@ -1428,7 +1428,7 @@ rpc_alias_add_internals(const DOM_SID *domain_sid, const char *domain_name,
 	ALIAS_INFO_CTR alias_info;
 
 	if (argc != 1) {
-		d_printf("Group name must be specified\n");
+		d_printf("Alias name must be specified\n");
 		rpc_group_usage(argc, argv);
 		return NT_STATUS_OK;
 	}
@@ -1465,9 +1465,9 @@ rpc_alias_add_internals(const DOM_SID *domain_sid, const char *domain_name,
 	
  done:
 	if (NT_STATUS_IS_OK(result))
-		DEBUG(5, ("add group succeeded\n"));
+		DEBUG(5, ("add alias succeeded\n"));
 	else
-		d_printf("add group failed: %s\n", nt_errstr(result));
+		d_printf("add alias failed: %s\n", nt_errstr(result));
 
 	return result;
 }