svn commit: samba r4972 - branches/SAMBA_3_0/source/auth
branches/SAMBA_3_0/source/rpc_server
branches/SAMBA_3_0/source/utils trunk/source/auth
trunk/source/rpc_server trunk/source/utils
gd at samba.org
gd at samba.org
Tue Jan 25 01:19:03 GMT 2005
Author: gd
Date: 2005-01-25 01:19:02 +0000 (Tue, 25 Jan 2005)
New Revision: 4972
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4972
Log:
Fix a warning and some debugging-outputs.
Guenther
Modified:
branches/SAMBA_3_0/source/auth/auth_sam.c
branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c
branches/SAMBA_3_0/source/utils/net_help.c
branches/SAMBA_3_0/source/utils/net_idmap.c
branches/SAMBA_3_0/source/utils/net_rpc.c
trunk/source/auth/auth_sam.c
trunk/source/rpc_server/srv_samr_nt.c
trunk/source/utils/net_help.c
trunk/source/utils/net_idmap.c
trunk/source/utils/net_rpc.c
Changeset:
Modified: branches/SAMBA_3_0/source/auth/auth_sam.c
===================================================================
--- branches/SAMBA_3_0/source/auth/auth_sam.c 2005-01-24 20:48:13 UTC (rev 4971)
+++ branches/SAMBA_3_0/source/auth/auth_sam.c 2005-01-25 01:19:02 UTC (rev 4972)
@@ -241,7 +241,7 @@
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;
}
Modified: branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c 2005-01-24 20:48:13 UTC (rev 4971)
+++ branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c 2005-01-25 01:19:02 UTC (rev 4972)
@@ -3123,7 +3123,7 @@
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 ================ */
Modified: branches/SAMBA_3_0/source/utils/net_help.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_help.c 2005-01-24 20:48:13 UTC (rev 4971)
+++ branches/SAMBA_3_0/source/utils/net_help.c 2005-01-25 01:19:02 UTC (rev 4972)
@@ -132,7 +132,7 @@
"[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]"
Modified: branches/SAMBA_3_0/source/utils/net_idmap.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_idmap.c 2005-01-24 20:48:13 UTC (rev 4971)
+++ branches/SAMBA_3_0/source/utils/net_idmap.c 2005-01-25 01:19:02 UTC (rev 4972)
@@ -288,7 +288,7 @@
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"\
Modified: branches/SAMBA_3_0/source/utils/net_rpc.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_rpc.c 2005-01-24 20:48:13 UTC (rev 4971)
+++ branches/SAMBA_3_0/source/utils/net_rpc.c 2005-01-25 01:19:02 UTC (rev 4972)
@@ -404,7 +404,7 @@
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 @@
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 @@
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;
}
Modified: trunk/source/auth/auth_sam.c
===================================================================
--- trunk/source/auth/auth_sam.c 2005-01-24 20:48:13 UTC (rev 4971)
+++ trunk/source/auth/auth_sam.c 2005-01-25 01:19:02 UTC (rev 4972)
@@ -241,7 +241,7 @@
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;
}
Modified: trunk/source/rpc_server/srv_samr_nt.c
===================================================================
--- trunk/source/rpc_server/srv_samr_nt.c 2005-01-24 20:48:13 UTC (rev 4971)
+++ trunk/source/rpc_server/srv_samr_nt.c 2005-01-25 01:19:02 UTC (rev 4972)
@@ -3123,7 +3123,7 @@
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 ================ */
Modified: trunk/source/utils/net_help.c
===================================================================
--- trunk/source/utils/net_help.c 2005-01-24 20:48:13 UTC (rev 4971)
+++ trunk/source/utils/net_help.c 2005-01-25 01:19:02 UTC (rev 4972)
@@ -132,7 +132,7 @@
"[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]"
Modified: trunk/source/utils/net_idmap.c
===================================================================
--- trunk/source/utils/net_idmap.c 2005-01-24 20:48:13 UTC (rev 4971)
+++ trunk/source/utils/net_idmap.c 2005-01-25 01:19:02 UTC (rev 4972)
@@ -288,7 +288,7 @@
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"\
Modified: trunk/source/utils/net_rpc.c
===================================================================
--- trunk/source/utils/net_rpc.c 2005-01-24 20:48:13 UTC (rev 4971)
+++ trunk/source/utils/net_rpc.c 2005-01-25 01:19:02 UTC (rev 4972)
@@ -404,7 +404,7 @@
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 @@
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 @@
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;
}
More information about the samba-cvs
mailing list