Package: rssh / 2.3.4-5+deb9u4

0008-Add-support-for-Subversion-svnserve.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
From: Davide Scola <davide.scola@gmail.com>
Date: Sat, 7 Dec 2013 18:32:56 -0800
Subject: Add support for Subversion (svnserve)

Adds support for svn access via svnserve.  This adds an additional
field to the bitmask in /etc/rssh.conf that's used to control Subversion
access.  Users authorized to run svnserve may run only svnserve -t
exactly.

Debian Bug#284756

Signed-off-by: Russ Allbery <rra@debian.org>
---
 conf_convert         | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 conf_convert.sh      | 45 ---------------------------------------------
 configure.ac         | 22 ++++++++++++++++++++--
 main.c.in            |  5 ++++-
 pathnames.h.in       |  1 +
 rssh.conf.5          | 17 +++++++++++------
 rssh.conf.5.in       | 17 +++++++++++------
 rssh.conf.default    | 28 +++++++++++++++-------------
 rssh.h               | 13 +++++++------
 rssh_chroot_helper.c |  3 +++
 rsshconf.c           | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
 util.c               | 35 ++++++++++++++++++++++++++---------
 util.h               |  3 ++-
 13 files changed, 194 insertions(+), 93 deletions(-)
 create mode 100644 conf_convert
 delete mode 100755 conf_convert.sh

diff --git a/conf_convert b/conf_convert
new file mode 100755
index 0000000..a47ecba
--- /dev/null
+++ b/conf_convert
@@ -0,0 +1,48 @@
+#!/usr/bin/awk -f
+#
+# conf_convert - convert rssh  config files  from 2.0, 2.1.1, 2.2 format
+#                to  rssh  2.3.2  format config  files  adding  svnserve
+#                support
+#
+# Copyright (C) 2009 Davide Scola <davide.scola@gmail.com>
+#
+# This program is  free software; you can redistribute  it and/or modify
+# it under the  terms of the GNU General Public  License as published by
+# the Free  Software Foundation; either  version 2, or (at  your option)
+# any later version.
+#
+# This  program is  distributed  in the  hope that  it  will be  useful,
+# but  WITHOUT  ANY  WARRANTY;  without even  the  implied  warranty  of
+# MERCHANTABILITY  or FITNESS  FOR A  PARTICULAR PURPOSE.   See the  GNU
+# General Public License for more details.
+#
+# You should  have received  a copy  of the  GNU General  Public License
+# along  with  this  program;  if   not,  write  to  the  Free  Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+#
+BEGIN {
+	FS = OFS = ":";
+}
+
+{
+	if( /^[# ]*user *= */ && match($3, /^([01]+)/) ) {
+		gsub(/^([01]+)/, replaceString( RLENGTH ), $3);
+	}
+
+	print
+}
+
+function replaceString(nitems) {
+	str = "&";
+
+	if(nitems == 2) { # config < v2.2
+		str = "000&0";
+	}
+
+	else if(nitems == 5) { # v2.2 <= config <= v2.3.2 (vanilla)
+		str = "&0";
+	}
+
+	return str;
+}
+
diff --git a/conf_convert.sh b/conf_convert.sh
deleted file mode 100755
index fb0c999..0000000
--- a/conf_convert.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-# conf_convert.sh - convert rssh config files from 2.0 - 2.1.1 format to rssh
-#                   version 2.2 format config files.
-
-if [ -z "$TMPDIR" ]; then
-	TMPDIR=/tmp
-fi
-
-tempdir=`mktemp -d "$TMPDIR/confconv.tempXXXXXX"`
-if [ ! -d "$tempdir" ]; then
-	echo "$0: unable to make temporary directory"
-	exit 1
-fi
-
-if [ "$#" != "0"  ]; then
-
-	while [ -n "$1" ]; do
-
-		if [ ! -f "$1" ]; then
-			echo "$0: $1 does not exist.  Skipping." >&2
-			continue
-		fi
-
-		sed 's/^\([# ]*user *= *.*:\)\([01][01][^0-9"'\''].*\)$/\1000\2/' $1 > "$tempdir/tempconf"
-
-		mv "$tempdir/tempconf" "$1.NEW"
-		shift
-	done
-
-else
-	if [ ! -f /etc/rssh.conf ]; then
-		echo "/etc/rssh.conf does not exist, and no parameters given." >&2
-		exit 2
-	fi
-
-	sed 's/^\([# ]*user *= *.*:\)\([01][01][^0-9"'\''].*\)$/\1000\2/' /etc/rssh.conf > "$tempdir/tempconf"
-		
-	mv "$tempdir/tempconf" "/etc/rssh.conf.NEW"
-
-fi
-
-rm -rf "$tempdir"
-
-exit 0
diff --git a/configure.ac b/configure.ac
index ab145b4..caeae7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,8 +117,8 @@ if ! test -x "$sftp_path"; then
 fi
 
 
-# CVS, rdist, and rsync might not be installed.  But we don't want to force
-# the user to configure bogus paths, so default to /usr/bin/*
+# CVS, rdist, rsync and svnserve might not be installed.  But we don't want
+# to force the user to configure bogus paths, so default to /usr/bin/*
 
 # Check for cvs binary
 
@@ -170,6 +170,23 @@ if ! test -x "$rsync_path"; then
 fi
 
 
+# Check for svnserve binary
+
+AC_ARG_WITH(svnserve,
+[  --with-svnserve              specify path to svnserve binary],
+[svnserve_path="$withval"], [svnserve_path=""])
+
+AC_PATH_PROG(svnserve_path, svnserve, [], [])
+if test -z "$svnserve_path"; then
+        AC_MSG_WARN([can't find svnserve - using /usr/bin/svnserve.  Use --with-svnserve to override])
+        svnserve_path=/usr/bin/svnserve
+fi
+
+if ! test -x "$svnserve_path"; then
+        AC_MSG_WARN([specified svnserve binary does not exist])
+fi
+
+
 # disable static configuration
 
 AC_ARG_ENABLE(static, 
@@ -200,6 +217,7 @@ AC_SUBST(sftp_path)
 AC_SUBST(cvs_path)
 AC_SUBST(rdist_path)
 AC_SUBST(rsync_path)
+AC_SUBST(svnserve_path)
 AC_SUBST(prefix)
 AC_SUBST(sysconfdir)
 AC_SUBST(libexecdir)
diff --git a/main.c.in b/main.c.in
index 7d1695c..b3228e5 100644
--- a/main.c.in
+++ b/main.c.in
@@ -217,6 +217,8 @@ char **build_shell_args( struct passwd uinfo,
 			argvec[1] = "4";
 		else if ( !(strcmp(*cmd, PATH_RSYNC)) )
 			argvec[1] = "5";
+		else if ( !(strcmp(*cmd, PATH_SVNSERVE)) )
+			argvec[1] = "6";
 		else {
 			log_set_priority(LOG_ERR);
 			log_msg("fatal error identifying the correct command "
@@ -267,7 +269,8 @@ void vers_info( void )
 	printf("%20s = %s\n", "sftp server binary", PATH_SFTP_SERVER);
 	printf("%20s = %s\n", "cvs binary path", PATH_CVS);
 	printf("%20s = %s\n", "rdist binary path", PATH_RDIST);
-	printf("%20s = %s\n\n", "rsync binary path", PATH_RSYNC);
+	printf("%20s = %s\n", "rsync binary path", PATH_RSYNC);
+	printf("%20s = %s\n\n", "svnserve binary path", PATH_SVNSERVE);
 }
 
 
diff --git a/pathnames.h.in b/pathnames.h.in
index 17e2fb7..043d7ae 100644
--- a/pathnames.h.in
+++ b/pathnames.h.in
@@ -36,6 +36,7 @@
 #define PATH_CVS		"@cvs_path@"
 #define PATH_RDIST		"@rdist_path@"
 #define PATH_RSYNC		"@rsync_path@"
+#define PATH_SVNSERVE		"@svnserve_path@"
 
 /* these generally are overridden by the makefile */
 #ifndef PATH_RSSH_CONFIG
diff --git a/rssh.conf.5 b/rssh.conf.5
index 5556468..227ef88 100644
--- a/rssh.conf.5
+++ b/rssh.conf.5
@@ -49,6 +49,11 @@ Tells the shell that rdist is allowed.
 Tells the shell that rsync is allowed.
 .RE
 .P
+.B allowsvnserve
+.RS
+Tells the shell that svnserve is allowed.
+.RE
+.P
 .B umask
 .RS
 Sets the umask value for file creations in the scp/sftp session.  This is
@@ -122,9 +127,9 @@ The umask for this user, in octal, just as it would be specified to the shell
 .RE
 .B access bits
 .RS
-Five binary digits, which indicate whether the user is allowed to use rsync,
-rdist, cvs, sftp, and scp, in that order.  One means the command is allowed,
-zero means it is not.
+Six binary digits, which indicate whether the user is allowed to use rsync,
+rdist, cvs, sftp, scp and svnserve, in that order.  One means the command is
+allowed, zero means it is not.
 .RE
 .B path
 .RS
@@ -135,7 +140,7 @@ details.
 .P
 For example, you might have something like this:
 .P
-user = luser:022:00001:
+user = luser:022:000010:
 .P
 This does the following: for the user with the username "luser", set the umask
 to 022, disallow sftp, and allow scp.  Because there is no chroot path
@@ -148,13 +153,13 @@ path explicitly, even if it should be the same as that set using the
 chrootpath keyword.  Remember that if there are spaces in the path, you need
 to quote it, something like this:
 .P
-user = "luser:022:00001:/usr/local/chroot dir"
+user = "luser:022:000010:/usr/local/chroot dir"
 .P
 See the default rssh.conf file for more examples.
 .RE
 
 .SH SEE ALSO
 \fIrssh\fP(1), \fIsshd\fP(8), \fIssh\fP(1), \fIscp\fP(1), \fIsftp\fP(1),
-\fIsyslogd.conf\fP(5), \fIchroot\fP(2).
+\fIsvnserve\fP(8), \fIsyslogd.conf\fP(5), \fIchroot\fP(2).
 
 
diff --git a/rssh.conf.5.in b/rssh.conf.5.in
index 913ce9d..5e16acb 100644
--- a/rssh.conf.5.in
+++ b/rssh.conf.5.in
@@ -49,6 +49,11 @@ Tells the shell that rdist is allowed.
 Tells the shell that rsync is allowed.
 .RE
 .P
+.B allowsvnserve
+.RS
+Tells the shell that svnserve is allowed.
+.RE
+.P
 .B umask
 .RS
 Sets the umask value for file creations in the scp/sftp session.  This is
@@ -122,9 +127,9 @@ The umask for this user, in octal, just as it would be specified to the shell
 .RE
 .B access bits
 .RS
-Five binary digits, which indicate whether the user is allowed to use rsync,
-rdist, cvs, sftp, and scp, in that order.  One means the command is allowed,
-zero means it is not.
+Six binary digits, which indicate whether the user is allowed to use rsync,
+rdist, cvs, sftp, scp and svnserve, in that order.  One means the command is
+allowed, zero means it is not.
 .RE
 .B path
 .RS
@@ -135,7 +140,7 @@ details.
 .P
 For example, you might have something like this:
 .P
-user = luser:022:00001:
+user = luser:022:000010:
 .P
 This does the following: for the user with the username "luser", set the umask
 to 022, disallow sftp, and allow scp.  Because there is no chroot path
@@ -148,13 +153,13 @@ path explicitly, even if it should be the same as that set using the
 chrootpath keyword.  Remember that if there are spaces in the path, you need
 to quote it, something like this:
 .P
-user = "luser:022:00001:/usr/local/chroot dir"
+user = "luser:022:000010:/usr/local/chroot dir"
 .P
 See the default rssh.conf file for more examples.
 .RE
 
 .SH SEE ALSO
 \fIrssh\fP(1), \fIsshd\fP(8), \fIssh\fP(1), \fIscp\fP(1), \fIsftp\fP(1),
-\fIsyslogd.conf\fP(5), \fIchroot\fP(2).
+\fIsvnserve\fP(8), \fIsyslogd.conf\fP(5), \fIchroot\fP(2).
 
 
diff --git a/rssh.conf.default b/rssh.conf.default
index c847565..88833c1 100644
--- a/rssh.conf.default
+++ b/rssh.conf.default
@@ -11,6 +11,7 @@ logfacility = LOG_USER
 #allowcvs
 #allowrdist
 #allowrsync
+#allowsvnserve
 
 # set the default umask
 umask = 022
@@ -28,24 +29,25 @@ umask = 022
 ##########################################
 # EXAMPLES of configuring per-user options
 
-#user=rudy:077:00010:  # the path can simply be left out to not chroot
-#user=rudy:077:00010   # the ending colon is optional
+#user=rudy:077:000100:  # the path can simply be left out to not chroot
+#user=rudy:077:000100   # the ending colon is optional
 
-#user=rudy:011:00100:  # cvs, with no chroot 
-#user=rudy:011:01000:  # rdist, with no chroot
-#user=rudy:011:10000:  # rsync, with no chroot
-#user="rudy:011:00001:/usr/local/chroot"  # whole user string can be quoted
-#user=rudy:01"1:00001:/usr/local/chroot"  # or somewhere in the middle, freak!
-#user=rudy:'011:00001:/usr/local/chroot'  # single quotes too
+#user=rudy:011:001000:  # cvs, with no chroot
+#user=rudy:011:010000:  # rdist, with no chroot
+#user=rudy:011:100000:  # rsync, with no chroot
+#user=rudy:011:000001:  # svnserve, with no chroot
+#user="rudy:011:000010:/usr/local/chroot"  # whole user string can be quoted
+#user=rudy:01"1:000010:/usr/local/chroot"  # or somewhere in the middle, freak!
+#user=rudy:'011:000010:/usr/local/chroot'  # single quotes too
 
 # if your chroot_path contains spaces, it must be quoted...
 # In the following examples, the chroot_path is "/usr/local/my chroot"
-#user=rudy:011:00001:"/usr/local/my chroot"  # scp with chroot
-#user=rudy:011:00010:"/usr/local/my chroot"  # sftp with chroot
-#user=rudy:011:00011:"/usr/local/my chroot"  # both with chroot
+#user=rudy:011:000010:"/usr/local/my chroot"  # scp with chroot
+#user=rudy:011:000100:"/usr/local/my chroot"  # sftp with chroot
+#user=rudy:011:000110:"/usr/local/my chroot"  # both with chroot
 
 # Spaces before or after the '=' are fine, but spaces in chrootpath need
 # quotes.
-#user = "rudy:011:00001:/usr/local/my chroot"  
-#user = "rudy:011:00001:/usr/local/my chroot"  # neither do comments at line end
+#user = "rudy:011:000010:/usr/local/my chroot"
+#user = "rudy:011:000010:/usr/local/my chroot"  # neither do comments at line end
 
diff --git a/rssh.h b/rssh.h
index d15f645..111f9a0 100644
--- a/rssh.h
+++ b/rssh.h
@@ -41,11 +41,12 @@
 
 typedef char bool;
 
-#define RSSH_ALLOW_SCP	 (1 << 0)
-#define RSSH_ALLOW_SFTP  (1 << 1)
-#define RSSH_ALLOW_CVS   (1 << 2)
-#define RSSH_ALLOW_RDIST (1 << 3)
-#define RSSH_ALLOW_RSYNC (1 << 4)
-#define RSSH_USE_CHROOT	 (1 << 5)
+#define RSSH_ALLOW_SCP		(1 << 0)
+#define RSSH_ALLOW_SFTP		(1 << 1)
+#define RSSH_ALLOW_CVS		(1 << 2)
+#define RSSH_ALLOW_RDIST	(1 << 3)
+#define RSSH_ALLOW_RSYNC	(1 << 4)
+#define RSSH_ALLOW_SVNSERVE	(1 << 5)
+#define RSSH_USE_CHROOT		(1 << 6)
 
 #endif /* _rssh_h */
diff --git a/rssh_chroot_helper.c b/rssh_chroot_helper.c
index 7780c11..8a35cdc 100644
--- a/rssh_chroot_helper.c
+++ b/rssh_chroot_helper.c
@@ -254,6 +254,9 @@ int main( int argc, char **argv )
 	case 5:
 		cmd_path = PATH_RSYNC;
 		break;
+	case 6:
+		cmd_path = PATH_SVNSERVE;
+		break;
 	default:
 		log_msg("invalid command specified");
 		exit(2);
diff --git a/rsshconf.c b/rsshconf.c
index 564f747..459b26b 100644
--- a/rsshconf.c
+++ b/rsshconf.c
@@ -71,6 +71,7 @@ const char *keywords[] = {
 	"allowcvs",
 	"allowrdist",
 	"allowrsync",
+	"allowsvnserve",
 	"chrootpath",
 	"logfacility",
 	"umask",
@@ -106,6 +107,9 @@ int process_allow_rdist( ShellOptions_t *opts, const char *line,
 int process_allow_rsync( ShellOptions_t *opts, const char *line, 
 		        const int lineno );
 
+int process_allow_svnserve( ShellOptions_t *opts, const char *line,
+			    const int lineno );
+
 int get_token( const char *str, char *buf, const int buflen, 
 	       const bool colon, const bool ign_spc );
 
@@ -220,21 +224,26 @@ int process_config_line( ShellOptions_t	*opts,
 			return FALSE;
 		return TRUE;
 	case 6:
+		/* allow svnserve */
+		if ( !(process_allow_svnserve(opts, line + pos, lineno) ) )
+			return FALSE;
+		return TRUE;
+	case 7:
 		/* default chroot path */
 		if ( !(process_chroot_path(opts, line + pos, lineno) ) )
 			return FALSE;
 		return TRUE;
-	case 7:
+	case 8:
 		/* syslog log facility */
 		if ( !(process_log_facility(opts, line + pos, lineno) ) )
 			return FALSE;
 		return TRUE;
-	case 8:
+	case 9:
 		/* set the user's umask */
 		if ( !(process_umask(opts, line + pos, lineno) ) )
 			return FALSE;
 		return TRUE;
-	case 9:
+	case 10:
 		/* user */
 		if ( !(process_user(opts, line + pos, lineno) ) )
 			return FALSE;
@@ -557,6 +566,34 @@ int process_allow_rsync( ShellOptions_t *opts,
 }
 
 
+/*
+ * process_allow_svnserve() - make sure there are no tokens after the keyword,
+ *                            other than a possible comment.  If there are
+ *                            additional tokens other than comments, there is a
+ *                            syntax error, and FALSE is returned.  Otherwise,
+ *                            the line is ok, so opts are set to allow
+ *                            svnserve, and TRUE is returned.
+ */
+int process_allow_svnserve( ShellOptions_t *opts,
+                            const char *line,
+                            const int lineno )
+{
+	int pos;
+
+	if ( !(pos = eat_comment(line)) ){
+		if (log) log_msg("line %d: syntax error parsing config file",
+				lineno);
+		return FALSE;
+	}
+	if (log){
+		log_set_priority(LOG_DEBUG);
+		log_msg("allowing svnserve to all users");
+	}
+	opts->shell_flags |= RSSH_ALLOW_SVNSERVE;
+	return TRUE;
+}
+
+
 int process_chroot_path( ShellOptions_t *opts, 
 		         const char *line,
 		         const int lineno )
@@ -854,6 +891,7 @@ int process_user( ShellOptions_t *opts,
 	bool	allow_cvs;
 	bool	allow_rdist;
 	bool	allow_rsync;
+	bool	allow_svnserve;
 
 	/* make space for user options */
 	if ( !(temp = (char *)malloc(CFG_LINE_LEN + 1)) ){
@@ -925,7 +963,7 @@ int process_user( ShellOptions_t *opts,
 		return FALSE;
 	}
 	if ( !validate_access(axs, &allow_sftp, &allow_scp, &allow_cvs,
-			      &allow_rdist, &allow_rsync) ){
+			      &allow_rdist, &allow_rsync, &allow_svnserve) ){
 		if (log){
 			log_set_priority(LOG_ERR);
 			log_msg("syntax error parsing access bits, line %d", lineno);
@@ -999,6 +1037,10 @@ cleanup:
 		if (log) log_msg("allowing rsync to user %s", user);
 		opts->shell_flags |= RSSH_ALLOW_RSYNC;
 	}
+        if ( allow_svnserve ){
+                if (log) log_msg("allowing svnserve to user %s", user);
+                opts->shell_flags |= RSSH_ALLOW_SVNSERVE;
+        }
 	if ( path ){
 		if (log) log_msg("chrooting %s to %s", user, path);
 		opts->shell_flags |= RSSH_USE_CHROOT;
diff --git a/util.c b/util.c
index a38df02..dc8c8fb 100644
--- a/util.c
+++ b/util.c
@@ -80,7 +80,8 @@ void fail( int flags, int argc, char **argv )
 	if ( flags & RSSH_ALLOW_SFTP ) size += 5;
 	if ( flags & RSSH_ALLOW_CVS ) size += 4;
 	if ( flags & RSSH_ALLOW_RDIST ) size += 6;
-	if ( flags & RSSH_ALLOW_RSYNC ) size += 5; /* last one, no space */
+	if ( flags & RSSH_ALLOW_RSYNC ) size += 6;
+	if ( flags & RSSH_ALLOW_SVNSERVE ) size += 8; /* last one, no space */
 
 	/* create msg indicating what is allowed */
 	if ( !size ) cmd = "This user is locked out.";
@@ -101,7 +102,9 @@ void fail( int flags, int argc, char **argv )
 		if ( flags & RSSH_ALLOW_RDIST )
 			strncat(cmd, "rdist ", size);
 		if ( flags & RSSH_ALLOW_RSYNC )
-			strncat(cmd, "rsync", size);
+			strncat(cmd, "rsync ", size);
+		if ( flags & RSSH_ALLOW_SVNSERVE )
+			strncat(cmd, "svnserve", size);
 	}
 
 	/* print error message to user and log attempt */
@@ -318,6 +321,16 @@ char *check_command_line( char **cl, ShellOptions_t *opts )
 
 		return PATH_RSYNC;
 	}
+	if ( check_command(*cl, opts, PATH_SVNSERVE, RSSH_ALLOW_SVNSERVE) ){
+		/* check command line */
+		if( cl[1] == NULL || strcmp(cl[1], "-t") != 0 || cl[2] != NULL){
+			fprintf(stderr, "\nextra svnserver parameter(s) not allowed.");
+			log_msg("unallowed option(s) in svnserver command line!");
+			return NULL;
+		}
+
+		return PATH_SVNSERVE;
+	}
 	/* No match, return NULL */
 	return NULL;
 }
@@ -342,6 +355,8 @@ char *get_command( char *cl, ShellOptions_t *opts )
 		return PATH_RDIST;
 	if ( check_command(cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) )
 		return PATH_RSYNC;
+	if ( check_command(cl, opts, PATH_SVNSERVE, RSSH_ALLOW_SVNSERVE) )
+		return PATH_SVNSERVE;
 	return NULL;
 }
 
@@ -407,22 +422,24 @@ int validate_umask( const char *temp, int *mask )
  *                     same name, and returns FALSE if the bits are not valid
  */
 int validate_access( const char *temp, bool *allow_sftp, bool *allow_scp,
-		     bool *allow_cvs, bool *allow_rdist, bool *allow_rsync )
+		     bool *allow_cvs, bool *allow_rdist, bool *allow_rsync,
+		     bool *allow_svnserve )
 {
 	int	i;
 
-#define NUM_ACCESS_BITS 5
+#define NUM_ACCESS_BITS 6
 
 	if ( strlen(temp) != NUM_ACCESS_BITS ) return FALSE;
 	/* make sure the bits are valid */
 	for ( i = 0; i < NUM_ACCESS_BITS; i++ )
 		if ( temp[i] < '0' || temp[i] > '1' ) return FALSE;
 	/* This is easier to read if we allign the = */
-	*allow_rsync = temp[0] - '0';
-	*allow_rdist = temp[1] - '0';
-	*allow_cvs   = temp[2] - '0';
-	*allow_sftp  = temp[3] - '0';
-	*allow_scp   = temp[4] - '0';
+	*allow_rsync	= temp[0] - '0';
+	*allow_rdist	= temp[1] - '0';
+	*allow_cvs	= temp[2] - '0';
+	*allow_sftp	= temp[3] - '0';
+	*allow_scp	= temp[4] - '0';
+	*allow_svnserve	= temp[5] - '0';
 	return TRUE;
 }
 
diff --git a/util.h b/util.h
index 8b81201..a67eb32 100644
--- a/util.h
+++ b/util.h
@@ -38,7 +38,8 @@ char *get_command( char *cl, ShellOptions_t *opts);
 char *extract_root( char *root, char *path );
 int  validate_umask( const char *temp, int *mask );
 int validate_access( const char *temp, bool *allow_sftp, bool *allow_scp,
-	       	     bool *allow_cvs, bool *allow_rdist, bool *allow_rsync );
+		     bool *allow_cvs, bool *allow_rdist, bool *allow_rsync,
+		     bool *allow_svnserve );
 bool opt_exist( char *cl, char opt );
 char *get_username( void );