-
Notifications
You must be signed in to change notification settings - Fork 0
/
subversion-gssapi.patch-20050329
7379 lines (7361 loc) · 715 KB
/
subversion-gssapi.patch-20050329
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
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -urN subversion-1.0.9.orig/build-outputs.mk subversion-1.0.9.dev/build-outputs.mk
--- subversion-1.0.9.orig/build-outputs.mk 2005-03-24 23:39:58.000000000 +1000
+++ subversion-1.0.9.dev/build-outputs.mk 2005-03-25 00:22:47.000000000 +1000
@@ -184,8 +184,8 @@
subversion/libsvn_ra_local/libsvn_ra_local-1.la: $(libsvn_ra_local_DEPS)
cd subversion/libsvn_ra_local && $(LINK) -o libsvn_ra_local-1.la $(libsvn_ra_local_OBJECTS) ../../subversion/libsvn_repos/libsvn_repos-1.la ../../subversion/libsvn_fs/libsvn_fs-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
-libsvn_ra_svn_DEPS = subversion/libsvn_ra_svn/client.lo subversion/libsvn_ra_svn/cram.lo subversion/libsvn_ra_svn/editor.lo subversion/libsvn_ra_svn/editorp.lo subversion/libsvn_ra_svn/marshal.lo subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
-libsvn_ra_svn_OBJECTS = client.lo cram.lo editor.lo editorp.lo marshal.lo
+libsvn_ra_svn_DEPS = subversion/libsvn_ra_svn/client.lo subversion/libsvn_ra_svn/cram.lo subversion/libsvn_ra_svn/gssapi.lo subversion/libsvn_ra_svn/editor.lo subversion/libsvn_ra_svn/editorp.lo subversion/libsvn_ra_svn/marshal.lo subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
+libsvn_ra_svn_OBJECTS = client.lo cram.lo gssapi.lo editor.lo editorp.lo marshal.lo
subversion/libsvn_ra_svn/libsvn_ra_svn-1.la: $(libsvn_ra_svn_DEPS)
cd subversion/libsvn_ra_svn && $(LINK) -o libsvn_ra_svn-1.la $(libsvn_ra_svn_OBJECTS) ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
diff -urN subversion-1.0.9.orig/subversion/include/svn_ra_svn.h subversion-1.0.9.dev/subversion/include/svn_ra_svn.h
--- subversion-1.0.9.orig/subversion/include/svn_ra_svn.h 2005-03-24 23:39:58.000000000 +1000
+++ subversion-1.0.9.dev/subversion/include/svn_ra_svn.h 2005-03-26 12:04:19.000000000 +1000
@@ -323,6 +323,21 @@
svn_config_t *pwdb, const char **user,
svn_boolean_t *success);
+#if HAVE_GSSAPI
+/** This function is only intended for use by svnserve.
+ *
+ * Perform GSSAPI password authentication. On success, return
+ * SVN_NO_ERROR with *user set to the UPN and *success set to
+ * TRUE. On an error which can be reported to the client, report the
+ * error and return SVN_NO_ERROR with *success set to FALSE. On
+ * communications failure, return an error.
+ */
+svn_error_t *svn_ra_svn_gssapi_server(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
+ const char *realm, const char *mecharg,
+ const char **user,
+ svn_boolean_t *success);
+#endif
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff -urN subversion-1.0.9.orig/subversion/libsvn_ra_svn/client.c subversion-1.0.9.dev/subversion/libsvn_ra_svn/client.c
--- subversion-1.0.9.orig/subversion/libsvn_ra_svn/client.c 2005-03-24 23:39:58.000000000 +1000
+++ subversion-1.0.9.dev/subversion/libsvn_ra_svn/client.c 2005-03-26 21:40:26.000000000 +1000
@@ -18,6 +18,8 @@
+#include <assert.h>
+
#define APR_WANT_STRFUNC
#include <apr_want.h>
#include <apr_general.h>
@@ -247,6 +249,7 @@
{
svn_ra_svn_conn_t *conn = sess->conn;
const char *realmstring, *user, *password, *msg;
+ const char *hostname;
svn_auth_iterstate_t *iterstate;
void *creds;
svn_boolean_t compat = (realm == NULL);
@@ -265,6 +268,38 @@
SVN_ERR(auth_response(conn, pool, "ANONYMOUS", "", compat));
return read_success(conn, pool);
}
+#if HAVE_GSSAPI
+ else if (find_mech(mechlist, "GSSAPI"))
+ {
+ /* Extract the hostname from the realm prefix */
+ assert(memcmp(sess->realm_prefix, "<svn://", 7) == 0);
+ hostname = sess->realm_prefix + 7;
+ hostname = apr_pstrmemdup(pool, hostname,
+ strchr(hostname, ':') - hostname);
+
+ SVN_ERR(svn_auth_first_credentials(&creds, &iterstate,
+ SVN_AUTH_CRED_USERNAME, realmstring,
+ sess->auth_baton, pool));
+ if (!creds)
+ return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
+ "Can't determine username");
+ while (creds)
+ {
+ user = ((svn_auth_cred_username_t *) creds)->username;
+ SVN_ERR(auth_response(conn, pool, "GSSAPI", NULL, compat));
+ SVN_ERR(svn_ra_svn__gssapi_client(conn, pool, hostname,
+ user, &msg));
+ if (!msg)
+ break;
+ SVN_ERR(svn_auth_next_credentials(&creds, iterstate, pool));
+ }
+ if (!creds)
+ return svn_error_createf(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
+ "Authentication error from server: %s", msg);
+ SVN_ERR(svn_auth_save_credentials(iterstate, pool));
+ return SVN_NO_ERROR;
+ }
+#endif
else if (find_mech(mechlist, "CRAM-MD5"))
{
SVN_ERR(svn_auth_first_credentials(&creds, &iterstate,
diff -urN subversion-1.0.9.orig/subversion/libsvn_ra_svn/gssapi.c subversion-1.0.9.dev/subversion/libsvn_ra_svn/gssapi.c
--- subversion-1.0.9.orig/subversion/libsvn_ra_svn/gssapi.c 1970-01-01 10:00:00.000000000 +1000
+++ subversion-1.0.9.dev/subversion/libsvn_ra_svn/gssapi.c 2005-03-27 01:42:06.000000000 +1000
@@ -0,0 +1,523 @@
+/*
+ * gssapi.c : GSSAPI authentication
+ * David Leonard, Vintela Inc., 2005.
+ */
+
+
+
+#define APR_WANT_STRFUNC
+#define APR_WANT_STDIO
+#include <apr_want.h>
+#include <apr_general.h>
+#include <apr_lib.h>
+#include <apr_strings.h>
+#include <apr_network_io.h>
+
+#include <svn_types.h>
+#include <svn_string.h>
+#include <svn_pools.h>
+#include <svn_error.h>
+#include <svn_ra_svn.h>
+#include <svn_config.h>
+#include <svn_auth.h>
+
+#include "ra_svn.h"
+
+#define SERVICE_NAME "host" /* XXX should be "SVN" */
+
+#if HAVE_GSSAPI
+#include <gssapi.h>
+
+/* Prototypes */
+static svn_error_t *set_gssapi_filter(svn_ra_svn_conn_t *conn, gss_ctx_id_t context);
+static svn_error_t *svn_gssapi_wrap(svn_ra_svn_conn_t *conn,
+ struct svn_ra_conn_filter_st *filter, apr_pool_t *pool,
+ const char *inner, apr_size_t innerlen,
+ char **outer, apr_size_t *outerlen);
+static svn_error_t *svn_gssapi_unwrap(svn_ra_svn_conn_t *conn,
+ struct svn_ra_conn_filter_st *filter,
+ apr_pool_t *pool, const char *src, apr_size_t srclen,
+ char *dst, apr_size_t *dstszlen);
+
+#undef svn_error_createf
+
+/*------------------------------------------------------------
+ * Generic GSS error handling
+ */
+
+/* Writes a "failure()" token to the peer containing message text,
+ * and returns an authorization failure value */
+static svn_error_t *fail(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
+ const char *msg)
+{
+ fprintf(stderr, "fail: %s\n", msg);
+ SVN_ERR(svn_ra_svn_write_tuple(conn, pool, "w(c)", "failure", msg));
+ SVN_ERR(svn_ra_svn_flush(conn, pool));
+ return svn_error_createf(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
+ "GSSAPI local failure: %s", msg);
+}
+
+/* Returns a string containing the displayable GSSAPI error */
+static char *display_error(apr_pool_t *pool, const char *src,
+ OM_uint32 major_err, OM_uint32 minor_err)
+{
+ OM_uint32 major, minor, ctx;
+ gss_buffer_desc buf;
+ char *msg;
+
+ msg = apr_pstrdup(pool, src);
+ ctx = 0;
+ do
+ {
+ gss_display_status(&minor, major_err, GSS_C_GSS_CODE,
+ GSS_C_NO_OID, &ctx, &buf);
+ msg = apr_psprintf(pool, "%s; %.*s", msg, buf.length, buf.value);
+ gss_release_buffer(&minor, &buf);
+ } while (ctx != 0);
+ do
+ {
+ gss_display_status(&minor, minor_err, GSS_C_MECH_CODE,
+ GSS_C_NO_OID, &ctx, &buf);
+ msg = apr_psprintf(pool, "%s; %.*s", msg, buf.length, buf.value);
+ gss_release_buffer(&minor, &buf);
+ } while (ctx != 0);
+
+ return msg;
+}
+
+/* Generates a failure token and error from GSSAPI error values */
+static svn_error_t *gss_fail(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
+ const char *src, OM_uint32 major_err, OM_uint32 minor_err)
+{
+ return fail(conn, pool, display_error(pool, src, major_err, minor_err));
+}
+
+/* Record line numbers for debugging */
+#define gss_fail (svn_error__locate(__FILE__,__LINE__), (gss_fail))
+#define fail (svn_error__locate(__FILE__,__LINE__), (fail))
+#define svn_error_createf (svn_error__locate(__FILE__,__LINE__), (svn_error_createf))
+
+/* Reads a token() or failure() message. On a token(), msg is set to NULL
+ * and content is placed in a gss_buffer. On failures() the gssbuf is
+ * not modified, but msg is set to the failure text. */
+static svn_error_t *read_token(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
+ gss_buffer_t gssbuf, const char **msg)
+{
+ const char *status;
+ const svn_string_t *str = NULL;
+
+ SVN_ERR(svn_ra_svn_read_tuple(conn, pool, "w(?s)", &status, &str));
+ if (strcmp(status, "failure") == 0)
+ {
+ if (str == NULL)
+ return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
+ "gssapi failure missing text");
+ *msg = str->data;
+ return SVN_NO_ERROR;
+ }
+ if (strcmp(status, "token") == 0)
+ {
+ gssbuf->value = (char *) str->data;
+ gssbuf->length = str->len;
+ *msg = NULL;
+ return SVN_NO_ERROR;
+ }
+ return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
+ "expected gssapi token or failure");
+}
+
+/* Writes a token() containing a gss_buffer */
+static svn_error_t *write_token(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
+ gss_buffer_t gssbuf)
+{
+ svn_string_t str;
+ str.data = gssbuf->value;
+ str.len = gssbuf->length;
+ return svn_ra_svn_write_tuple(conn, pool, "w(s)", "token", &str);
+}
+
+/* Convert a GSS name to a displayable name */
+static const char *display_name(apr_pool_t *pool, const gss_name_t name)
+{
+ OM_uint32 major, minor;
+ gss_buffer_desc buffer;
+ char *str;
+
+ if (name == NULL)
+ return "[null]";
+ major = gss_display_name(&minor, name, &buffer, NULL);
+ if (GSS_ERROR(major))
+ return "[error]";
+ return apr_pstrndup(pool, buffer.value, buffer.length);
+}
+
+/* Server GSSAPI authentication. On success, sets *success to TRUE,
+ * fills in *user and sets a connection filter. */
+svn_error_t *svn_ra_svn_gssapi_server(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
+ const char *realm, const char *mecharg,
+ const char **user, svn_boolean_t *success)
+{
+ OM_uint32 major, minor, flags;
+ gss_buffer_desc input_token, output_token, name_buf, svc_buf;
+ gss_name_t user_name, context_name, svc_name;
+ gss_ctx_id_t context;
+ gss_cred_id_t cred;
+ svn_error_t *error;
+ char *p;
+ int name_equal;
+ const char *msg;
+
+ *success = FALSE;
+
+ fprintf(stderr, "gssapi_server realm=%s mecharg=%s\n",
+ realm ? realm : "(null)", mecharg ? mecharg : "(null)");
+
+ cred = GSS_C_NO_CREDENTIAL;
+ svc_name = GSS_C_NO_NAME;
+
+ /* Obtain credentials for this service */
+ svc_buf.value = SERVICE_NAME;
+ svc_buf.length = strlen(SERVICE_NAME);
+ major = gss_import_name(&minor, &svc_name, GSS_C_NT_HOSTBASED_SERVICE,
+ &svc_buf);
+ if (GSS_ERROR(major))
+ fprintf(stderr, "%s\n",
+ display_error(pool, "gss_import_name", major, minor));
+ else
+ {
+ major = gss_acquire_cred(&minor, svc_name, GSS_C_INDEFINITE,
+ GSS_C_NO_OID_SET, GSS_C_ACCEPT, &cred,
+ NULL, NULL);
+ if (GSS_ERROR(major))
+ fprintf(stderr, "%s\n",
+ display_error(pool, "gss_acquire_cred", major, minor));
+ gss_release_name(&minor, &svc_name);
+ }
+
+ /* Exchange tokens to construct an authentication context */
+ context = GSS_C_NO_CONTEXT;
+ do
+ {
+ SVN_ERR(read_token(conn, pool, &input_token, &msg));
+
+ /* Check for initiator failure */
+ if (msg != NULL)
+ {
+ fprintf(stderr, "GSSAPI client error: %s\n", msg);
+ if (context != GSS_C_NO_CONTEXT)
+ gss_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+ return SVN_NO_ERROR;
+ }
+
+ major = gss_accept_sec_context(&minor, &context, cred,
+ &input_token, GSS_C_NO_CHANNEL_BINDINGS,
+ &context_name, NULL, &output_token,
+ &flags, NULL, NULL);
+ if (GSS_ERROR(major))
+ {
+ gss_fail(conn, pool, "gss_accept_sec_context", major, minor);
+ if (context != GSS_C_NO_CONTEXT)
+ gss_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+ if (cred != GSS_C_NO_CREDENTIAL)
+ gss_release_cred(&minor, &cred);
+ return SVN_NO_ERROR;
+ }
+ if (output_token.length != 0)
+ {
+ SVN_ERR(write_token(conn, pool, &output_token));
+ gss_release_buffer(&minor, &output_token);
+ }
+ } while (major & GSS_S_CONTINUE_NEEDED);
+
+ /* Do not authenticate if the context failed */
+ if (major != GSS_S_COMPLETE)
+ {
+ gss_fail(conn, pool, "gss_accept_sec_context", major, minor);
+ if (cred != GSS_C_NO_CREDENTIAL)
+ gss_release_cred(&minor, &cred);
+ return SVN_NO_ERROR;
+ }
+
+ if (cred != GSS_C_NO_CREDENTIAL)
+ gss_release_cred(&minor, &cred);
+
+ /* Reject anonymous authentication (prefer svn ANONYMOUS mech) */
+ if (flags & GSS_C_ANON_FLAG)
+ {
+ gss_release_name(&minor, &context_name);
+ gss_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+ fail(conn, pool, "anonymous gssapi not allowed");
+ return SVN_NO_ERROR;
+ }
+
+ if (mecharg == NULL || *mecharg == '\0')
+ {
+ /* If the client doesn't provide a username, derive one from context */
+ *user = display_name(pool, context_name);
+ }
+ else
+ {
+ /* Convert the client-provided username to a gss name to check it */
+ name_buf.value = (char *)mecharg;
+ name_buf.length = strlen(mecharg);
+ major = gss_import_name(&minor, &name_buf, GSS_C_NT_USER_NAME,
+ &user_name);
+ if (GSS_ERROR(major))
+ {
+ gss_fail(conn, pool, "gss_import_name", major, minor);
+ gss_release_name(&minor, &context_name);
+ gss_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+ return SVN_NO_ERROR;
+ }
+
+ /* Compare the provided username with the authenticated name */
+ major = gss_compare_name(&minor, user_name, context_name, &name_equal);
+ if (GSS_ERROR(major))
+ {
+ gss_fail(conn, pool, "gss_compare_name", major, minor);
+ gss_release_name(&minor, &context_name);
+ gss_release_name(&minor, &user_name);
+ gss_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+ return SVN_NO_ERROR;
+ }
+
+ /* (Debugging) */
+ fprintf(stderr, "GSSAPI: context_name=%s user_name=%s name_equal=%s\n",
+ display_name(pool, context_name), display_name(pool, user_name),
+ name_equal ? "true" : "false");
+
+ gss_release_name(&minor, &context_name);
+ gss_release_name(&minor, &user_name);
+
+ /* Reject authentication if it doesn't match the given username */
+ if (!name_equal)
+ {
+ fail(conn, pool, "name mismatch");
+ gss_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+ return SVN_NO_ERROR;
+ }
+
+ /* Use the client-provided username which may be simpler */
+ *user = apr_pstrdup(pool, mecharg);
+ }
+
+ /* Authentication succeeded */
+ *success = TRUE;
+
+ /* Send success() to tell client to begin filtering */
+ SVN_ERR(svn_ra_svn_write_tuple(conn, pool, "w()", "success"));
+ SVN_ERR(set_gssapi_filter(conn, context));
+
+ return SVN_NO_ERROR;
+}
+
+/*
+ * Exchange GSSAPI tokens, authenticating as a user, or with default
+ * credentials if user is NULL. Sets msg to NULL on success, otherwise
+ * sets msg to point to an error message.
+ */
+svn_error_t *svn_ra_svn__gssapi_client(svn_ra_svn_conn_t *conn,
+ apr_pool_t *pool,
+ const char *host, const char *user,
+ const char **msg)
+{
+ OM_uint32 major, minor, minor2;
+ gss_buffer_desc input_token, output_token, exported_name, buf;
+ gss_name_t service_name, user_name;
+ gss_ctx_id_t context;
+ gss_cred_id_t cred;
+ svn_error_t *error;
+ const char *status, *str;
+
+ fprintf(stderr, "gssapi_client host=%s user=%s\n",
+ host ? host : "(null)", user ? user : "(null)");
+
+ /* Convert the target hostname into a target service name */
+ str = apr_psprintf(pool, "%s@%s", SERVICE_NAME, host);
+ buf.value = (char *) str;
+ buf.length = strlen(str);
+ major = gss_import_name(&minor, &buf, GSS_C_NT_HOSTBASED_SERVICE,
+ &service_name);
+ if (GSS_ERROR(major))
+ {
+ *msg = display_error(pool, "gss_import_name", major, minor);
+ fail(conn, pool, *msg);
+ return SVN_NO_ERROR;
+ }
+
+ /* Debugging */
+ fprintf(stderr, "GSSAPI: service_name='%s'\n",
+ display_name(pool, service_name));
+
+ /* If a username is given, acquire credentials for it */
+ if (user != NULL)
+ {
+ major = gss_import_name(&minor, &buf, GSS_C_NT_USER_NAME, &user_name);
+ if (GSS_ERROR(major))
+ {
+ *msg = display_error(pool, "gss_import_name", major, minor);
+ fail(conn, pool, *msg);
+ return SVN_NO_ERROR;
+ }
+ major = gss_acquire_cred(&minor, user_name, GSS_C_INDEFINITE,
+ GSS_C_NO_OID_SET, GSS_C_INITIATE, &cred,
+ NULL, NULL);
+ if (GSS_ERROR(major))
+ {
+ *msg = display_error(pool, "gss_acquire_cred", major, minor);
+ fail(conn, pool, *msg);
+ gss_release_name(&minor, &user_name);
+ return SVN_NO_ERROR;
+ }
+ gss_release_name(&minor, &user_name);
+ }
+ else
+ cred = GSS_C_NO_CREDENTIAL;
+
+ /* Exchange tokens to establish authentication */
+ input_token.length = 0;
+ context = GSS_C_NO_CONTEXT;
+ do
+ {
+ output_token.length = 0;
+ major = gss_init_sec_context(&minor, cred, &context,
+ service_name, GSS_C_NO_OID,
+ GSS_C_MUTUAL_FLAG | GSS_C_CONF_FLAG | GSS_C_INTEG_FLAG,
+ 0, GSS_C_NO_CHANNEL_BINDINGS,
+ &input_token, NULL, &output_token, NULL, NULL);
+ if (output_token.length != 0)
+ {
+ SVN_ERR(write_token(conn, pool, &output_token));
+ gss_release_buffer(&minor2, &output_token);
+ }
+ if (GSS_ERROR(major))
+ {
+ *msg = display_error(pool, "gss_init_sec_context", major, minor);
+ fail(conn, pool, *msg);
+ if (context != GSS_C_NO_CONTEXT)
+ gss_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+ if (cred != GSS_C_NO_CREDENTIAL)
+ gss_release_cred(&minor, &cred);
+ return SVN_NO_ERROR;
+ }
+ if (major & GSS_S_CONTINUE_NEEDED)
+ {
+ SVN_ERR(read_token(conn, pool, &input_token, msg));
+ if (*msg)
+ {
+ if (context != GSS_C_NO_CONTEXT)
+ gss_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+ if (cred != GSS_C_NO_CREDENTIAL)
+ gss_release_cred(&minor, &cred);
+ return SVN_NO_ERROR;
+ }
+ }
+ } while (major & GSS_S_CONTINUE_NEEDED);
+
+ if (cred != GSS_C_NO_CREDENTIAL)
+ gss_release_cred(&minor, &cred);
+
+ /* Expect a final success message before starting wrap/unwrap. */
+ SVN_ERR(svn_ra_svn_read_tuple(conn, pool, "w(?c)", &status, &str));
+ if (strcmp(status, "failure") == 0 && str != NULL)
+ {
+ /* Server failure */
+ if (context != GSS_C_NO_CONTEXT)
+ gss_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+ *msg = str;
+ return SVN_NO_ERROR;
+ }
+ else if (strcmp(status, "success") == 0 && str == NULL)
+ {
+ /* Successfully authenticated; set up filter */
+ SVN_ERR(set_gssapi_filter(conn, context));
+ *msg = NULL;
+ return SVN_NO_ERROR;
+ }
+ else
+ {
+ if (context != GSS_C_NO_CONTEXT)
+ gss_delete_sec_context(&minor, &context, GSS_C_NO_BUFFER);
+ return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
+ "Unexpected server response");
+ }
+}
+
+/*------------------------------------------------------------
+ * GSS filter
+ */
+
+struct gssapi_filter {
+ struct svn_ra_conn_filter_st filter;
+ gss_ctx_id_t context;
+};
+
+/* Sets the connection filter to use gssapi */
+static svn_error_t *set_gssapi_filter(svn_ra_svn_conn_t *conn, gss_ctx_id_t context)
+{
+ struct gssapi_filter *filter;
+ filter = apr_palloc(conn->pool, sizeof (struct gssapi_filter));
+ filter->context = context;
+ filter->filter.wrap = svn_gssapi_wrap;
+ filter->filter.unwrap = svn_gssapi_unwrap;
+ return svn_ra_svn__conn_set_filter(conn, conn->pool,
+ (struct svn_ra_conn_filter_st *) filter);
+}
+
+/* Wraps some inner data and allocates storage for outer from pool */
+static svn_error_t *svn_gssapi_wrap(svn_ra_svn_conn_t *conn,
+ struct svn_ra_conn_filter_st *filter, apr_pool_t *pool,
+ const char *inner, apr_size_t innerlen,
+ char **outer, apr_size_t *outerlen)
+{
+ struct gssapi_filter *f = (struct gssapi_filter *) filter;
+ OM_uint32 major, minor;
+ gss_buffer_desc inner_buf, outer_buf;
+
+ inner_buf.value = (char *) inner;
+ inner_buf.length = innerlen;
+ major = gss_wrap(&minor, f->context, 1, GSS_C_QOP_DEFAULT, &inner_buf, NULL,
+ &outer_buf);
+ if (GSS_ERROR(major))
+ return gss_fail(conn, pool, "gss_wrap", major, minor);
+ *outer = apr_pmemdup(pool, outer_buf.value, outer_buf.length);
+ *outerlen = outer_buf.length;
+ gss_release_buffer(&minor, &outer_buf);
+ return SVN_NO_ERROR;
+}
+
+/* Unwraps the source data, storing into dst (or preallocated size *dstszlen) */
+static svn_error_t *svn_gssapi_unwrap(svn_ra_svn_conn_t *conn,
+ struct svn_ra_conn_filter_st *filter,
+ apr_pool_t *pool, const char *src, apr_size_t srclen,
+ char *dst, apr_size_t *dstszlen)
+{
+ struct gssapi_filter *f = (struct gssapi_filter *) filter;
+ OM_uint32 major, minor;
+ gss_buffer_desc inner_buf, outer_buf;
+ int conf_state;
+
+ outer_buf.value = (char *) src;
+ outer_buf.length = srclen;
+ major = gss_unwrap(&minor, f->context, &outer_buf, &inner_buf, &conf_state, NULL);
+ if (GSS_ERROR(major))
+ return gss_fail(conn, pool, "gss_unwrap", major, minor);
+ if (conf_state == 0) /* Must have confidentiality protection */
+ {
+ gss_release_buffer(&minor, &inner_buf);
+ return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
+ "GSS confidentiality missing");
+ }
+ if (inner_buf.length > *dstszlen)
+ {
+ gss_release_buffer(&minor, &inner_buf);
+ return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
+ "GSS frame too big");
+ }
+ memcpy(dst, inner_buf.value, inner_buf.length);
+ *dstszlen = inner_buf.length;
+ gss_release_buffer(&minor, &inner_buf);
+ return SVN_NO_ERROR;
+}
+
+#endif /* HAVE_GSSAPI */
diff -urN subversion-1.0.9.orig/subversion/libsvn_ra_svn/marshal.c subversion-1.0.9.dev/subversion/libsvn_ra_svn/marshal.c
--- subversion-1.0.9.orig/subversion/libsvn_ra_svn/marshal.c 2005-03-24 23:39:58.000000000 +1000
+++ subversion-1.0.9.dev/subversion/libsvn_ra_svn/marshal.c 2005-03-26 16:56:58.000000000 +1000
@@ -22,6 +22,7 @@
#include <stdlib.h>
#define APR_WANT_STRFUNC
+#define APR_WANT_BYTEFUNC
#include <apr_want.h>
#include <apr_general.h>
#include <apr_lib.h>
@@ -59,6 +60,7 @@
conn->block_baton = NULL;
conn->capabilities = apr_hash_make(pool);
conn->pool = pool;
+ conn->filter = NULL;
return conn;
}
@@ -180,7 +182,22 @@
/* Clear conn->write_pos first in case the block handler does a read. */
conn->write_pos = 0;
- SVN_ERR(writebuf_output(conn, pool, conn->write_buf, write_pos));
+
+ if (conn->filter)
+ {
+ struct { apr_uint32_t size; } header;
+ char *wrapped_data;
+ apr_size_t wrapped_len;
+
+ /* Wrap data and precede with a frame header */
+ SVN_ERR((*conn->filter->wrap)(conn, conn->filter, pool,
+ conn->write_buf, write_pos, &wrapped_data, &wrapped_len));
+ header.size = htonl(wrapped_len);
+ SVN_ERR(writebuf_output(conn, pool, (char *)&header, sizeof header));
+ SVN_ERR(writebuf_output(conn, pool, wrapped_data, wrapped_len));
+ }
+ else
+ SVN_ERR(writebuf_output(conn, pool, conn->write_buf, write_pos));
return SVN_NO_ERROR;
}
@@ -253,6 +270,59 @@
return SVN_NO_ERROR;
}
+static svn_error_t *readbuf_filtered(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
+ char *buffer, apr_size_t *buffer_len)
+{
+ if (conn->filter)
+ {
+ struct { apr_uint32_t size; } header;
+ char *data;
+ apr_size_t remain, count, dlen;
+ apr_pool_t *subpool = NULL;
+ char smallbuf[2 * sizeof conn->read_buf];
+
+ /* Read the frame header */
+ data = (char *)&header;
+ for (dlen = 0, remain = sizeof header - dlen; remain > 0; )
+ {
+ count = remain;
+ SVN_ERR(readbuf_input(conn, data + dlen, &count));
+ dlen += count;
+ remain -= count;
+ }
+
+ /* Create a subpool for large frames, or use stack for small ones */
+ /* XXX should use svn_stringbuf to stop huge mem allocs */
+ remain = ntohl(header.size);
+ if (remain <= sizeof smallbuf)
+ data = smallbuf;
+ else
+ {
+ subpool = svn_pool_create(pool);
+ data = apr_palloc(subpool, remain);
+ }
+
+ /* Read the frame body */
+ for (dlen = 0; remain > 0; )
+ {
+ count = remain;
+ SVN_ERR(readbuf_input(conn, data + dlen, &count));
+ dlen += count;
+ remain -= count;
+ }
+
+ /* Unwrap the frame */
+ assert(*buffer_len >= sizeof conn->write_buf);
+ SVN_ERR((*conn->filter->unwrap)(conn, conn->filter, pool, data, dlen,
+ buffer, buffer_len));
+ if (subpool)
+ apr_pool_destroy(subpool);
+ }
+ else
+ SVN_ERR(readbuf_input(conn, buffer, buffer_len));
+ return SVN_NO_ERROR;
+}
+
/* Read data from the socket into the read buffer, which must be empty. */
static svn_error_t *readbuf_fill(svn_ra_svn_conn_t *conn, apr_pool_t *pool)
{
@@ -261,7 +331,7 @@
assert(conn->read_ptr == conn->read_end);
writebuf_flush(conn, pool);
len = sizeof(conn->read_buf);
- SVN_ERR(readbuf_input(conn, conn->read_buf, &len));
+ SVN_ERR(readbuf_filtered(conn, pool, conn->read_buf, &len));
conn->read_ptr = conn->read_buf;
conn->read_end = conn->read_buf + len;
return SVN_NO_ERROR;
@@ -300,7 +370,7 @@
{
writebuf_flush(conn, pool);
count = end - data;
- SVN_ERR(readbuf_input(conn, data, &count));
+ SVN_ERR(readbuf_filtered(conn, pool, data, &count));
data += count;
}
@@ -323,6 +393,7 @@
svn_boolean_t lparen = FALSE;
assert(conn->read_ptr == conn->read_end);
+ assert(!conn->filter);
while (1)
{
/* Read some data directly from the connection input source. */
@@ -879,3 +950,19 @@
SVN_ERR(svn_ra_svn_end_list(conn, pool));
return SVN_NO_ERROR;
}
+
+/*
+ * Sets a filter on the connection. Once set, the filter cannot
+ * be removed. Read buffer must be empty.
+ */
+svn_error_t *svn_ra_svn__conn_set_filter(svn_ra_svn_conn_t *conn,
+ apr_pool_t *pool,
+ struct svn_ra_conn_filter_st *filter)
+{
+ assert(!conn->filter);
+ assert(conn->read_ptr == conn->read_end); /*XXX must drain */
+
+ SVN_ERR(writebuf_flush(conn, pool));
+ conn->filter = filter;
+ return SVN_NO_ERROR;
+}
diff -urN subversion-1.0.9.orig/subversion/libsvn_ra_svn/ra_svn.h subversion-1.0.9.dev/subversion/libsvn_ra_svn/ra_svn.h
--- subversion-1.0.9.orig/subversion/libsvn_ra_svn/ra_svn.h 2005-03-24 23:39:58.000000000 +1000
+++ subversion-1.0.9.dev/subversion/libsvn_ra_svn/ra_svn.h 2005-03-26 11:59:44.000000000 +1000
@@ -35,6 +35,19 @@
apr_pool_t *pool,
void *baton);
+/* A connection filter that sends and receives expects *framed* tokens */
+struct svn_ra_conn_filter_st {
+ svn_error_t *(*wrap)(svn_ra_svn_conn_t *conn,
+ struct svn_ra_conn_filter_st *filter,
+ apr_pool_t *pool,
+ const char *inner, apr_size_t innerlen,
+ char **outer, apr_size_t *outerlen);
+ svn_error_t *(*unwrap)(svn_ra_svn_conn_t *conn,
+ struct svn_ra_conn_filter_st *filter,
+ apr_pool_t *pool,
+ const char *src, apr_size_t srclen,
+ char *dst, apr_size_t *dstszlen);
+};
/* This structure is opaque to the server. The client pokes at the
* first few fields during setup and cleanup. */
@@ -54,6 +67,7 @@
void *block_baton;
apr_hash_t *capabilities;
apr_pool_t *pool;
+ struct svn_ra_conn_filter_st *filter;
};
/* Set a callback for blocked writes on conn. This handler may
@@ -87,6 +101,18 @@
const char *user, const char *password,
const char **message);
+#if HAVE_GSSAPI
+/* GSSAPI client authentication implementation. */
+svn_error_t *svn_ra_svn__gssapi_client(svn_ra_svn_conn_t *conn,
+ apr_pool_t *pool, const char *username,
+ const char *hostname, const char **message);
+#endif
+
+/* Adds a framing filter to the connection (for encryption) */
+svn_error_t *svn_ra_svn__conn_set_filter(svn_ra_svn_conn_t *conn,
+ apr_pool_t *pool,
+ struct svn_ra_conn_filter_st *filter);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff -urN subversion-1.0.9.orig/subversion/svnserve/serve.c subversion-1.0.9.dev/subversion/svnserve/serve.c
--- subversion-1.0.9.orig/subversion/svnserve/serve.c 2005-03-24 23:39:58.000000000 +1000
+++ subversion-1.0.9.dev/subversion/svnserve/serve.c 2005-03-26 12:03:39.000000000 +1000
@@ -122,6 +122,10 @@
if (b->tunnel && get_access(b, AUTHENTICATED) >= required)
SVN_ERR(svn_ra_svn_write_word(conn, pool, "EXTERNAL"));
#endif
+#if HAVE_GSSAPI
+ if (get_access(b, AUTHENTICATED) >= required)
+ SVN_ERR(svn_ra_svn_write_word(conn, pool, "GSSAPI"));
+#endif
if (b->pwdb && get_access(b, AUTHENTICATED) >= required)
SVN_ERR(svn_ra_svn_write_word(conn, pool, "CRAM-MD5"));
return SVN_NO_ERROR;
@@ -170,6 +174,13 @@
return SVN_NO_ERROR;
}
+#if HAVE_GSSAPI
+ if (get_access(b, AUTHENTICATED) >= required
+ && strcmp(mech, "GSSAPI") == 0)
+ return svn_ra_svn_gssapi_server(conn, pool, b->realm, mecharg,
+ &b->user, success);
+#endif
+
if (get_access(b, AUTHENTICATED) >= required
&& b->pwdb && strcmp(mech, "CRAM-MD5") == 0)
return svn_ra_svn_cram_server(conn, pool, b->pwdb, &b->user, success);
diff -urN subversion-1.0.9.orig/tags subversion-1.0.9.dev/tags
--- subversion-1.0.9.orig/tags 1970-01-01 10:00:00.000000000 +1000
+++ subversion-1.0.9.dev/tags 2005-03-26 11:54:36.000000000 +1000
@@ -0,0 +1,6523 @@
+!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_PROGRAM_AUTHOR Darren Hiebert /dhiebert@users.sourceforge.net/
+!_TAG_PROGRAM_NAME Exuberant Ctags //
+!_TAG_PROGRAM_URL http://ctags.sourceforge.net /official site/
+!_TAG_PROGRAM_VERSION 5.5.2 //
+ACCEPT ./subversion/libsvn_subr/date.c /^ ACCEPT \/* Accept the value *\/$/;" e enum:rule_action file:
+ACCUM ./subversion/libsvn_subr/date.c /^ ACCUM, \/* Accumulate a decimal value *\/$/;" e enum:rule_action file:
+ACQUIRE_PYTHON_LOCK ./subversion/bindings/swig/swigutil_py.c 55;" d file:
+ACTIVITY_DB ./subversion/mod_dav_svn/activity.c 33;" d file:
+ADLER_MOD_BASE ./subversion/libsvn_diff/util.c 43;" d file:
+ADLER_MOD_BLOCK_SIZE ./subversion/libsvn_diff/util.c 49;" d file:
+AFX_BLAMECALLBACK_H__3BBF3F0F_C80C_45C9_8AC3_E1AF07E5B810__INCLUDED_ ./subversion/bindings/java/javahl/native/BlameCallback.h 23;" d
+AFX_DLLDATAX_H__281C69AC_6B7B_4FA8_9B5A_84546EFB391A__INCLUDED_ ./subversion/bindings/com/dlldatax.h 18;" d
+AFX_JNIBYTEARRAY_H__FB74054F_CD5E_41D5_A4B0_25DE9A8574CF__INCLUDED_ ./subversion/bindings/java/javahl/native/JNIByteArray.h 23;" d
+AFX_JNICRITICALSECTION_H__601F33CC_3378_4B09_9917_6242857EF2B7__INCLUDED_ ./subversion/bindings/java/javahl/native/JNICriticalSection.h 23;" d
+AFX_JNIMUTEX_H__958B52A6_00A3_458F_981F_0A3095D39EE8__INCLUDED_ ./subversion/bindings/java/javahl/native/JNIMutex.h 24;" d
+AFX_JNISTACKELEMENT_H__81945F80_D56F_4782_B8E7_6A82483E6463__INCLUDED_ ./subversion/bindings/java/javahl/native/JNIStackElement.h 23;" d
+AFX_JNISTRINGHOLDER_H__66F98D96_0371_471D_9E5C_EE5D45954C75__INCLUDED_ ./subversion/bindings/java/javahl/native/JNIStringHolder.h 23;" d
+AFX_JNITHREADDATA_H__2BF37407_7EA8_4F74_9080_C86696617F7F__INCLUDED_ ./subversion/bindings/java/javahl/native/JNIThreadData.h 23;" d
+AFX_JNIUTIL_H__82301908_C6CB_4A77_8A28_899E72FBEEFF__INCLUDED_ ./subversion/bindings/java/javahl/native/JNIUtil.h 23;" d
+AFX_NOTIFY_H__10E278E8_EA8C_4BD1_AF10_4DB1C0608F65__INCLUDED_ ./subversion/bindings/java/javahl/native/Notify.h 23;" d
+AFX_PATH_H__A143CB2A_1115_4770_8CD5_AA33CCD285FA__INCLUDED_ ./subversion/bindings/java/javahl/native/Path.h 23;" d
+AFX_POOL_H__4755FB06_B88C_451D_A0EE_91F5A547C30B__INCLUDED_ ./subversion/bindings/java/javahl/native/Pool.h 23;" d
+AFX_PROMPTER_H__6833BB77_DDCC_4BF8_A995_5A5CBC48DF4C__INCLUDED_ ./subversion/bindings/java/javahl/native/Prompter.h 23;" d
+AFX_REVISION_H__BEAA0788_C9D9_4A67_B94E_761ABC68ACFE__INCLUDED_ ./subversion/bindings/java/javahl/native/Revision.h 23;" d
+AFX_STDAFX_H__C6D9D561_DBA4_4B5F_B745_EEE2067A9253__INCLUDED_ ./subversion/bindings/com/StdAfx.h 22;" d
+AFX_SVNCLIENT_H__B5A135CD_3D7C_4ABC_8D75_643B14507979__INCLUDED_ ./subversion/bindings/java/javahl/native/SVNClient.h 23;" d
+AFX_TARGETS_H__61202731_41A4_43FF_97C4_7E26DC255BF1__INCLUDED_ ./subversion/bindings/java/javahl/native/Targets.h 23;" d
+APR_ARRAY_IDX ./subversion/include/svn_types.h 70;" d
+APR_ARRAY_PUSH ./subversion/include/svn_types.h 73;" d
+APR_WANT_BYTEFUNC ./subversion/libsvn_ra_svn/marshal.c 25;" d file:
+APR_WANT_MEMFUNC ./subversion/libsvn_subr/config.c 22;" d file:
+APR_WANT_STDIO ./subversion/clients/cmdline/add-cmd.c 24;" d file:
+APR_WANT_STDIO ./subversion/clients/cmdline/notify.c 27;" d file:
+APR_WANT_STDIO ./subversion/clients/cmdline/resolved-cmd.c 24;" d file:
+APR_WANT_STDIO ./subversion/include/svn_cmdline.h 29;" d
+APR_WANT_STDIO ./subversion/include/svn_error.h 33;" d
+APR_WANT_STDIO ./subversion/libsvn_ra_dav/commit.c 26;" d file:
+APR_WANT_STDIO ./subversion/libsvn_ra_svn/cram.c 22;" d file:
+APR_WANT_STDIO ./subversion/libsvn_ra_svn/gssapi.c 9;" d file:
+APR_WANT_STDIO ./subversion/libsvn_subr/config_impl.h 24;" d
+APR_WANT_STDIO ./subversion/svnlook/main.c 28;" d file:
+APR_WANT_STDIO ./subversion/tests/libsvn_delta/delta-window-test.h 21;" d
+APR_WANT_STDIO ./subversion/tests/libsvn_delta/random-test.c 22;" d file:
+APR_WANT_STDIO ./subversion/tests/libsvn_delta/vdelta-test.c 18;" d file:
+APR_WANT_STDIO ./subversion/tests/libsvn_subr/target-test.c 19;" d file:
+APR_WANT_STRFUNC ./subversion/clients/cmdline/log-cmd.c 25;" d file:
+APR_WANT_STRFUNC ./subversion/clients/cmdline/notify.c 28;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_client/log.c 25;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_client/prop_commands.c 27;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_fs/key-gen.c 21;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_ra_dav/commit.c 27;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_ra_dav/fetch.c 21;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_ra_dav/log.c 21;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_ra_dav/merge.c 23;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_ra_dav/props.c 24;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_ra_dav/session.c 24;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_ra_dav/util.c 21;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_ra_local/ra_plugin.c 27;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_ra_svn/client.c 23;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_ra_svn/cram.c 21;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_ra_svn/editor.c 21;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_ra_svn/editorp.c 21;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_ra_svn/gssapi.c 8;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_ra_svn/marshal.c 24;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_repos/log.c 19;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_repos/node_tree.c 27;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_subr/config.c 21;" d file:
+APR_WANT_STRFUNC ./subversion/libsvn_subr/validate.c 26;" d file:
+APR_WANT_STRFUNC ./subversion/mod_dav_svn/repos.c 27;" d file:
+APR_WANT_STRFUNC ./subversion/svnlook/main.c 29;" d file:
+APR_WANT_STRFUNC ./subversion/svnserve/main.c 21;" d file:
+APR_WANT_STRFUNC ./subversion/svnserve/serve.c 21;" d file:
+APR_WANT_STRFUNC ./subversion/tests/libsvn_delta/delta-window-test.h 22;" d
+APR_WANT_STRFUNC ./subversion/tests/libsvn_delta/random-test.c 23;" d file:
+APU_WANT_DB ./subversion/libsvn_fs/bdb/bdb-err.c 24;" d file:
+APU_WANT_DB ./subversion/libsvn_fs/bdb/bdb_compat.h 21;" d
+APU_WANT_DB ./subversion/libsvn_fs/bdb/changes-table.h 21;" d
+APU_WANT_DB ./subversion/libsvn_fs/bdb/dbt.c 22;" d file:
+APU_WANT_DB ./subversion/libsvn_fs/bdb/dbt.h 23;" d
+APU_WANT_DB ./subversion/libsvn_fs/bdb/nodes-table.h 21;" d
+APU_WANT_DB ./subversion/libsvn_fs/bdb/reps-table.h 21;" d
+APU_WANT_DB ./subversion/libsvn_fs/bdb/rev-table.h 21;" d
+APU_WANT_DB ./subversion/libsvn_fs/bdb/strings-table.h 21;" d
+APU_WANT_DB ./subversion/libsvn_fs/bdb/uuids-table.h 21;" d
+APU_WANT_DB ./subversion/libsvn_fs/fs.c 23;" d file:
+APU_WANT_DB ./subversion/libsvn_fs/fs.h 21;" d
+APU_WANT_DB ./subversion/libsvn_fs/node-rev.c 20;" d file:
+APU_WANT_DB ./subversion/libsvn_fs/node-rev.h 21;" d
+APU_WANT_DB ./subversion/libsvn_fs/reps-strings.c 21;" d file:
+APU_WANT_DB ./subversion/libsvn_fs/reps-strings.h 21;" d
+APU_WANT_DB ./subversion/libsvn_fs/revs-txns.h 21;" d
+APU_WANT_DB ./subversion/libsvn_fs/trail.c 18;" d file:
+APU_WANT_DB ./subversion/libsvn_fs/trail.h 21;" d
+APU_WANT_DB ./subversion/libsvn_fs/util/fs_skels.h 22;" d
+ARE_VALID_COPY_ARGS ./subversion/libsvn_repos/dump.c 30;" d file:
+AUTHENTICATED ./subversion/svnserve/serve.c /^enum authn_type { UNAUTHENTICATED, AUTHENTICATED };$/;" e enum:authn_type file:
+AUTHZ_SVN_NONE ./subversion/mod_authz_svn/mod_authz_svn.c /^ AUTHZ_SVN_NONE = 0,$/;" e file:
+AUTHZ_SVN_READ ./subversion/mod_authz_svn/mod_authz_svn.c /^ AUTHZ_SVN_READ = 1,$/;" e file:
+AUTHZ_SVN_RECURSIVE ./subversion/mod_authz_svn/mod_authz_svn.c /^ AUTHZ_SVN_RECURSIVE = 4$/;" e file:
+AUTHZ_SVN_WRITE ./subversion/mod_authz_svn/mod_authz_svn.c /^ AUTHZ_SVN_WRITE = 2,$/;" e file:
+Add ./subversion/bindings/com/MarshalArray.h /^CComDynamicMarshalledUnkArray<piid>::Add(IUnknown* pUnk)$/;" f class:iid
+Assert ./subversion/bindings/com/StdAfx.h 42;" d
+BASE64_LINELEN ./subversion/libsvn_subr/svn_base64.c 33;" d file:
+BDB_ERR ./subversion/libsvn_fs/bdb/bdb-err.h 85;" d
+BDB_WRAP ./subversion/libsvn_fs/bdb/bdb-err.h 69;" d
+BUFSIZE ./packages/win32-innosetup/tools/svnpath/main.c 55;" d file:
+BlameCallback ./subversion/bindings/java/javahl/native/BlameCallback.h /^class BlameCallback $/;" c
+CALL_METHOD ./subversion/bindings/swig/swigutil_pl.h /^ CALL_METHOD,$/;" e enum:perl_func_invoker
+CALL_SV ./subversion/bindings/swig/swigutil_pl.h /^ CALL_SV$/;" e enum:perl_func_invoker
+CATLEN ./subversion/libsvn_subr/config.c 232;" d file:
+CATLEN ./subversion/libsvn_subr/config.c 237;" d file:
+CATLEN ./subversion/libsvn_subr/config.c 239;" d file:
+CATLEN ./subversion/libsvn_subr/config.c 244;" d file:
+CComDynamicMarshalledUnkArray ./subversion/bindings/com/MarshalArray.h /^ CComDynamicMarshalledUnkArray()$/;" f class:CComDynamicMarshalledUnkArray
+CComDynamicMarshalledUnkArray ./subversion/bindings/com/MarshalArray.h /^class CComDynamicMarshalledUnkArray$/;" c
+CHKERR ./subversion/libsvn_ra_dav/fetch.c 55;" d file:
+CHUNK_SHIFT ./subversion/libsvn_diff/diff_file.c 91;" d file:
+CHUNK_SIZE ./subversion/libsvn_diff/diff_file.c 92;" d file:
+CMD_LINE_ERROR ./contrib/client-side/svn-push/svn-push.c 158;" d file:
+COMPARE_CHUNK_SIZE ./subversion/libsvn_diff/diff_file.c 337;" d file:
+CONNECTION_DEFAULT ./subversion/svnserve/main.c 63;" d file:
+CONNECTION_DEFAULT ./subversion/svnserve/main.c 68;" d file:
+CONNECTION_DEFAULT ./subversion/svnserve/main.c 73;" d file:
+CONNECTION_DEFAULT ./subversion/svnserve/main.c 77;" d file:
+CONNECTION_HAVE_THREAD_OPTION ./subversion/svnserve/main.c 64;" d file:
+CProxy_ISVNEvents ./subversion/bindings/com/svn_comCP.h /^class CProxy_ISVNEvents : public IConnectionPointImpl<T, &DIID__ISVNEvents, CComDynamicMarshalledUnkArray<&DIID__ISVNEvents> >$/;" c
+CSVNStatus ./subversion/bindings/com/SVNStatus.h /^ CSVNStatus()$/;" f class:CSVNStatus
+CSVNStatus ./subversion/bindings/com/SVNStatus.h /^class ATL_NO_VTABLE CSVNStatus : $/;" c
+CSVNWorkingCopy ./subversion/bindings/com/SVN.h /^ CSVNWorkingCopy()$/;" f class:CSVNWorkingCopy
+CSVNWorkingCopy ./subversion/bindings/com/SVN.h /^class ATL_NO_VTABLE CSVNWorkingCopy : $/;" c
+DAV_SVN_BUILD_URI_ACT_COLLECTION ./subversion/mod_dav_svn/dav_svn.h /^ DAV_SVN_BUILD_URI_ACT_COLLECTION, \/* the collection of activities *\/$/;" e enum:dav_svn_build_what
+DAV_SVN_BUILD_URI_BASELINE ./subversion/mod_dav_svn/dav_svn.h /^ DAV_SVN_BUILD_URI_BASELINE, \/* a Baseline *\/$/;" e enum:dav_svn_build_what
+DAV_SVN_BUILD_URI_BC ./subversion/mod_dav_svn/dav_svn.h /^ DAV_SVN_BUILD_URI_BC, \/* a Baseline Collection *\/$/;" e enum:dav_svn_build_what
+DAV_SVN_BUILD_URI_PUBLIC ./subversion/mod_dav_svn/dav_svn.h /^ DAV_SVN_BUILD_URI_PUBLIC, \/* the "public" VCR *\/$/;" e enum:dav_svn_build_what
+DAV_SVN_BUILD_URI_VCC ./subversion/mod_dav_svn/dav_svn.h /^ DAV_SVN_BUILD_URI_VCC \/* a Version Controlled Configuration *\/$/;" e enum:dav_svn_build_what
+DAV_SVN_BUILD_URI_VERSION ./subversion/mod_dav_svn/dav_svn.h /^ DAV_SVN_BUILD_URI_VERSION, \/* a Version Resource *\/$/;" e enum:dav_svn_build_what
+DAV_SVN_DEFAULT_VCC_NAME ./subversion/mod_dav_svn/dav_svn.h 39;" d
+DAV_SVN_H ./subversion/mod_dav_svn/dav_svn.h 21;" d
+DAV_SVN_NAMESPACE_URI ./subversion/mod_dav_svn/liveprops.c /^ DAV_SVN_NAMESPACE_URI \/* the dav<->ra_dav namespace URI *\/$/;" e file:
+DAV_SVN_NAMESPACE_URI_DAV ./subversion/mod_dav_svn/liveprops.c /^ DAV_SVN_NAMESPACE_URI_DAV, \/* the DAV: namespace URI *\/$/;" e file:
+DAV_SVN_RESTYPE_ACT_COLLECTION ./subversion/mod_dav_svn/dav_svn.h /^ DAV_SVN_RESTYPE_ACT_COLLECTION, \/* ...\/!svn\/act\/ *\/$/;" e enum:dav_svn_private_restype
+DAV_SVN_RESTYPE_BC_COLLECTION ./subversion/mod_dav_svn/dav_svn.h /^ DAV_SVN_RESTYPE_BC_COLLECTION, \/* ...\/!svn\/bc\/ *\/$/;" e enum:dav_svn_private_restype