svn commit: samba r21114 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_24/source/utils

[vlendec at samba.org]

Author: vlendec
Date: 2007-02-01 16:22:07 +0000 (Thu, 01 Feb 2007)
New Revision: 21114

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

Log:
Fix 'net usershare': Adding "guest_ok=y" required a correct acl. Set the
default if "" is set. And fix the calculation for too man shares.

Thanks to Karolin Seeger <ks at sernet.de>

Volker


Modified:
   branches/SAMBA_3_0/source/utils/net_usershare.c
   branches/SAMBA_3_0_24/source/utils/net_usershare.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_usershare.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_usershare.c	2007-02-01 15:29:24 UTC (rev 21113)
+++ branches/SAMBA_3_0/source/utils/net_usershare.c	2007-02-01 16:22:07 UTC (rev 21114)
@@ -568,6 +568,9 @@
 			us_path = argv[1];
 			us_comment = argv[2];
 			arg_acl = argv[3];
+			if (strlen(arg_acl) == 0) {
+				arg_acl = "S-1-1-0:R";
+			}
 			if (!strnequal(argv[4], "guest_ok=", 9)) {
 				return net_usershare_add_usage(argc, argv);
 			}
@@ -588,10 +591,9 @@
 
 	/* Ensure we're under the "usershare max shares" number. Advisory only. */
 	num_usershares = count_num_usershares();
-	if (num_usershares > lp_usershare_max_shares()) {
-		d_fprintf(stderr, "net usershare add: too many usershares already defined (%d), "
-			"maximum number allowed is %d.\n",
-			num_usershares, lp_usershare_max_shares() );
+	if (num_usershares >= lp_usershare_max_shares()) {
+		d_fprintf(stderr, "net usershare add: maximum number of allowed usershares (%d) reached\n",
+			lp_usershare_max_shares() );
 		SAFE_FREE(sharename);
 		return -1;
 	}

Modified: branches/SAMBA_3_0_24/source/utils/net_usershare.c
===================================================================
--- branches/SAMBA_3_0_24/source/utils/net_usershare.c	2007-02-01 15:29:24 UTC (rev 21113)
+++ branches/SAMBA_3_0_24/source/utils/net_usershare.c	2007-02-01 16:22:07 UTC (rev 21114)
@@ -568,6 +568,9 @@
 			us_path = argv[1];
 			us_comment = argv[2];
 			arg_acl = argv[3];
+			if (strlen(arg_acl) == 0) {
+				arg_acl = "S-1-1-0:R";
+			}
 			if (!strnequal(argv[4], "guest_ok=", 9)) {
 				return net_usershare_add_usage(argc, argv);
 			}
@@ -588,10 +591,9 @@
 
 	/* Ensure we're under the "usershare max shares" number. Advisory only. */
 	num_usershares = count_num_usershares();
-	if (num_usershares > lp_usershare_max_shares()) {
-		d_fprintf(stderr, "net usershare add: too many usershares already defined (%d), "
-			"maximum number allowed is %d.\n",
-			num_usershares, lp_usershare_max_shares() );
+	if (num_usershares >= lp_usershare_max_shares()) {
+		d_fprintf(stderr, "net usershare add: maximum number of allowed usershares (%d) reached\n",
+			lp_usershare_max_shares() );
 		SAFE_FREE(sharename);
 		return -1;
 	}