Module Name: src Committed By: christos Date: Sat Feb 12 23:21:33 UTC 2011
Modified Files: src/crypto/external/bsd/libsaslc/dist/man: libsaslc.3 src/crypto/external/bsd/libsaslc/dist/src: buffer.c crypto.c dict.c dict.h error.c list.c mech.c mech.h mech_crammd5.c mech_digestmd5.c mech_gssapi.c mech_plain.c msg.c parser.c saslc.c saslc_private.h xsess.c src/crypto/external/bsd/libsaslc/dist/test: Atffile Makefile example_client.c t_crypto.c t_dict.c t_error.c t_parser.c t_saslc.c t_session.c Log Message: Fix botched merges of the patch that Anon Ymous sent. From Anon Ymous To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/libsaslc/dist/src/buffer.c \ src/crypto/external/bsd/libsaslc/dist/src/list.c \ src/crypto/external/bsd/libsaslc/dist/src/msg.c cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/libsaslc/dist/src/crypto.c \ src/crypto/external/bsd/libsaslc/dist/src/dict.c \ src/crypto/external/bsd/libsaslc/dist/src/mech_gssapi.c \ src/crypto/external/bsd/libsaslc/dist/src/xsess.c cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/libsaslc/dist/src/dict.h \ src/crypto/external/bsd/libsaslc/dist/src/error.c \ src/crypto/external/bsd/libsaslc/dist/src/mech.c \ src/crypto/external/bsd/libsaslc/dist/src/mech.h \ src/crypto/external/bsd/libsaslc/dist/src/mech_crammd5.c \ src/crypto/external/bsd/libsaslc/dist/src/mech_plain.c \ src/crypto/external/bsd/libsaslc/dist/src/parser.c \ src/crypto/external/bsd/libsaslc/dist/src/saslc.c \ src/crypto/external/bsd/libsaslc/dist/src/saslc_private.h cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/libsaslc/dist/test/Atffile cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/libsaslc/dist/test/Makefile \ src/crypto/external/bsd/libsaslc/dist/test/example_client.c \ src/crypto/external/bsd/libsaslc/dist/test/t_crypto.c \ src/crypto/external/bsd/libsaslc/dist/test/t_dict.c \ src/crypto/external/bsd/libsaslc/dist/test/t_error.c \ src/crypto/external/bsd/libsaslc/dist/test/t_parser.c \ src/crypto/external/bsd/libsaslc/dist/test/t_saslc.c \ src/crypto/external/bsd/libsaslc/dist/test/t_session.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.