r4972: Fix a warning and some debugging-outputs.

Guenther

diff --git a/source/auth/auth_sam.c b/source/auth/auth_sam.c
index 4d2fb23002748a1156c06139698edd63812f79e8..2633cc92c37184a4b1884794e6fafe5ab93552b3 100644 (file)
--- a/source/auth/auth_sam.c
+++ b/source/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/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index 612e69a8135b71a894577e05f10b2f904034a37a..122bde1be59d191f7b14dd9d19a963b08d24a94b 100644 (file)
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/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/source/utils/net_help.c b/source/utils/net_help.c
index 328e13445917e0073087e9b13a9604bc0db73bb5..60206429b7ed6b9701315e2a4cae0eef8dca02cb 100644 (file)
--- a/source/utils/net_help.c
+++ b/source/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/source/utils/net_idmap.c b/source/utils/net_idmap.c
index f7ebd94f346fff166c647a0699e60bf892f8c2f7..7abb31ab3d98fdd20cd6a72f067539bb37b7a3fe 100644 (file)
--- a/source/utils/net_idmap.c
+++ b/source/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/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 430649d81bb70722e5f28f73f4cf8806c6922444..76b53d611369fd46f57bdb1a3c036541f14268e4 100644 (file)
--- a/source/utils/net_rpc.c
+++ b/source/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;
 }