diff options
| author | Gerald Carter <jerry@samba.org> | 2005-01-26 21:06:48 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-01-26 21:06:48 +0000 |
| commit | d9abdd45339e2d65445a1fd685cb0294729ac4e7 (patch) | |
| tree | ef5e8cff95f9ffda2e7c29ff1790dd705c250fd7 /source/utils | |
| parent | 4b3500c58d177e2b48e6e04e027efffd4d079d8a (diff) | |
| download | samba-d9abdd45339e2d65445a1fd685cb0294729ac4e7.tar.gz | |
r5021: Starting to look at final code for 3.0.11rc1.
Set VERSION and merged important and/or low risk
fixes from 3_0
svn merge -r4905:4907 $SVNURL/branches/SAMBA_3_0
svn merge -r4907:4913 $SVNURL/branches/SAMBA_3_0
svn merge -r4932:4933 $SVNURL/branches/SAMBA_3_0
svn merge -r4933:4946 $SVNURL/branches/SAMBA_3_0
svn merge -r4946:4963 $SVNURL/branches/SAMBA_3_0
svn merge -r4963:4964 $SVNURL/branches/SAMBA_3_0
svn merge -r4964:4965 $SVNURL/branches/SAMBA_3_0
svn merge -r4965:4966 $SVNURL/branches/SAMBA_3_0
svn merge -r4966:4967 $SVNURL/branches/SAMBA_3_0
svn merge -r4967:4970 $SVNURL/branches/SAMBA_3_0
svn merge -r4972:4976 $SVNURL/branches/SAMBA_3_0
svn merge -r4970:4972 $SVNURL/branches/SAMBA_3_0
svn merge -r4976:4988 $SVNURL/branches/SAMBA_3_0
svn merge -r4988:4989 $SVNURL/branches/SAMBA_3_0
svn merge -r4994:4995 $SVNURL/branches/SAMBA_3_0
svn merge -r4995:4996 $SVNURL/branches/SAMBA_3_0
svn merge -r5000:5002 $SVNURL/branches/SAMBA_3_0
svn merge -r5002:5012 $SVNURL/branches/SAMBA_3_0
svn merge -r5012:5014 $SVNURL/branches/SAMBA_3_0
svn merge -r5014:5015 $SVNURL/branches/SAMBA_3_0
Diffstat (limited to 'source/utils')
| -rw-r--r-- | source/utils/net_help.c | 2 | ||||
| -rw-r--r-- | source/utils/net_idmap.c | 2 | ||||
| -rw-r--r-- | source/utils/net_rpc.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/utils/net_help.c b/source/utils/net_help.c index 328e1344591..60206429b7e 100644 --- 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 f7ebd94f346..7abb31ab3d9 100644 --- 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 430649d81bb..76b53d61136 100644 --- 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; } |