svn commit: samba r7876 - branches/SAMBA_3_0/source/utils trunk/source/utils

[gd at samba.org]

Author: gd
Date: 2005-06-24 14:15:31 +0000 (Fri, 24 Jun 2005)
New Revision: 7876

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7876

Log:
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


Modified:
   branches/SAMBA_3_0/source/utils/net_rpc.c
   trunk/source/utils/net_rpc.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_rpc.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_rpc.c	2005-06-24 09:55:34 UTC (rev 7875)
+++ branches/SAMBA_3_0/source/utils/net_rpc.c	2005-06-24 14:15:31 UTC (rev 7876)
@@ -2850,18 +2850,15 @@
 
 		/* 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" );
+		printf("migrating: [%s], path: %s, comment: %s, without share-ACLs\n", 
+			netname, path, remark);
 
-		if (opt_verbose && opt_acls)
-			display_sec_desc(ctr_src.share.info502[i].info_502_str.sd);
-
 		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);

Modified: trunk/source/utils/net_rpc.c
===================================================================
--- trunk/source/utils/net_rpc.c	2005-06-24 09:55:34 UTC (rev 7875)
+++ trunk/source/utils/net_rpc.c	2005-06-24 14:15:31 UTC (rev 7876)
@@ -2850,18 +2850,15 @@
 
 		/* 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" );
+		printf("migrating: [%s], path: %s, comment: %s, without share-ACLs\n", 
+			netname, path, remark);
 
-		if (opt_verbose && opt_acls)
-			display_sec_desc(ctr_src.share.info502[i].info_502_str.sd);
-
 		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);