summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-05-19 04:23:04 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:22:14 -0500
commite61f235796ff2da34fb207f48e2bba832c30740b (patch)
tree1a791f16920fdfb557975d197fdcc0ee68428ee0
parent63e74f305920a44606d1b0380c605e00fca14940 (diff)
downloadsamba-e61f235796ff2da34fb207f48e2bba832c30740b.tar.gz
samba-e61f235796ff2da34fb207f48e2bba832c30740b.tar.bz2
samba-e61f235796ff2da34fb207f48e2bba832c30740b.zip
r23009: Both contains a strchr_m(server,'/') few lines after replacing all / with \.
This patch removes this dead code. Patch from Pascal Terjan <pterjan@mandriva.com> for bug #2313. (This used to be commit 04b84baef344206d97776e04a25f4bd214eea28f)
-rw-r--r--source3/utils/smbcacls.c7
-rw-r--r--source3/utils/smbcquotas.c7
2 files changed, 4 insertions, 10 deletions
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 67de8c7335..5717df2dfa 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -902,11 +902,8 @@ static struct cli_state *connect_one(const char *share)
fstrcpy(server,path+2);
share = strchr_m(server,'\\');
if (!share) {
- share = strchr_m(server,'/');
- if (!share) {
- printf("Invalid argument: %s\n", share);
- return -1;
- }
+ printf("Invalid argument: %s\n", share);
+ return -1;
}
*share = 0;
diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index 40f4a86f96..ae2e6a5956 100644
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -500,11 +500,8 @@ FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT", "SETSTRING" },
pstrcpy(server,path+2);
share = strchr_m(server,'\\');
if (!share) {
- share = strchr_m(server,'/');
- if (!share) {
- printf("Invalid argument: %s\n", share);
- exit(EXIT_PARSE_ERROR);
- }
+ printf("Invalid argument: %s\n", share);
+ exit(EXIT_PARSE_ERROR);
}
*share = 0;