summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2005-06-24 14:15:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:57:59 -0500
commit57fa9dbfe7c69b0370e6f3ae8a82d9b6d391ef6b (patch)
tree2c46edf13b6ffe76c1eebde683b686f7a08c71c0
parent63c78a5e700f092a0fe93b1be08637474445470c (diff)
downloadsamba-57fa9dbfe7c69b0370e6f3ae8a82d9b6d391ef6b.tar.gz
samba-57fa9dbfe7c69b0370e6f3ae8a82d9b6d391ef6b.tar.bz2
samba-57fa9dbfe7c69b0370e6f3ae8a82d9b6d391ef6b.zip
r7876: Now that we have "net rpc share migrate security" completly remove the
share-acl from "net rpc share migrate shares". God, how ugly does this syntax get. Guenther (This used to be commit 6f4d4acc868ee67f8434d904fa51c57d1b847135)
-rw-r--r--source3/utils/net_rpc.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index cd87d668fd..cf45216b6e 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -2850,18 +2850,15 @@ rpc_share_migrate_shares_internals(const DOM_SID *domain_sid, const char *domain
/* finally add the share on the dst server */
- printf("migrating: [%s], path: %s, comment: %s, %s share-ACLs\n",
- netname, path, remark, opt_acls ? "including" : "without" );
-
- if (opt_verbose && opt_acls)
- display_sec_desc(ctr_src.share.info502[i].info_502_str.sd);
+ printf("migrating: [%s], path: %s, comment: %s, without share-ACLs\n",
+ netname, path, remark);
result = cli_srvsvc_net_share_add(cli_dst, mem_ctx, netname, type, remark,
ctr_src.share.info502[i].info_502.perms,
ctr_src.share.info502[i].info_502.max_uses,
ctr_src.share.info502[i].info_502.num_uses,
path, password, level,
- opt_acls? ctr_src.share.info502[i].info_502_str.sd : NULL);
+ NULL);
if (W_ERROR_V(result) == W_ERROR_V(WERR_ALREADY_EXISTS)) {
printf(" [%s] does already exist\n", netname);